From 291150a7557cb72c6e9221741e5d772981be7047 Mon Sep 17 00:00:00 2001 From: Pavel Avgustinov <54942558+p0@users.noreply.github.com> Date: Mon, 6 Apr 2020 14:26:51 +0100 Subject: [PATCH 1/2] Delete outdated COPYRIGHT file This seems to be copied from Semmle/ql, and it claims the wrong license. --- COPYRIGHT | 13 ------------- Makefile | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 COPYRIGHT diff --git a/COPYRIGHT b/COPYRIGHT deleted file mode 100644 index 65d947ff274..00000000000 --- a/COPYRIGHT +++ /dev/null @@ -1,13 +0,0 @@ -Copyright (c) Semmle Inc and other contributors. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at http://www.apache.org/licenses/LICENSE-2.0 - -THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED -WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, -MERCHANTABLITY OR NON-INFRINGEMENT. - -See the Apache Version 2.0 License for specific language governing permissions -and limitations under the License. diff --git a/Makefile b/Makefile index 980c1002bd7..626da6979bc 100644 --- a/Makefile +++ b/Makefile @@ -56,11 +56,11 @@ $(addsuffix .exe,$(addprefix tools/win64/,$(BINARIES))): env GOOS=windows GOARCH=amd64 go build -mod=vendor -o $@ ./extractor/cli/$(basename $(@F)) .PHONY: extractor-common extractor extractor-full -extractor-common: codeql-extractor.yml COPYRIGHT LICENSE ql/src/go.dbscheme \ +extractor-common: codeql-extractor.yml LICENSE ql/src/go.dbscheme \ tools/tokenizer.jar $(CODEQL_TOOLS) rm -rf $(EXTRACTOR_PACK_OUT) mkdir -p $(EXTRACTOR_PACK_OUT) - cp codeql-extractor.yml COPYRIGHT LICENSE ql/src/go.dbscheme ql/src/go.dbscheme.stats $(EXTRACTOR_PACK_OUT) + cp codeql-extractor.yml LICENSE ql/src/go.dbscheme ql/src/go.dbscheme.stats $(EXTRACTOR_PACK_OUT) mkdir $(EXTRACTOR_PACK_OUT)/tools cp -r tools/tokenizer.jar $(CODEQL_TOOLS) $(EXTRACTOR_PACK_OUT)/tools From c45a5cf1f2926ae8fe821663e39a572dcfacf3e4 Mon Sep 17 00:00:00 2001 From: Pavel Avgustinov Date: Mon, 6 Apr 2020 14:37:09 +0100 Subject: [PATCH 2/2] Update copyright date --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index a4cf061b517..a8952d86b02 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 GitHub +Copyright (c) 2019-2020 GitHub Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal