Merge pull request #18573 from smowton/smowton/admin/remove-properties-file-expectations

smowton · web-flow · commit 9c779c3cc9e3 · 2025-01-23T16:12:25.000Z
Java: Don't expect logged properties files in source archives
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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-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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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 |
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
@@ -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
@@ -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
@@ -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
