Merge pull request #21117 from smowton/smowton/admin/revert-java-paths-directives

Java: revert filtering of ancillary data extraction
2026-02-11 20:51:06 +01:00 · 2026-01-07 16:13:21 +00:00
parent a5f6806239 688f10daf1
commit d048d394b4
11 changed files with 0 additions and 29 deletions
--- a/java/ql/integration-tests/java/buildless-paths/codescanning-config.yml
+++ b/java/ql/integration-tests/java/buildless-paths/codescanning-config.yml
@@ -1,4 +0,0 @@
-paths:
-  - include
-paths-ignore:
-  - include/exclude
--- a/java/ql/integration-tests/java/buildless-paths/include/ShouldAppear2.java
+++ b/java/ql/integration-tests/java/buildless-paths/include/ShouldAppear2.java
@@ -1 +0,0 @@
-public class ShouldAppear2 { }
--- a/java/ql/integration-tests/java/buildless-paths/include/ShouldAppear2.xml
+++ b/java/ql/integration-tests/java/buildless-paths/include/ShouldAppear2.xml
@@ -1 +0,0 @@
-<tag></tag>
--- a/java/ql/integration-tests/java/buildless-paths/include/exclude/ShouldNotAppear3.java
+++ b/java/ql/integration-tests/java/buildless-paths/include/exclude/ShouldNotAppear3.java
@@ -1 +0,0 @@
-public class ShouldNotAppear3 { }
--- a/java/ql/integration-tests/java/buildless-paths/include/exclude/ShouldNotAppear3.xml
+++ b/java/ql/integration-tests/java/buildless-paths/include/exclude/ShouldNotAppear3.xml
@@ -1 +0,0 @@
-<tag></tag>
--- a/java/ql/integration-tests/java/buildless-paths/sibling/ShouldNotAppear1.java
+++ b/java/ql/integration-tests/java/buildless-paths/sibling/ShouldNotAppear1.java
@@ -1 +0,0 @@
-public class ShouldNotAppear1 { }
--- a/java/ql/integration-tests/java/buildless-paths/sibling/ShouldNotAppear1.xml
+++ b/java/ql/integration-tests/java/buildless-paths/sibling/ShouldNotAppear1.xml
@@ -1 +0,0 @@
-<tag></tag>
--- a/java/ql/integration-tests/java/buildless-paths/test.expected
+++ b/java/ql/integration-tests/java/buildless-paths/test.expected
@@ -1,4 +0,0 @@
-javaFiles
-| include/ShouldAppear2.java:0:0:0:0 | ShouldAppear2 |
-#select
-| include/ShouldAppear2.xml:0:0:0:0 | include/ShouldAppear2.xml |
--- a/java/ql/integration-tests/java/buildless-paths/test.py
+++ b/java/ql/integration-tests/java/buildless-paths/test.py
@@ -1,5 +0,0 @@
-import os
-import os.path
-
-def test(codeql, java):
-    codeql.database.create(build_mode = "none", codescanning_config = "codescanning-config.yml")
--- a/java/ql/integration-tests/java/buildless-paths/test.ql
+++ b/java/ql/integration-tests/java/buildless-paths/test.ql
@@ -1,6 +0,0 @@
-import java
-
-query predicate javaFiles(File f) { f.isJavaSourceFile() }
-
-from XmlFile f
-select f
--- a/java/ql/lib/change-notes/2025-12-16-java-xml-paths.md
+++ b/java/ql/lib/change-notes/2025-12-16-java-xml-paths.md
@@ -1,4 +0,0 @@
---
-category: minorAnalysis
---
-* When a code-scanning configuration specifies the `paths:` and/or `paths-ignore:` settings, these are now taken into account by the Java extractor's search for XML and properties files.