Merge branch 'main' into criemen/pytest-swift

go/integration-tests-lib/go_integration_test.py

@@ -1,26 +0,0 @@
-import os
-from create_database_utils import *
-from diagnostics_test_utils import *
-from resolve_environment_utils import *
-
-def go_integration_test(toolchain=None, source = "src", db = "db", runFunction = runSuccessfully):
-  # Set up a GOPATH relative to this test's root directory;
-  # we set os.environ instead of using extra_env because we
-  # need it to be set for the call to "go clean -modcache" later
-  goPath = os.path.join(os.path.abspath(os.getcwd()), ".go")
-  os.environ['GOPATH'] = goPath
-
-  extra_env = None
-
-  if toolchain != None:
-    extra_env = { 'GOTOOLCHAIN': toolchain }
-
-  try:
-    run_codeql_resolve_build_environment(lang="go", source=source, extra_env=extra_env)
-    run_codeql_database_create([], lang="go", source=source, db=db, runFunction=runFunction)
-
-    check_diagnostics()
-  finally:
-    # Clean up the temporary GOPATH to prevent Bazel failures next
-    # time the tests are run; see https://github.com/golang/go/issues/27161
-    subprocess.call(["go", "clean", "-modcache"])

go/ql/integration-tests/all-platforms/go/bazel-sample-1/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/bazel-sample-1/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/bazel-sample-2/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/bazel-sample-2/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/diagnostics/build-constraints-exclude-all-go-files/test.py

@@ -1,6 +1,8 @@
 import os
+import pytest
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/all-platforms/go/diagnostics/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/diagnostics/go-files-found-not-processed/test.py

@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work")
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/all-platforms/go/diagnostics/invalid-toolchain-version/test.py

@@ -1,6 +1,6 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test()
+def test(codeql, go):
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/diagnostics/newer-go-version-needed/test.py

@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None, runFunction=runUnsuccessfully)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work", _assert_failure=True)

go/ql/integration-tests/all-platforms/go/diagnostics/no-go-files-found/test.py

@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None, runFunction=runUnsuccessfully)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work", _assert_failure=True)

go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-with-go-mod/test.py

@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/all-platforms/go/diagnostics/package-not-found-without-go-mod/test.py

@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "test"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "test"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/all-platforms/go/diagnostics/unsupported-relative-path/test.py

@@ -1,6 +1,7 @@
 import os
 
-from go_integration_test import *
 
-os.environ['GITHUB_REPOSITORY'] = "a/b"
-go_integration_test(source="work", db=None)
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["GITHUB_REPOSITORY"] = "a/b"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/all-platforms/go/extract-vendor/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/extract-vendor/test.py

@@ -1,4 +1,6 @@
-from go_integration_test import *
+import os
 
-os.environ['CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS'] = "true"
-go_integration_test()
+
+def test(codeql, go):
+    os.environ["CODEQL_EXTRACTOR_GO_EXTRACT_VENDOR_DIRS"] = "true"
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/go-get-without-modules-sample/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/go-mod-sample/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/go-mod-sample/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/go-mod-without-version/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/go-mod-without-version/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/go-version-bump/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/make-sample/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/make-sample/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/mixed-layout/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/mixed-layout/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/ninja-sample/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/ninja-sample/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/qlpack.yml

@@ -1,5 +0,0 @@
-dependencies:
-  codeql/go-all: '*'
-  codeql/go-tests: '*'
-  codeql/go-queries: '*'
-warnOnImplicitThis: true

go/ql/integration-tests/all-platforms/go/resolve-build-environment/newer-go-needed/test.py

@@ -1,3 +1,3 @@
-from go_integration_test import *
-
-go_integration_test(toolchain="go1.21.0")
+def test(codeql, go, check_build_environment):
+    check_build_environment.env = {"GOTOOLCHAIN": "go1.21.0"}
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/single-go-mod-and-go-files-not-under-it/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/single-go-mod-in-root/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/single-go-mod-not-in-root/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/single-go-work-not-in-root/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/two-go-mods-nested-none-in-root/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/two-go-mods-nested-one-in-root/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/two-go-mods-not-nested/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/all-platforms/go/two-go-mods-one-failure/test.py

@@ -1,3 +1,2 @@
-from go_integration_test import *
-
-go_integration_test()
+def test(codeql, go):
+    codeql.database.create(source_root="src")

go/ql/integration-tests/legacy

@@ -1 +0,0 @@
-These tests are still run with the legacy test runner

go/ql/integration-tests/linux-only/go/dep-sample/force_sequential_test_execution

@@ -1,2 +0,0 @@
-# go get has been observed to sometimes fail when multiple tests try to simultaneously fetch the same package.
-goget

go/ql/integration-tests/linux-only/go/dep-sample/test.py

@@ -1,6 +1,9 @@
 import os
+import runs_on
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "deptest"
-go_integration_test(source="work")
+@runs_on.linux
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "deptest"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/linux-only/go/glide-sample/test.py

@@ -1,6 +1,9 @@
 import os
+import runs_on
 
-from go_integration_test import *
 
-os.environ['LGTM_INDEX_IMPORT_PATH'] = "glidetest"
-go_integration_test(source="work")
+@runs_on.linux
+def test(codeql, go, check_build_environment):
+    check_build_environment.source_root = "work"
+    os.environ["LGTM_INDEX_IMPORT_PATH"] = "glidetest"
+    codeql.database.create(source_root="work")

go/ql/integration-tests/linux-only/go/qlpack.yml

@@ -1,5 +0,0 @@
-dependencies:
-  codeql/go-all: '*'
-  codeql/go-tests: '*'
-  codeql/go-queries: '*'
-warnOnImplicitThis: true

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/buildless-fetches.expected

@@ -0,0 +1,27 @@
+https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-war/2.249/jenkins-war-2.249.war
+https://repo.maven.apache.org/maven2/com/feiniaojin/naaf/naaf-graceful-response-example/1.0/naaf-graceful-response-example-1.0.jar
+https://repo.maven.apache.org/maven2/com/github/MoebiusSolutions/avro-registry-in-source/avro-registry-in-source-tests/1.8/avro-registry-in-source-tests-1.8.jar
+https://repo.maven.apache.org/maven2/com/github/MoebiusSolutions/avro-registry-in-source/example-project/1.5/example-project-1.5.jar
+https://repo.maven.apache.org/maven2/com/intuit/benten/benten-examples/0.1.5/benten-examples-0.1.5.jar
+https://repo.maven.apache.org/maven2/com/jakewharton/twirl/sample-runtime/1.2.0/sample-runtime-1.2.0.jar
+https://repo.maven.apache.org/maven2/com/mattunderscore/code/generation/specky/plugin-example/0.8.0/plugin-example-0.8.0.jar
+https://repo.maven.apache.org/maven2/com/microsoft/tang/tang-test-jarAB/0.9/tang-test-jarAB-0.9.jar
+https://repo.maven.apache.org/maven2/de/knutwalker/rx-redis-example_2.11/0.1.2/rx-redis-example_2.11-0.1.2.jar
+https://repo.maven.apache.org/maven2/de/knutwalker/rx-redis-java-example_2.11/0.1.2/rx-redis-java-example_2.11-0.1.2.jar
+https://repo.maven.apache.org/maven2/io/github/scrollsyou/example-spring-boot-starter/1.0.0/example-spring-boot-starter-1.0.0.jar
+https://repo.maven.apache.org/maven2/io/streamnative/com/example/maven-central-template/server/3.0.0/server-3.0.0.jar
+https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar
+https://repo.maven.apache.org/maven2/no/nav/security/token-validation-ktor-demo/3.1.0/token-validation-ktor-demo-3.1.0.jar
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-fileupload/0.5.10/minijax-example-fileupload-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-inject/0.5.10/minijax-example-inject-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-json/0.5.10/minijax-example-json-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-mustache/0.5.10/minijax-example-mustache-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-petclinic/0.5.10/minijax-example-petclinic-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-security/0.5.10/minijax-example-security-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-ssl/0.5.10/minijax-example-ssl-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-todo-backend/0.5.10/minijax-example-todo-backend-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/minijax/minijax-example-websocket/0.5.10/minijax-example-websocket-0.5.10.jar
+https://repo.maven.apache.org/maven2/org/scalamock/scalamock-examples_2.10/3.6.0/scalamock-examples_2.10-3.6.0.jar
+https://repo.maven.apache.org/maven2/org/somda/sdc/glue-examples/4.0.0/glue-examples-4.0.0.jar
+https://repo.maven.apache.org/maven2/us/fatehi/schemacrawler-examplecode/16.20.2/schemacrawler-examplecode-16.20.2.jar

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/diagnostics.expected

@@ -0,0 +1,70 @@
+{
+  "markdownMessage": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/using-build-tool-advice",
+    "name": "Java analysis used build tool Maven to pick a JDK version and/or to recommend external dependencies"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis used the system default JDK.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/jdk-system-default",
+    "name": "Java analysis used the system default JDK"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java analysis with build-mode 'none' completed.",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/complete",
+    "name": "Java analysis with build-mode 'none' completed"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Java was extracted with build-mode set to 'none'. This means that all Java source in the working directory will be scanned, with build tools such as Maven and Gradle only contributing information about external dependencies.",
+  "severity": "note",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/mode-active",
+    "name": "Java was extracted with build-mode set to 'none'"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
+{
+  "markdownMessage": "Reading the dependency graph from build files provided 3 classpath entries",
+  "severity": "unknown",
+  "source": {
+    "extractorName": "java",
+    "id": "java/autobuilder/buildless/depgraph-provided-by-maven",
+    "name": "Java analysis extracted precise dependency graph information from tool Maven"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": false,
+    "telemetry": true
+  }
+}

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/force_sequential_test_execution

@@ -0,0 +1 @@
+# Concurrent Maven processes using ~/.m2/repository is not safe, so this test must run sequentially

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/pom.xml

@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.example</groupId>
+  <artifactId>maven-sample</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>maven-sample</name>
+  <!-- FIXME change it to the project's website -->
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.target>1.7</maven.compiler.target>
+  </properties>
+
+  <repositories>
+    <repository>
+        <id>central</id>
+        <name>Maven Central</name>
+        <url>https://repo.maven.apache.org/maven2</url>
+        <snapshots>
+            <enabled>false</enabled>
+        </snapshots>
+    </repository>
+
+    <repository>
+      <id>maven.jenkins-ci.org</id>
+      <name>Jenkins Releases</name>
+      <url>https://repo.jenkins-ci.org/releases/</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>jenkins-war</artifactId>
+      <version>2.249</version>
+      <type>executable-war</type>
+      <!-- For test brevity; won't actually work -->
+      <exclusions>
+          <exclusion>
+              <groupId>*</groupId>
+              <artifactId>*</artifactId>
+          </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>exec-maven-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>check-maven-version</id>
+            <phase>package</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <mainClass>com.example.App</mainClass>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.19.1</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>compile</phase>
+          </execution>
+        </executions>
+        <configuration>
+          <java>
+            <licenseHeader>
+              <content>/* FAIL ME */</content>
+            </licenseHeader>
+          </java>
+        </configuration>
+      </plugin>
+    </plugins>
+    <pluginManagement>
+      <!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+      <plugins>
+        <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
+        <plugin>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.1.0</version>
+        </plugin>
+        <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.0</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.22.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.0.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.7.1</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/src/main/java/com/example/App.java

@@ -0,0 +1,30 @@
+package com.example;
+
+import java.util.regex.Pattern;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+        String expectedVersion = System.getenv("EXPECT_MAVEN");
+        Path mavenHome = Paths.get(System.getProperty("maven.home")).normalize();
+        String observedVersion = mavenHome.getFileName().toString();
+        if (expectedVersion != null && !expectedVersion.equals(observedVersion)) {
+                System.err.println("Wrong maven version, expected '" + expectedVersion + "' but got '" + observedVersion + "'" + mavenHome);
+                System.exit(1);
+        }
+        String commandMatcher = System.getenv("EXPECT_COMMAND_REGEX");
+        String command = System.getProperty("sun.java.command");
+        if (commandMatcher != null && !Pattern.matches(commandMatcher, command)) {
+                System.err.println("Wrong command line, '" + command + "' does not match '" + commandMatcher + "'");
+                System.exit(1);
+        }
+    }
+}

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/src/main/resources/my-app.properties

@@ -0,0 +1 @@
+version=1.0

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/src/main/resources/page.xml

@@ -0,0 +1,8 @@
+<html>
+<head>
+<title>A sample</title>
+</head>
+<body>
+<p>Hello world!</p>
+</body>
+</html>

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/src/main/resources/struts.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<struts>
+This is a sample file
+</struts>

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/src/test/java/com/example/AppTest.java

@@ -0,0 +1,20 @@
+package com.example;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+{
+    /**
+     * Rigorous Test :-)
+     */
+    @Test
+    public void shouldAnswerWithTrue()
+    {
+        assertTrue( true );
+    }
+}

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/test.expected

@@ -0,0 +1,10 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles
+| pom.xml:0:0:0:0 | pom.xml |
+| src/main/resources/page.xml:0:0:0:0 | src/main/resources/page.xml |
+| src/main/resources/struts.xml:0:0:0:0 | src/main/resources/struts.xml |
+propertiesFiles
+| src/main/resources/my-app.properties:0:0:0:0 | src/main/resources/my-app.properties |
+| test-db/log/ext/javac.properties:0:0:0:0 | test-db/log/ext/javac.properties |

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/test.py

@@ -0,0 +1,8 @@
+from create_database_utils import *
+from diagnostics_test_utils import *
+from buildless_test_utils import *
+
+run_codeql_database_create([], lang="java", extra_env={"CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS": "true", "CODEQL_EXTRACTOR_JAVA_OPTION_BUILDLESS_CLASSPATH_FROM_BUILD_FILES": "true"})
+
+check_diagnostics()
+check_buildless_fetches()

java/ql/integration-tests/all-platforms/java/buildless-maven-executable-war/test.ql

@@ -0,0 +1,9 @@
+import java
+
+from File f
+where f.isSourceFile()
+select f
+
+query predicate xmlFiles(XmlFile x) { any() }
+
+query predicate propertiesFiles(File f) { f.getExtension() = "properties" }