Java: Adjust test options paths, library and query paths.

michaelnebel · michaelnebel · commit 0257475af3b2 · 2024-11-12T15:28:23.000+01:00
diff --git a/java/test/security/CWE-016/InsecureSpringActuatorConfig.qlref b/java/test/security/CWE-016/InsecureSpringActuatorConfig.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
+security/CWE-016/InsecureSpringActuatorConfig.ql
diff --git a/java/test/security/CWE-016/SpringBootActuators.qlref b/java/test/security/CWE-016/SpringBootActuators.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-016/SpringBootActuators.ql
+security/CWE-016/SpringBootActuators.ql
diff --git a/java/test/security/CWE-016/options b/java/test/security/CWE-016/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8
diff --git a/java/test/security/CWE-020/Log4jInjectionTest.qlref b/java/test/security/CWE-020/Log4jInjectionTest.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
+query: security/CWE-020/Log4jJndiInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-020/options b/java/test/security/CWE-020/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-log4j-2.14.1:${testdir}/../../../../stubs/servlet-api-2.4
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/apache-log4j-2.14.1:${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4
diff --git a/java/test/security/CWE-022/options b/java/test/security/CWE-022/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/lingala-zip4j-2.11.5:${testdir}/../../../stubs/software-amazon-awssdk-crt-0.20.3:${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/reactivestreams-1.0.4:${testdir}/../../../../stubs/slf4j-2.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/lingala-zip4j-2.11.5:${testdir}/../../stubs/software-amazon-awssdk-crt-0.20.3:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8:${testdir}/../../stubs/reactivestreams-1.0.4:${testdir}/../../../../codeql/java/ql/test/stubs/slf4j-2.0.0
diff --git a/java/test/security/CWE-073/FilePathInjection.qlref b/java/test/security/CWE-073/FilePathInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-073/FilePathInjection.ql
+query: security/CWE-073/FilePathInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-073/options b/java/test/security/CWE-073/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jfinal-4.9.15
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/jfinal-4.9.15
diff --git a/java/test/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref b/java/test/security/CWE-089/src/main/MyBatisAnnotationSqlInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql
+query: security/CWE-089/MyBatisAnnotationSqlInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref b/java/test/security/CWE-089/src/main/MyBatisMapperXmlSqlInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql
+query: security/CWE-089/MyBatisMapperXmlSqlInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-089/src/main/options b/java/test/security/CWE-089/src/main/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.3.8/:${testdir}/../../../../../../stubs/org.mybatis-3.5.4/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../codeql/java/ql/test/stubs/springframework-5.3.8/:${testdir}/../../../../../../codeql/java/ql/test/stubs/org.mybatis-3.5.4/
diff --git a/java/test/security/CWE-094/BeanShellInjection.qlref b/java/test/security/CWE-094/BeanShellInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-094/BeanShellInjection.ql
+query: security/CWE-094/BeanShellInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/JShellInjection.qlref b/java/test/security/CWE-094/JShellInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-094/JShellInjection.ql
+query: security/CWE-094/JShellInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/JakartaExpressionInjection.qlref b/java/test/security/CWE-094/JakartaExpressionInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-094/JakartaExpressionInjection.ql
+query: security/CWE-094/JakartaExpressionInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/JythonInjection.qlref b/java/test/security/CWE-094/JythonInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-094/JythonInjection.ql
+query: security/CWE-094/JythonInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/ScriptInjection.qlref b/java/test/security/CWE-094/ScriptInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-094/ScriptInjection.ql
+query: security/CWE-094/ScriptInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-094/options b/java/test/security/CWE-094/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/jsr223-api:${testdir}/../../../../stubs/scriptengine:${testdir}/../../../../stubs/java-ee-el:${testdir}/../../../../stubs/juel-2.2:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jython-2.7.2:${testdir}/../../../../experimental/stubs/rhino-1.7.13:${testdir}/../../../../stubs/bsh-2.0b5:${testdir}/../../../../experimental/stubs/jshell:${testdir}/../../../../experimental/stubs/apache-freemarker-2.3.31:${testdir}/../../../../experimental/stubs/jinjava-2.6.0:${testdir}/../../../../experimental/stubs/pebble-3.1.5:${testdir}/../../../../experimental/stubs/thymeleaf-3.0.14:${testdir}/../../../../experimental/stubs/apache-velocity-2.3
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8:${testdir}/../../../../codeql/java/ql/test/stubs/jsr223-api:${testdir}/../../../../codeql/java/ql/test/stubs/scriptengine:${testdir}/../../../../codeql/java/ql/test/stubs/java-ee-el:${testdir}/../../../../codeql/java/ql/test/stubs/juel-2.2:${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/jython-2.7.2:${testdir}/../../stubs/rhino-1.7.13:${testdir}/../../../../codeql/java/ql/test/stubs/bsh-2.0b5:${testdir}/../../stubs/jshell:${testdir}/../../stubs/apache-freemarker-2.3.31:${testdir}/../../stubs/jinjava-2.6.0:${testdir}/../../stubs/pebble-3.1.5:${testdir}/../../stubs/thymeleaf-3.0.14:${testdir}/../../stubs/apache-velocity-2.3
diff --git a/java/test/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref b/java/test/security/CWE-1004/SensitiveCookieNotHttpOnly.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-1004/SensitiveCookieNotHttpOnly.ql
+query: security/CWE-1004/SensitiveCookieNotHttpOnly.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-1004/options b/java/test/security/CWE-1004/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jsr311-api-1.1.1:${testdir}/../../../../stubs/springframework-5.3.8
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/jsr311-api-1.1.1:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8
diff --git a/java/test/security/CWE-200/InsecureWebResourceResponse.qlref b/java/test/security/CWE-200/InsecureWebResourceResponse.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-200/InsecureWebResourceResponse.ql
+query: security/CWE-200/InsecureWebResourceResponse.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-200/SensitiveAndroidFileLeak.qlref b/java/test/security/CWE-200/SensitiveAndroidFileLeak.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-200/SensitiveAndroidFileLeak.ql
+query: security/CWE-200/SensitiveAndroidFileLeak.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-200/options b/java/test/security/CWE-200/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/google-android-9.0.0
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/google-android-9.0.0
diff --git a/java/test/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref b/java/test/security/CWE-208/NotConstantTimeCheckOnSignature/Test.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-208/PossibleTimingAttackAgainstSignature.ql
+query: security/CWE-208/PossibleTimingAttackAgainstSignature.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-208/TimingAttackAgainstHeader/TimingAttackAgainstHeader.qlref b/java/test/security/CWE-208/TimingAttackAgainstHeader/TimingAttackAgainstHeader.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-208/TimingAttackAgainstHeader.ql
+security/CWE-208/TimingAttackAgainstHeader.ql
diff --git a/java/test/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref b/java/test/security/CWE-208/TimingAttackAgainstSignagure/Test.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-208/TimingAttackAgainstSignature.ql
+query: security/CWE-208/TimingAttackAgainstSignature.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-295/jxbrowser-6.23.1/JxBrowserWithoutCertValidation.qlref b/java/test/security/CWE-295/jxbrowser-6.23.1/JxBrowserWithoutCertValidation.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-295/JxBrowserWithoutCertValidation.ql
+security/CWE-295/JxBrowserWithoutCertValidation.ql
diff --git a/java/test/security/CWE-295/jxbrowser-6.23.1/options b/java/test/security/CWE-295/jxbrowser-6.23.1/options
@@ -1 +1 @@
- //semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/jxbrowser-6.23.1
+ //semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jxbrowser-6.23.1
diff --git a/java/test/security/CWE-295/jxbrowser-6.24/JxBrowserWithoutCertValidation.qlref b/java/test/security/CWE-295/jxbrowser-6.24/JxBrowserWithoutCertValidation.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-295/JxBrowserWithoutCertValidation.ql
+security/CWE-295/JxBrowserWithoutCertValidation.ql
diff --git a/java/test/security/CWE-295/jxbrowser-6.24/options b/java/test/security/CWE-295/jxbrowser-6.24/options
@@ -1 +1 @@
- //semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/jxbrowser-6.24
+ //semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jxbrowser-6.24
diff --git a/java/test/security/CWE-297/IgnoredHostnameVerification.qlref b/java/test/security/CWE-297/IgnoredHostnameVerification.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-297/IgnoredHostnameVerification.ql
+security/CWE-297/IgnoredHostnameVerification.ql
diff --git a/java/test/security/CWE-297/InsecureLdapEndpoint.qlref b/java/test/security/CWE-297/InsecureLdapEndpoint.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-297/InsecureLdapEndpoint.ql
+security/CWE-297/InsecureLdapEndpoint.ql
diff --git a/java/test/security/CWE-299/DisabledRevocationChecking.qlref b/java/test/security/CWE-299/DisabledRevocationChecking.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-299/DisabledRevocationChecking.ql
+query: security/CWE-299/DisabledRevocationChecking.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-327/UnsafeTlsVersion.qlref b/java/test/security/CWE-327/UnsafeTlsVersion.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-327/UnsafeTlsVersion.ql
+query: security/CWE-327/UnsafeTlsVersion.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-346/UnvalidatedCors.qlref b/java/test/security/CWE-346/UnvalidatedCors.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-346/UnvalidatedCors.ql
+query: security/CWE-346/UnvalidatedCors.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-346/options b/java/test/security/CWE-346/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/apache-commons-lang3-3.7
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/apache-commons-lang3-3.7
diff --git a/java/test/security/CWE-347/Auth0NoVerifier.qlref b/java/test/security/CWE-347/Auth0NoVerifier.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-347/Auth0NoVerifier.ql
+query: security/CWE-347/Auth0NoVerifier.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-347/options b/java/test/security/CWE-347/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/auth0-java-jwt-4.4.0:${testdir}/../../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/org-apache-shiro-authc-2.0.1
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/auth0-java-jwt-4.4.0:${testdir}/../../../../codeql/java/ql/test/stubs/javax-servlet-2.5:${testdir}/../../stubs/org-apache-shiro-authc-2.0.1
diff --git a/java/test/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref b/java/test/security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
+query: security/CWE-348/ClientSuppliedIpUsedInSecurityCheck.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-348/options b/java/test/security/CWE-348/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/:${testdir}/../../../../stubs/apache-commons-lang3-3.7/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8/:${testdir}/../../../../codeql/java/ql/test/stubs/apache-commons-lang3-3.7/
diff --git a/java/test/security/CWE-352/JsonpInjection.qlref b/java/test/security/CWE-352/JsonpInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-352/JsonpInjection.ql
+query: security/CWE-352/JsonpInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-352/options b/java/test/security/CWE-352/options
@@ -1 +1 @@
-  //semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/fastjson-1.2.74/:${testdir}/../../../../stubs/gson-2.8.6/:${testdir}/../../../../stubs/jackson-databind-2.12/:${testdir}/../../../../stubs/jackson-core-2.12:${testdir}/../../../../stubs/springframework-5.3.8/
+  //semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/apache-http-4.4.13/:${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/fastjson-1.2.74/:${testdir}/../../../../codeql/java/ql/test/stubs/gson-2.8.6/:${testdir}/../../../../codeql/java/ql/test/stubs/jackson-databind-2.12/:${testdir}/../../../../codeql/java/ql/test/stubs/jackson-core-2.12:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8/
diff --git a/java/test/security/CWE-400/LocalThreadResourceAbuse.qlref b/java/test/security/CWE-400/LocalThreadResourceAbuse.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-400/LocalThreadResourceAbuse.ql
+query: security/CWE-400/LocalThreadResourceAbuse.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-400/ThreadResourceAbuse.qlref b/java/test/security/CWE-400/ThreadResourceAbuse.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-400/ThreadResourceAbuse.ql
+query: security/CWE-400/ThreadResourceAbuse.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-400/options b/java/test/security/CWE-400/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/apache-commons-fileupload-1.4
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/apache-commons-fileupload-1.4
diff --git a/java/test/security/CWE-470/LoadClassNoSignatureCheck.qlref b/java/test/security/CWE-470/LoadClassNoSignatureCheck.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-470/LoadClassNoSignatureCheck.ql
+query: security/CWE-470/LoadClassNoSignatureCheck.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-470/UnsafeReflection.qlref b/java/test/security/CWE-470/UnsafeReflection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-470/UnsafeReflection.ql
+query: security/CWE-470/UnsafeReflection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-470/options b/java/test/security/CWE-470/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/:${testdir}/../../../../stubs/google-android-9.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8/:${testdir}/../../../../codeql/java/ql/test/stubs/google-android-9.0.0
diff --git a/java/test/security/CWE-489/ServiceBean.qlref b/java/test/security/CWE-489/ServiceBean.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-489/EJBMain.ql
+security/CWE-489/EJBMain.ql
diff --git a/java/test/security/CWE-489/ServletMain.qlref b/java/test/security/CWE-489/ServletMain.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-489/WebComponentMain.ql
+security/CWE-489/WebComponentMain.ql
diff --git a/java/test/security/CWE-489/options b/java/test/security/CWE-489/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/ejb-3.2
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/ejb-3.2
diff --git a/java/test/security/CWE-502/UnsafeDeserializationRmi.qlref b/java/test/security/CWE-502/UnsafeDeserializationRmi.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-502/UnsafeDeserializationRmi.ql
+query: security/CWE-502/UnsafeDeserializationRmi.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-502/UnsafeSpringExporterInConfigurationClass.qlref b/java/test/security/CWE-502/UnsafeSpringExporterInConfigurationClass.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-502/UnsafeSpringExporterInConfigurationClass.ql
+security/CWE-502/UnsafeSpringExporterInConfigurationClass.ql
diff --git a/java/test/security/CWE-502/UnsafeSpringExporterInXMLConfiguration.qlref b/java/test/security/CWE-502/UnsafeSpringExporterInXMLConfiguration.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-502/UnsafeSpringExporterInXMLConfiguration.ql
+security/CWE-502/UnsafeSpringExporterInXMLConfiguration.ql
diff --git a/java/test/security/CWE-502/options b/java/test/security/CWE-502/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8
diff --git a/java/test/security/CWE-522-DecompressionBombs/options b/java/test/security/CWE-522-DecompressionBombs/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/apache-commons-compress-1.23.0:${testdir}/../../../stubs/lingala-zip4j-2.11.5:${testdir}/../../../stubs/zstd-jni-1.5.5
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/apache-commons-compress-1.23.0:${testdir}/../../stubs/lingala-zip4j-2.11.5:${testdir}/../../stubs/zstd-jni-1.5.5
diff --git a/java/test/security/CWE-548/InsecureDirectoryConfig.qlref b/java/test/security/CWE-548/InsecureDirectoryConfig.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-548/InsecureDirectoryConfig.ql
+security/CWE-548/InsecureDirectoryConfig.ql
diff --git a/java/test/security/CWE-555/CredentialsInPropertiesFile.ql b/java/test/security/CWE-555/CredentialsInPropertiesFile.ql
@@ -1,10 +1,10 @@
 /*
- * Note this is similar to src/experimental/Security/CWE/CWE-555/CredentialsInPropertiesFile.ql
+ * Note this is similar to src/security/CWE-555/CredentialsInPropertiesFile.ql
  * except we do not filter out test files.
  */
 
 import java
-import experimental.semmle.code.java.frameworks.CredentialsInPropertiesFile
+import semmle.code.java.frameworks.CredentialsInPropertiesFile
 
 from CredentialsConfig cc
 select cc, cc.getConfigDesc()
diff --git a/java/test/security/CWE-555/PasswordInConfigurationFile.qlref b/java/test/security/CWE-555/PasswordInConfigurationFile.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-555/PasswordInConfigurationFile.ql
+security/CWE-555/PasswordInConfigurationFile.ql
diff --git a/java/test/security/CWE-598/SensitiveGetQuery.qlref b/java/test/security/CWE-598/SensitiveGetQuery.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-598/SensitiveGetQuery.ql
+query: security/CWE-598/SensitiveGetQuery.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-598/options b/java/test/security/CWE-598/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4
diff --git a/java/test/security/CWE-600/UncaughtServletException.qlref b/java/test/security/CWE-600/UncaughtServletException.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-600/UncaughtServletException.ql
+query: security/CWE-600/UncaughtServletException.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-600/options b/java/test/security/CWE-600/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4
diff --git a/java/test/security/CWE-601/SpringUrlRedirect.qlref b/java/test/security/CWE-601/SpringUrlRedirect.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql
+query: security/CWE-601/SpringUrlRedirect.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-601/options b/java/test/security/CWE-601/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8/
diff --git a/java/test/security/CWE-625/PermissiveDotRegex.qlref b/java/test/security/CWE-625/PermissiveDotRegex.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-625/PermissiveDotRegex.ql
+query: security/CWE-625/PermissiveDotRegex.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-625/options b/java/test/security/CWE-625/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8
diff --git a/java/test/security/CWE-652/XQueryInjection.qlref b/java/test/security/CWE-652/XQueryInjection.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-652/XQueryInjection.ql
+query: security/CWE-652/XQueryInjection.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-652/options b/java/test/security/CWE-652/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/saxon-xqj-9.x/:${testdir}/../../../../stubs/springframework-5.3.8/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/apache-http-4.4.13/:${testdir}/../../../../codeql/java/ql/test/stubs/servlet-api-2.4:${testdir}/../../../../codeql/java/ql/test/stubs/saxon-xqj-9.x/:${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8/
diff --git a/java/test/security/CWE-665/InsecureRmiJmxEnvironmentConfiguration.qlref b/java/test/security/CWE-665/InsecureRmiJmxEnvironmentConfiguration.qlref
@@ -1 +1 @@
-experimental/Security/CWE/CWE-665/InsecureRmiJmxEnvironmentConfiguration.ql
+security/CWE-665/InsecureRmiJmxEnvironmentConfiguration.ql
diff --git a/java/test/security/CWE-665/options b/java/test/security/CWE-665/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/rmi-remote-0.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/rmi-remote-0.0.0
diff --git a/java/test/security/CWE-755/NFEAndroidDoS.qlref b/java/test/security/CWE-755/NFEAndroidDoS.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
+query: security/CWE-755/NFEAndroidDoS.ql
 postprocess: TestUtilities/PrettyPrintModels.ql
diff --git a/java/test/security/CWE-755/options b/java/test/security/CWE-755/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/google-android-9.0.0
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/google-android-9.0.0
diff --git a/java/test/security/CWE-759/HashWithoutSalt.qlref b/java/test/security/CWE-759/HashWithoutSalt.qlref
@@ -1,2 +1,2 @@
-query: experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
+query: security/CWE-759/HashWithoutSalt.ql
 postprocess: TestUtilities/PrettyPrintModels.ql

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql`
	`1`	`+security/CWE-016/InsecureSpringActuatorConfig.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-experimental/Security/CWE/CWE-016/SpringBootActuators.ql`
	`1`	`+security/CWE-016/SpringBootActuators.ql`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8`
	`1`	`+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../codeql/java/ql/test/stubs/springframework-5.3.8`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-query: experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql`
	`1`	`+query: security/CWE-020/Log4jJndiInjection.ql`
`2`	`2`	`postprocess: TestUtilities/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-query: experimental/Security/CWE/CWE-073/FilePathInjection.ql`
	`1`	`+query: security/CWE-073/FilePathInjection.ql`
`2`	`2`	`postprocess: TestUtilities/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-query: experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql`
	`1`	`+query: security/CWE-089/MyBatisAnnotationSqlInjection.ql`
`2`	`2`	`postprocess: TestUtilities/PrettyPrintModels.ql`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-query: experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql`
	`1`	`+query: security/CWE-089/MyBatisMapperXmlSqlInjection.ql`
`2`	`2`	`postprocess: TestUtilities/PrettyPrintModels.ql`