From 91132b94a9c1116dfb89905b05e59f1c68b2a244 Mon Sep 17 00:00:00 2001
From: Paolo Tranquilli <redsun82@gihub.com>
Date: Thu, 23 Jan 2025 08:31:21 +0100
Subject: [PATCH 1/3] Swift: drop indisciminate printing of the env

---
 swift/extractor/main.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/swift/extractor/main.cpp b/swift/extractor/main.cpp
index 0883b0717fc3..24c295e50f29 100644
--- a/swift/extractor/main.cpp
+++ b/swift/extractor/main.cpp
@@ -208,8 +208,11 @@ static auto argDump(int argc, char** argv) {
 static auto envDump(char** envp) {
   std::string ret;
   for (auto env = envp; *env; ++env) {
-    ret += *env;
-    ret += '\n';
+    if (std::string_view envVar{*env};
+        envVar.starts_with("CODEQL_") || envVar.starts_with("SEMMLE_")) {
+      ret += *env;
+      ret += '\n';
+    }
   }
   return ret;
 }
@@ -229,7 +232,7 @@ int main(int argc, char** argv, char** envp) {
 
   const auto configuration = configure(argc, argv);
   LOG_INFO("calling extractor with arguments \"{}\"", argDump(argc, argv));
-  LOG_DEBUG("environment:\n{}\n", envDump(envp));
+  LOG_DEBUG("CodeQL environment:\n{}\n", envDump(envp));
 
   auto openInterception = codeql::setupFileInterception(configuration);
 

From 660922fe4dfa153d4fd0e23eb3ef70bcb08fb035 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Thu, 23 Jan 2025 11:14:20 +0000
Subject: [PATCH 2/3] Don't expect logged properties files in source archives

---
 .../java/android-8-sample/source_archive.expected               | 1 -
 .../source_archive.expected                                     | 1 -
 .../android-sample-kotlin-build-script/source_archive.expected  | 1 -
 .../java/android-sample-no-wrapper/source_archive.expected      | 1 -
 .../source_archive.expected                                     | 1 -
 .../source_archive.expected                                     | 1 -
 .../android-sample-old-style-no-wrapper/source_archive.expected | 1 -
 .../java/android-sample-old-style/source_archive.expected       | 1 -
 .../java/android-sample/source_archive.expected                 | 1 -
 .../java/buildless-gradle-classifiers/source_archive.expected   | 1 -
 .../java/buildless-gradle-timeout/source_archive.expected       | 1 -
 .../java/buildless-gradle/source_archive.expected               | 1 -
 .../java/buildless-maven-executable-war/source_archive.expected | 1 -
 .../source_archive.expected                                     | 1 -
 .../java/buildless-maven-multimodule/source_archive.expected    | 1 -
 .../java/buildless-maven-timeout/source_archive.expected        | 1 -
 .../java/buildless-maven/source_archive.expected                | 1 -
 .../java/buildless-proxy-gradle/source_archive.expected         | 1 -
 .../java/buildless-proxy-maven/source_archive.expected          | 1 -
 .../java/buildless-sibling-projects/source_archive.expected     | 1 -
 .../ql/integration-tests/java/buildless/source_archive.expected | 1 -
 .../java/ecj-sample-noexit/source_archive.expected              | 1 -
 .../integration-tests/java/ecj-sample/source_archive.expected   | 1 -
 .../java/gradle-sample-kotlin-script/source_archive.expected    | 2 --
 .../java/gradle-sample/source_archive.expected                  | 2 --
 .../java/maven-enforcer/source_archive.expected                 | 2 --
 .../maven-sample-extract-properties/source_archive.expected     | 2 --
 .../java/maven-sample-large-xml-files/source_archive.expected   | 2 --
 .../java/maven-sample-small-xml-files/source_archive.expected   | 2 --
 .../java/maven-sample-xml-mode-all/source_archive.expected      | 2 --
 .../java/maven-sample-xml-mode-byname/source_archive.expected   | 2 --
 .../java/maven-sample-xml-mode-disabled/source_archive.expected | 2 --
 .../java/maven-sample-xml-mode-smart/source_archive.expected    | 2 --
 .../integration-tests/java/maven-sample/source_archive.expected | 2 --
 .../java/maven-wrapper-script-only/source_archive.expected      | 2 --
 .../java/maven-wrapper-source-only/source_archive.expected      | 2 --
 .../java/maven-wrapper/source_archive.expected                  | 2 --
 .../source_archive.expected                                     | 2 --
 .../java/partial-gradle-sample/source_archive.expected          | 2 --
 .../java/spring-boot-sample/source_archive.expected             | 2 --
 40 files changed, 57 deletions(-)

diff --git a/java/ql/integration-tests/java/android-8-sample/source_archive.expected b/java/ql/integration-tests/java/android-8-sample/source_archive.expected
index 8d61145f8076..d0c879be31e9 100644
--- a/java/ql/integration-tests/java/android-8-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/android-8-sample/source_archive.expected
@@ -24,4 +24,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/source_archive.expected b/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/source_archive.expected
index 70b1edf245a7..9cc752ac3042 100644
--- a/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-kotlin-build-script-no-wrapper/source_archive.expected
@@ -23,4 +23,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-kotlin-build-script/source_archive.expected b/java/ql/integration-tests/java/android-sample-kotlin-build-script/source_archive.expected
index 70b1edf245a7..9cc752ac3042 100644
--- a/java/ql/integration-tests/java/android-sample-kotlin-build-script/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-kotlin-build-script/source_archive.expected
@@ -23,4 +23,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-no-wrapper/source_archive.expected b/java/ql/integration-tests/java/android-sample-no-wrapper/source_archive.expected
index 70b1edf245a7..9cc752ac3042 100644
--- a/java/ql/integration-tests/java/android-sample-no-wrapper/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-no-wrapper/source_archive.expected
@@ -23,4 +23,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/source_archive.expected b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/source_archive.expected
index a8f354b9e173..5b8152404fc9 100644
--- a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script-no-wrapper/source_archive.expected
@@ -26,4 +26,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/source_archive.expected b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/source_archive.expected
index 2d3a437d5079..d0c38783da32 100644
--- a/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-old-style-kotlin-build-script/source_archive.expected
@@ -26,4 +26,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/source_archive.expected b/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/source_archive.expected
index a8f354b9e173..5b8152404fc9 100644
--- a/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-old-style-no-wrapper/source_archive.expected
@@ -26,4 +26,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample-old-style/source_archive.expected b/java/ql/integration-tests/java/android-sample-old-style/source_archive.expected
index 2d3a437d5079..d0c38783da32 100644
--- a/java/ql/integration-tests/java/android-sample-old-style/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample-old-style/source_archive.expected
@@ -26,4 +26,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/android-sample/source_archive.expected b/java/ql/integration-tests/java/android-sample/source_archive.expected
index 70b1edf245a7..9cc752ac3042 100644
--- a/java/ql/integration-tests/java/android-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/android-sample/source_archive.expected
@@ -23,4 +23,3 @@ project/build/intermediates/merged_manifests/release/AndroidManifest.xml
 project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
 project/src/main/AndroidManifest.xml
 project/src/main/java/com/github/androidsample/Main.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/buildless-gradle-classifiers/source_archive.expected b/java/ql/integration-tests/java/buildless-gradle-classifiers/source_archive.expected
index 1ee055eeb028..82828506b8ae 100644
--- a/java/ql/integration-tests/java/buildless-gradle-classifiers/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-gradle-classifiers/source_archive.expected
@@ -4,4 +4,3 @@
 .gradle/vcs-1/gc.properties
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/fractestexample/Test.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/buildless-gradle-timeout/source_archive.expected b/java/ql/integration-tests/java/buildless-gradle-timeout/source_archive.expected
index e51c49f2057e..57d312328e87 100644
--- a/java/ql/integration-tests/java/buildless-gradle-timeout/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-gradle-timeout/source_archive.expected
@@ -2,4 +2,3 @@ gradle/verification-metadata.xml
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/example/App.java
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/buildless-gradle/source_archive.expected b/java/ql/integration-tests/java/buildless-gradle/source_archive.expected
index 1ee055eeb028..82828506b8ae 100644
--- a/java/ql/integration-tests/java/buildless-gradle/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-gradle/source_archive.expected
@@ -4,4 +4,3 @@
 .gradle/vcs-1/gc.properties
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/fractestexample/Test.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected
index cdb0dca94210..0a86ff54645c 100644
--- a/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-executable-war/source_archive.expected
@@ -4,5 +4,4 @@ src/main/resources/my-app.properties
 src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected
index ea42987308b3..d363510835a7 100644
--- a/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-existing-settings-xml/source_archive.expected
@@ -5,5 +5,4 @@ src/main/resources/my-app.properties
 src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected
index ab5cf6e4ba17..1e19d9840195 100644
--- a/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-multimodule/source_archive.expected
@@ -11,5 +11,4 @@ submod2/src/main/resources/my-app.properties
 submod2/src/main/resources/page.xml
 submod2/src/main/resources/struts.xml
 submod2/src/test/java/com/example/AppTest2.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected b/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected
index 77ca5e58c406..0f7ecaa26307 100644
--- a/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven-timeout/source_archive.expected
@@ -5,5 +5,4 @@ src/main/resources/my-app.properties
 src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-maven/source_archive.expected b/java/ql/integration-tests/java/buildless-maven/source_archive.expected
index cdb0dca94210..0a86ff54645c 100644
--- a/java/ql/integration-tests/java/buildless-maven/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-maven/source_archive.expected
@@ -4,5 +4,4 @@ src/main/resources/my-app.properties
 src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-proxy-gradle/source_archive.expected b/java/ql/integration-tests/java/buildless-proxy-gradle/source_archive.expected
index 1ee055eeb028..82828506b8ae 100644
--- a/java/ql/integration-tests/java/buildless-proxy-gradle/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-proxy-gradle/source_archive.expected
@@ -4,4 +4,3 @@
 .gradle/vcs-1/gc.properties
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/fractestexample/Test.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/buildless-proxy-maven/source_archive.expected b/java/ql/integration-tests/java/buildless-proxy-maven/source_archive.expected
index cdb0dca94210..0a86ff54645c 100644
--- a/java/ql/integration-tests/java/buildless-proxy-maven/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-proxy-maven/source_archive.expected
@@ -4,5 +4,4 @@ src/main/resources/my-app.properties
 src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected b/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected
index 790a13864ee3..3369d78d4af5 100644
--- a/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless-sibling-projects/source_archive.expected
@@ -26,5 +26,4 @@ maven-project-2/src/main/resources/my-app.properties
 maven-project-2/src/main/resources/page.xml
 maven-project-2/src/main/resources/struts.xml
 maven-project-2/src/test/java/com/example/AppTest4.java
-test-db/log/ext/javac.properties
 test-db/working/settings.xml
diff --git a/java/ql/integration-tests/java/buildless/source_archive.expected b/java/ql/integration-tests/java/buildless/source_archive.expected
index b3923b0fd963..c8eaf4810af7 100644
--- a/java/ql/integration-tests/java/buildless/source_archive.expected
+++ b/java/ql/integration-tests/java/buildless/source_archive.expected
@@ -3,4 +3,3 @@ src/main/resources/my-app.properties
 src/main/resources/page.xml
 src/main/resources/struts.xml
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/ecj-sample-noexit/source_archive.expected b/java/ql/integration-tests/java/ecj-sample-noexit/source_archive.expected
index 3d16d23ce76a..f24627b5d6d0 100644
--- a/java/ql/integration-tests/java/ecj-sample-noexit/source_archive.expected
+++ b/java/ql/integration-tests/java/ecj-sample-noexit/source_archive.expected
@@ -1,2 +1 @@
 Test.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/ecj-sample/source_archive.expected b/java/ql/integration-tests/java/ecj-sample/source_archive.expected
index 3d16d23ce76a..f24627b5d6d0 100644
--- a/java/ql/integration-tests/java/ecj-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/ecj-sample/source_archive.expected
@@ -1,2 +1 @@
 Test.java
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/gradle-sample-kotlin-script/source_archive.expected b/java/ql/integration-tests/java/gradle-sample-kotlin-script/source_archive.expected
index f41668d42052..b932aaf5d80d 100644
--- a/java/ql/integration-tests/java/gradle-sample-kotlin-script/source_archive.expected
+++ b/java/ql/integration-tests/java/gradle-sample-kotlin-script/source_archive.expected
@@ -5,5 +5,3 @@
 app/src/main/java/test/App.java
 app/src/test/java/test/AppTest.java
 gradle/wrapper/gradle-wrapper.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/gradle-sample/source_archive.expected b/java/ql/integration-tests/java/gradle-sample/source_archive.expected
index ccdedc5ab73a..eb7be6b955ca 100644
--- a/java/ql/integration-tests/java/gradle-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/gradle-sample/source_archive.expected
@@ -5,5 +5,3 @@
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/example/App.java
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-enforcer/source_archive.expected b/java/ql/integration-tests/java/maven-enforcer/source_archive.expected
index 016c614aec45..59a81a01481c 100644
--- a/java/ql/integration-tests/java/maven-enforcer/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-enforcer/source_archive.expected
@@ -8,5 +8,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-extract-properties/source_archive.expected b/java/ql/integration-tests/java/maven-sample-extract-properties/source_archive.expected
index 016c614aec45..59a81a01481c 100644
--- a/java/ql/integration-tests/java/maven-sample-extract-properties/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-extract-properties/source_archive.expected
@@ -8,5 +8,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-large-xml-files/source_archive.expected b/java/ql/integration-tests/java/maven-sample-large-xml-files/source_archive.expected
index a4def4e92dc4..a9afe77c2555 100644
--- a/java/ql/integration-tests/java/maven-sample-large-xml-files/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-large-xml-files/source_archive.expected
@@ -6,5 +6,3 @@ src/test/java/com/example/AppTest.java
 target/classes/my-app.properties
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-small-xml-files/source_archive.expected b/java/ql/integration-tests/java/maven-sample-small-xml-files/source_archive.expected
index ccc5c6f25134..83f376944a7f 100644
--- a/java/ql/integration-tests/java/maven-sample-small-xml-files/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-small-xml-files/source_archive.expected
@@ -13,5 +13,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-xml-mode-all/source_archive.expected b/java/ql/integration-tests/java/maven-sample-xml-mode-all/source_archive.expected
index 016c614aec45..59a81a01481c 100644
--- a/java/ql/integration-tests/java/maven-sample-xml-mode-all/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-xml-mode-all/source_archive.expected
@@ -8,5 +8,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-xml-mode-byname/source_archive.expected b/java/ql/integration-tests/java/maven-sample-xml-mode-byname/source_archive.expected
index a4def4e92dc4..a9afe77c2555 100644
--- a/java/ql/integration-tests/java/maven-sample-xml-mode-byname/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-xml-mode-byname/source_archive.expected
@@ -6,5 +6,3 @@ src/test/java/com/example/AppTest.java
 target/classes/my-app.properties
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-xml-mode-disabled/source_archive.expected b/java/ql/integration-tests/java/maven-sample-xml-mode-disabled/source_archive.expected
index 23eaad53231f..4b7810df62a2 100644
--- a/java/ql/integration-tests/java/maven-sample-xml-mode-disabled/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-xml-mode-disabled/source_archive.expected
@@ -3,5 +3,3 @@ src/main/resources/my-app.properties
 src/test/java/com/example/AppTest.java
 target/classes/my-app.properties
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample-xml-mode-smart/source_archive.expected b/java/ql/integration-tests/java/maven-sample-xml-mode-smart/source_archive.expected
index a4def4e92dc4..a9afe77c2555 100644
--- a/java/ql/integration-tests/java/maven-sample-xml-mode-smart/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample-xml-mode-smart/source_archive.expected
@@ -6,5 +6,3 @@ src/test/java/com/example/AppTest.java
 target/classes/my-app.properties
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-sample/source_archive.expected b/java/ql/integration-tests/java/maven-sample/source_archive.expected
index 016c614aec45..59a81a01481c 100644
--- a/java/ql/integration-tests/java/maven-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-sample/source_archive.expected
@@ -8,5 +8,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-wrapper-script-only/source_archive.expected b/java/ql/integration-tests/java/maven-wrapper-script-only/source_archive.expected
index 63c4821feacc..1e05b6ef3ee9 100644
--- a/java/ql/integration-tests/java/maven-wrapper-script-only/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-wrapper-script-only/source_archive.expected
@@ -9,5 +9,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-wrapper-source-only/source_archive.expected b/java/ql/integration-tests/java/maven-wrapper-source-only/source_archive.expected
index 63c4821feacc..1e05b6ef3ee9 100644
--- a/java/ql/integration-tests/java/maven-wrapper-source-only/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-wrapper-source-only/source_archive.expected
@@ -9,5 +9,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/maven-wrapper/source_archive.expected b/java/ql/integration-tests/java/maven-wrapper/source_archive.expected
index 63c4821feacc..1e05b6ef3ee9 100644
--- a/java/ql/integration-tests/java/maven-wrapper/source_archive.expected
+++ b/java/ql/integration-tests/java/maven-wrapper/source_archive.expected
@@ -9,5 +9,3 @@ target/classes/my-app.properties
 target/classes/page.xml
 target/classes/struts.xml
 target/maven-archiver/pom.properties
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/partial-gradle-sample-without-gradle/source_archive.expected b/java/ql/integration-tests/java/partial-gradle-sample-without-gradle/source_archive.expected
index 67b20f5ad70e..dd371e89fd5c 100644
--- a/java/ql/integration-tests/java/partial-gradle-sample-without-gradle/source_archive.expected
+++ b/java/ql/integration-tests/java/partial-gradle-sample-without-gradle/source_archive.expected
@@ -6,5 +6,3 @@ gradle/verification-metadata.xml
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/example/App.java
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/partial-gradle-sample/source_archive.expected b/java/ql/integration-tests/java/partial-gradle-sample/source_archive.expected
index 67b20f5ad70e..dd371e89fd5c 100644
--- a/java/ql/integration-tests/java/partial-gradle-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/partial-gradle-sample/source_archive.expected
@@ -6,5 +6,3 @@ gradle/verification-metadata.xml
 gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/example/App.java
 src/test/java/com/example/AppTest.java
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties
diff --git a/java/ql/integration-tests/java/spring-boot-sample/source_archive.expected b/java/ql/integration-tests/java/spring-boot-sample/source_archive.expected
index 7c6e9b460feb..ac3beac1b0ec 100644
--- a/java/ql/integration-tests/java/spring-boot-sample/source_archive.expected
+++ b/java/ql/integration-tests/java/spring-boot-sample/source_archive.expected
@@ -7,5 +7,3 @@ gradle/wrapper/gradle-wrapper.properties
 src/main/java/com/github/springbootsample/SpringBootSampleApplication.java
 src/main/resources/application.properties
 src/test/java/com/github/springbootsample/SpringBootSampleApplicationTests.java
-test-db/log/ext/javac-1.properties
-test-db/log/ext/javac.properties

From e27d8c16729588259f8143c7ed4569d517b0de10 Mon Sep 17 00:00:00 2001
From: Chris Smowton <chris@smowton.net>
Date: Thu, 23 Jan 2025 11:33:45 +0000
Subject: [PATCH 3/3] Amend extractor information expectation

---
 .../java/buildless-erroneous/ExtractorInformation.expected     | 3 +--
 .../multi-release-jar-java11/ExtractorInformation.expected     | 3 +--
 .../multi-release-jar-java17/ExtractorInformation.expected     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected b/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected
index 08c21ba9900b..0a45568a5365 100644
--- a/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected
+++ b/java/ql/integration-tests/java/buildless-erroneous/ExtractorInformation.expected
@@ -5,10 +5,9 @@
 | Number of diagnostics from CodeQL Java extractor with severity 6 | 2 |
 | Number of expressions with known type | 1 |
 | Number of expressions with unknown type | 6 |
-| Number of files | 607 |
+| Number of files | 606 |
 | Number of files with extension class | 604 |
 | Number of files with extension java | 1 |
-| Number of files with extension properties | 1 |
 | Number of lines of code | 7 |
 | Number of lines of code with extension java | 7 |
 | Percentage of calls with call target | 20 |
diff --git a/java/ql/integration-tests/java/multi-release-jar-java11/ExtractorInformation.expected b/java/ql/integration-tests/java/multi-release-jar-java11/ExtractorInformation.expected
index 6d33b9029351..69db216dec79 100644
--- a/java/ql/integration-tests/java/multi-release-jar-java11/ExtractorInformation.expected
+++ b/java/ql/integration-tests/java/multi-release-jar-java11/ExtractorInformation.expected
@@ -3,11 +3,10 @@
 | Number of calls with missing call target | 0 |
 | Number of expressions with known type | 1 |
 | Number of expressions with unknown type | 0 |
-| Number of files | 543 |
+| Number of files | 542 |
 | Number of files with extension class | 538 |
 | Number of files with extension jar | 1 |
 | Number of files with extension java | 2 |
-| Number of files with extension properties | 1 |
 | Number of lines of code | 7 |
 | Number of lines of code with extension java | 7 |
 | Percentage of calls with call target | 100 |
diff --git a/java/ql/integration-tests/java/multi-release-jar-java17/ExtractorInformation.expected b/java/ql/integration-tests/java/multi-release-jar-java17/ExtractorInformation.expected
index d6bdf6dd7b54..0d76628ad868 100644
--- a/java/ql/integration-tests/java/multi-release-jar-java17/ExtractorInformation.expected
+++ b/java/ql/integration-tests/java/multi-release-jar-java17/ExtractorInformation.expected
@@ -3,11 +3,10 @@
 | Number of calls with missing call target | 0 |
 | Number of expressions with known type | 1 |
 | Number of expressions with unknown type | 0 |
-| Number of files | 610 |
+| Number of files | 609 |
 | Number of files with extension class | 605 |
 | Number of files with extension jar | 1 |
 | Number of files with extension java | 2 |
-| Number of files with extension properties | 1 |
 | Number of lines of code | 7 |
 | Number of lines of code with extension java | 7 |
 | Percentage of calls with call target | 100 |