From 4567e02b8cbff85be1f4bc09aa54b257ce1a25ac Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Thu, 20 Feb 2025 18:55:55 +0000
Subject: [PATCH 1/2] Regularise extractor pack licenses to all cite the MIT
 license that covers the whole CodeQL repository

---
 actions/extractor/BUILD.bazel    | 1 +
 javascript/extractor/README.md   | 2 +-
 javascript/resources/BUILD.bazel | 2 +-
 python/BUILD.bazel               | 6 +++---
 ruby/BUILD.bazel                 | 2 +-
 swift/BUILD.bazel                | 1 +
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/actions/extractor/BUILD.bazel b/actions/extractor/BUILD.bazel
index e6780e10db2a..bbe98d3e8bd4 100644
--- 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
index cf26d9db7849..f35f2e0b6af2 100644
--- 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
index c9ac9a734896..98ad6b612dff 100644
--- 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
index d47bf4cd135a..f3c7ebbdb27e 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -31,8 +31,8 @@ pkg_filegroup(
 )
 
 pkg_files(
-    name = "codeql-extractor-yml",
-    srcs = ["codeql-extractor.yml"],
+    name = "resources",
+    srcs = ["codeql-extractor.yml", "//:LICENSE"],
     strip_prefix = None,
 )
 
@@ -47,7 +47,7 @@ codeql_pkg_files(
 codeql_pack(
     name = "python",
     srcs = [
-        ":codeql-extractor-yml",
+        ":resources",
         ":dbscheme-group",
         ":extractor-arch",
         "//python/downgrades",
diff --git a/ruby/BUILD.bazel b/ruby/BUILD.bazel
index d8b2989e3590..5457fe1244b4 100644
--- a/ruby/BUILD.bazel
+++ b/ruby/BUILD.bazel
@@ -32,7 +32,7 @@ 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
index d9a5e912668f..63fe3ea3be3c 100644
--- a/swift/BUILD.bazel
+++ b/swift/BUILD.bazel
@@ -83,6 +83,7 @@ codeql_pkg_files(
         "codeql-extractor.yml",
         "ql/lib/swift.dbscheme.stats",
         "//swift/extractor/trap:generated_dbscheme",
+        "//:LICENSE",
     ],
 )
 

From a1ba584b204c4a0826d4e9302a546abe731891d1 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Thu, 20 Feb 2025 19:31:00 +0000
Subject: [PATCH 2/2] Autoformat

---
 python/BUILD.bazel | 7 +++++--
 ruby/BUILD.bazel   | 5 ++++-
 swift/BUILD.bazel  | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index f3c7ebbdb27e..d53770a726c9 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -32,7 +32,10 @@ pkg_filegroup(
 
 pkg_files(
     name = "resources",
-    srcs = ["codeql-extractor.yml", "//:LICENSE"],
+    srcs = [
+        "codeql-extractor.yml",
+        "//:LICENSE",
+    ],
     strip_prefix = None,
 )
 
@@ -47,9 +50,9 @@ codeql_pkg_files(
 codeql_pack(
     name = "python",
     srcs = [
-        ":resources",
         ":dbscheme-group",
         ":extractor-arch",
+        ":resources",
         "//python/downgrades",
         "//python/extractor",
         "//python/tools",
diff --git a/ruby/BUILD.bazel b/ruby/BUILD.bazel
index 5457fe1244b4..751a41fbc486 100644
--- 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", "//:LICENSE"],
+    srcs = [
+        "codeql-extractor.yml",
+        "//:LICENSE",
+    ],
     strip_prefix = None,
 )
 
diff --git a/swift/BUILD.bazel b/swift/BUILD.bazel
index 63fe3ea3be3c..db01fa225ebf 100644
--- a/swift/BUILD.bazel
+++ b/swift/BUILD.bazel
@@ -82,8 +82,8 @@ codeql_pkg_files(
     srcs = [
         "codeql-extractor.yml",
         "ql/lib/swift.dbscheme.stats",
-        "//swift/extractor/trap:generated_dbscheme",
         "//:LICENSE",
+        "//swift/extractor/trap:generated_dbscheme",
     ],
 )