Merge pull request #18829 from smowton/smowton/admin/regularise-extra…

…ctor-licenses Regularise extractor pack licenses to all cite the MIT license that covers the whole CodeQL repository
github · Feb 20, 2025 · 311c1e1 · 311c1e1
2 parents fe34aa3 + a1ba584
commit 311c1e1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/actions/extractor/BUILD.bazel b/actions/extractor/BUILD.bazel
@@ -4,6 +4,7 @@ codeql_pkg_files(
     name = "extractor",
     srcs = [
         "codeql-extractor.yml",
+        "//:LICENSE",
     ] + glob(["tools/**"]),
     strip_prefix = strip_prefix.from_pkg(),
     visibility = ["//actions:__pkg__"],

diff --git a/javascript/extractor/README.md b/javascript/extractor/README.md
@@ -6,4 +6,4 @@ The extractor consists of a parser for the latest version of ECMAScript, includi
 
 ## License
 
-Like the CodeQL queries, the JavaScript extractor is licensed under [Apache License 2.0](LICENSE) by [GitHub](https://github.com). Some code is derived from other projects, whose licenses are noted in other `LICENSE-*.md` files in this folder.
+Like the CodeQL queries, the JavaScript extractor is licensed under the [MIT License](https://github.com/github/codeql/blob/main/LICENSE) by [GitHub](https://github.com). Some code is derived from other projects, whose licenses are noted in other `LICENSE-*.md` files in this folder.
diff --git a/javascript/resources/BUILD.bazel b/javascript/resources/BUILD.bazel
@@ -8,7 +8,7 @@ codeql_pkg_files(
             "tools/*.sh",
             "BUILD.bazel",
         ],
-    ),
+    ) + ["//:LICENSE"],
     exes = glob(["tools/*.sh"]),
     strip_prefix = "",
     visibility = ["//javascript:__pkg__"],

diff --git a/python/BUILD.bazel b/python/BUILD.bazel
@@ -31,8 +31,11 @@ pkg_filegroup(
 )
 
 pkg_files(
-    name = "codeql-extractor-yml",
-    srcs = ["codeql-extractor.yml"],
+    name = "resources",
+    srcs = [
+        "codeql-extractor.yml",
+        "//:LICENSE",
+    ],
     strip_prefix = None,
 )
 
@@ -47,9 +50,9 @@ codeql_pkg_files(
 codeql_pack(
     name = "python",
     srcs = [
-        ":codeql-extractor-yml",
         ":dbscheme-group",
         ":extractor-arch",
+        ":resources",
         "//python/downgrades",
         "//python/extractor",
         "//python/tools",

diff --git a/ruby/BUILD.bazel b/ruby/BUILD.bazel
@@ -32,7 +32,10 @@ pkg_filegroup(
 
 codeql_pkg_files(
     name = "codeql-extractor-yml",
-    srcs = ["codeql-extractor.yml"],
+    srcs = [
+        "codeql-extractor.yml",
+        "//:LICENSE",
+    ],
     strip_prefix = None,
 )
 

diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
@@ -82,6 +82,7 @@ codeql_pkg_files(
     srcs = [
         "codeql-extractor.yml",
         "ql/lib/swift.dbscheme.stats",
+        "//:LICENSE",
         "//swift/extractor/trap:generated_dbscheme",
     ],
 )
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ The extractor consists of a parser for the latest version of ECMAScript, includi

		## License

		Like the CodeQL queries, the JavaScript extractor is licensed under [Apache License 2.0](LICENSE) by [GitHub](https://github.com). Some code is derived from other projects, whose licenses are noted in other `LICENSE-*.md` files in this folder.
		Like the CodeQL queries, the JavaScript extractor is licensed under the [MIT License](https://github.com/github/codeql/blob/main/LICENSE) by [GitHub](https://github.com). Some code is derived from other projects, whose licenses are noted in other `LICENSE-*.md` files in this folder.