diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/options b/java/ql/test/experimental/query-tests/security/CWE-016/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-016/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-022/options b/java/ql/test/experimental/query-tests/security/CWE-022/options
index ff1b8857e3d5..0b08c36d4e13 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-022/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/reactivestreams-1.0.4:${testdir}/../../../../stubs/slf4j-2.0.0
diff --git a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options b/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options
index c72994f8021d..2e128276b78d 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-089/src/main/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../../../stubs/springframework-5.8.x/:${testdir}/../../../../../../stubs/org.mybatis-3.5.4/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/options b/java/ql/test/experimental/query-tests/security/CWE-094/options
index d527e41cc4db..110388283dda 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-094/options
+++ b/java/ql/test/experimental/query-tests/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
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${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
diff --git a/java/ql/test/experimental/query-tests/security/CWE-1004/options b/java/ql/test/experimental/query-tests/security/CWE-1004/options
index 4a9b588c832d..00e92689af58 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-1004/options
+++ b/java/ql/test/experimental/query-tests/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
\ No newline at end of file
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jsr311-api-1.1.1:${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-348/options b/java/ql/test/experimental/query-tests/security/CWE-348/options
index 65ba99fff230..0314ccf85f2f 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-348/options
+++ b/java/ql/test/experimental/query-tests/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/
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x/:${testdir}/../../../../stubs/apache-commons-lang3-3.7/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-352/options b/java/ql/test/experimental/query-tests/security/CWE-352/options
index 910e399ef1e9..6b4eb708abe4 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-352/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../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.8.x/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-470/options b/java/ql/test/experimental/query-tests/security/CWE-470/options
index c0d25dba5c23..4073b65ca96b 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-470/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x/:${testdir}/../../../../stubs/google-android-9.0.0
diff --git a/java/ql/test/experimental/query-tests/security/CWE-502/options b/java/ql/test/experimental/query-tests/security/CWE-502/options
index 0c6ef357b21a..2ce7a4743cd3 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-502/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-502/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-601/options b/java/ql/test/experimental/query-tests/security/CWE-601/options
index ba166b547a02..c2a86d9953b5 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-601/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-601/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.3.8/
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/experimental/query-tests/security/CWE-625/options b/java/ql/test/experimental/query-tests/security/CWE-625/options
index 5f11b982510f..d920e397bbf7 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-625/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/experimental/query-tests/security/CWE-652/options b/java/ql/test/experimental/query-tests/security/CWE-652/options
index 53ad1f48883e..1d1ea76aeb7d 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-652/options
+++ b/java/ql/test/experimental/query-tests/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}/../../../../stubs/apache-http-4.4.13/:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/saxon-xqj-9.x/:${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/library-tests/dataflow/taintsources/options b/java/ql/test/library-tests/dataflow/taintsources/options
index c8249b05e38e..ec6d96b41ac0 100644
--- a/java/ql/test/library-tests/dataflow/taintsources/options
+++ b/java/ql/test/library-tests/dataflow/taintsources/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:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/akka-2.6.x:${testdir}/../../../stubs/jwtk-jjwt-0.11.2:${testdir}/../../../stubs/jenkins:${testdir}/../../../stubs/stapler-1.263
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/akka-2.6.x:${testdir}/../../../stubs/jwtk-jjwt-0.11.2:${testdir}/../../../stubs/jenkins:${testdir}/../../../stubs/stapler-1.263
diff --git a/java/ql/test/library-tests/frameworks/spring/beans/options b/java/ql/test/library-tests/frameworks/spring/beans/options
index 0c6ef357b21a..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/beans/options
+++ b/java/ql/test/library-tests/frameworks/spring/beans/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/cache/options b/java/ql/test/library-tests/frameworks/spring/cache/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/cache/options
+++ b/java/ql/test/library-tests/frameworks/spring/cache/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/componentscan/options b/java/ql/test/library-tests/frameworks/spring/componentscan/options
index df84ab0bc1c5..bfb9659cc85f 100644
--- a/java/ql/test/library-tests/frameworks/spring/componentscan/options
+++ b/java/ql/test/library-tests/frameworks/spring/componentscan/options
@@ -1,2 +1,2 @@
 //semmle-extractor-options: --javac-args -cp
-//semmle-extractor-options: ${testdir}/../../../../stubs/springframework-5.3.8/
+//semmle-extractor-options: ${testdir}/../../../../stubs/springframework-5.8.x/
diff --git a/java/ql/test/library-tests/frameworks/spring/context/options b/java/ql/test/library-tests/frameworks/spring/context/options
index be838ec7faba..7f08d0e67454 100644
--- a/java/ql/test/library-tests/frameworks/spring/context/options
+++ b/java/ql/test/library-tests/frameworks/spring/context/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/apache-commons-logging-1.2/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/apache-commons-logging-1.2/
diff --git a/java/ql/test/library-tests/frameworks/spring/controller/options b/java/ql/test/library-tests/frameworks/spring/controller/options
index 9f114a23c96b..d981a45f408c 100644
--- a/java/ql/test/library-tests/frameworks/spring/controller/options
+++ b/java/ql/test/library-tests/frameworks/spring/controller/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/javax-servlet-2.5
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/javax-servlet-2.5
diff --git a/java/ql/test/library-tests/frameworks/spring/http/options b/java/ql/test/library-tests/frameworks/spring/http/options
index 0c6ef357b21a..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/http/options
+++ b/java/ql/test/library-tests/frameworks/spring/http/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
\ No newline at end of file
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/ui/options b/java/ql/test/library-tests/frameworks/spring/ui/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/ui/options
+++ b/java/ql/test/library-tests/frameworks/spring/ui/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/util/options b/java/ql/test/library-tests/frameworks/spring/util/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/util/options
+++ b/java/ql/test/library-tests/frameworks/spring/util/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/validation/options b/java/ql/test/library-tests/frameworks/spring/validation/options
index 06ec85dc706c..2ce7a4743cd3 100644
--- a/java/ql/test/library-tests/frameworks/spring/validation/options
+++ b/java/ql/test/library-tests/frameworks/spring/validation/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/library-tests/frameworks/spring/webmultipart/options b/java/ql/test/library-tests/frameworks/spring/webmultipart/options
index ff7fd8624384..d981a45f408c 100644
--- a/java/ql/test/library-tests/frameworks/spring/webmultipart/options
+++ b/java/ql/test/library-tests/frameworks/spring/webmultipart/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/javax-servlet-2.5
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/javax-servlet-2.5
diff --git a/java/ql/test/library-tests/frameworks/spring/webutil/options b/java/ql/test/library-tests/frameworks/spring/webutil/options
index 6dc26155d1d9..f62bc5777840 100644
--- a/java/ql/test/library-tests/frameworks/spring/webutil/options
+++ b/java/ql/test/library-tests/frameworks/spring/webutil/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.3.8:${testdir}/../../../../stubs/javax-servlet-2.5:${testdir}/../../../../stubs/apache-commons-logging-1.2
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x:${testdir}/../../../../stubs/javax-servlet-2.5:${testdir}/../../../../stubs/apache-commons-logging-1.2
diff --git a/java/ql/test/query-tests/security/CWE-022/semmle/tests/options b/java/ql/test/query-tests/security/CWE-022/semmle/tests/options
index 6f6c5a278883..547355c8e106 100644
--- a/java/ql/test/query-tests/security/CWE-022/semmle/tests/options
+++ b/java/ql/test/query-tests/security/CWE-022/semmle/tests/options
@@ -1 +1 @@
-// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/apache-commons-io-2.6:${testdir}/../../../../../stubs/cargo:${testdir}/../../../../../stubs/apache-ant-1.10.13:${testdir}/../../../../../stubs/stapler-1.263:${testdir}/../../../../../stubs/javax-servlet-2.5:${testdir}/../../../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../../../stubs/saxon-xqj-9.x:${testdir}/../../../../../stubs/apache-commons-beanutils:${testdir}/../../../../../stubs/dom4j-2.1.1:${testdir}/../../../../../stubs/apache-commons-lang:${testdir}/../../../../../stubs/jaxen-1.2.0:${testdir}/../../../../../stubs/jmh-1.3.6:${testdir}/../../../../../stubs/springframework-5.3.8:${testdir}/../../../../../stubs/jaxws-api-2.0:${testdir}/../../../../../stubs/apache-cxf
+// semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/apache-commons-io-2.6:${testdir}/../../../../../stubs/cargo:${testdir}/../../../../../stubs/apache-ant-1.10.13:${testdir}/../../../../../stubs/stapler-1.263:${testdir}/../../../../../stubs/javax-servlet-2.5:${testdir}/../../../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../../../stubs/saxon-xqj-9.x:${testdir}/../../../../../stubs/apache-commons-beanutils:${testdir}/../../../../../stubs/dom4j-2.1.1:${testdir}/../../../../../stubs/apache-commons-lang:${testdir}/../../../../../stubs/jaxen-1.2.0:${testdir}/../../../../../stubs/jmh-1.3.6:${testdir}/../../../../../stubs/springframework-5.8.x:${testdir}/../../../../../stubs/jaxws-api-2.0:${testdir}/../../../../../stubs/apache-cxf
diff --git a/java/ql/test/query-tests/security/CWE-074/options b/java/ql/test/query-tests/security/CWE-074/options
index 058d3f3e803c..becd1ca3f587 100644
--- a/java/ql/test/query-tests/security/CWE-074/options
+++ b/java/ql/test/query-tests/security/CWE-074/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/shiro-core-1.5.2:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/Saxon-HE-9.9.1-7:${testdir}/../../../stubs/apache-commons-logging-1.2
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/shiro-core-1.5.2:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/Saxon-HE-9.9.1-7:${testdir}/../../../stubs/apache-commons-logging-1.2
diff --git a/java/ql/test/query-tests/security/CWE-079/semmle/tests/options b/java/ql/test/query-tests/security/CWE-079/semmle/tests/options
index 78c431eb6834..399dceb33a69 100644
--- a/java/ql/test/query-tests/security/CWE-079/semmle/tests/options
+++ b/java/ql/test/query-tests/security/CWE-079/semmle/tests/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/javax-ws-rs-api-2.1.1/:${testdir}/../../../../../stubs/springframework-5.3.8:${testdir}/../../../../../stubs/javax-faces-2.3/:${testdir}/../../../../../stubs/google-android-9.0.0:${testdir}/../../../../../stubs/jenkins
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/servlet-api-2.4:${testdir}/../../../../../stubs/javax-ws-rs-api-2.1.1/:${testdir}/../../../../../stubs/springframework-5.8.x:${testdir}/../../../../../stubs/javax-faces-2.3/:${testdir}/../../../../../stubs/google-android-9.0.0:${testdir}/../../../../../stubs/jenkins
diff --git a/java/ql/test/query-tests/security/CWE-089/semmle/examples/options b/java/ql/test/query-tests/security/CWE-089/semmle/examples/options
index 8c08f8334017..832af0f3423c 100644
--- a/java/ql/test/query-tests/security/CWE-089/semmle/examples/options
+++ b/java/ql/test/query-tests/security/CWE-089/semmle/examples/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/mongodbClient:${testdir}/../../../../../stubs/springframework-5.3.8:${testdir}/../../../../../stubs/apache-hive --release 21
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../stubs/mongodbClient:${testdir}/../../../../../stubs/springframework-5.8.x:${testdir}/../../../../../stubs/apache-hive --release 21
diff --git a/java/ql/test/query-tests/security/CWE-090/options b/java/ql/test/query-tests/security/CWE-090/options
index 20bcd741bf6f..285b19e2b42a 100644
--- a/java/ql/test/query-tests/security/CWE-090/options
+++ b/java/ql/test/query-tests/security/CWE-090/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/unboundid-ldap-4.0.14:${testdir}/../../../stubs/esapi-2.0.1:${testdir}/../../../stubs/apache-ldap-1.0.2
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/spring-ldap-2.3.2:${testdir}/../../../stubs/unboundid-ldap-4.0.14:${testdir}/../../../stubs/esapi-2.0.1:${testdir}/../../../stubs/apache-ldap-1.0.2
diff --git a/java/ql/test/query-tests/security/CWE-094/options b/java/ql/test/query-tests/security/CWE-094/options
index 469e3df8ac09..94c205e754b2 100644
--- a/java/ql/test/query-tests/security/CWE-094/options
+++ b/java/ql/test/query-tests/security/CWE-094/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api:${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:${testdir}/../../..//stubs/google-android-9.0.0
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../stubs/apache-commons-logging-1.2:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api:${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:${testdir}/../../..//stubs/google-android-9.0.0
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
index 161a6ddf23d7..ab29fd4e46fa 100644
--- a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/query-tests/security/CWE-352/options b/java/ql/test/query-tests/security/CWE-352/options
index 1fef01772fe9..d23a76bd9025 100644
--- a/java/ql/test/query-tests/security/CWE-352/options
+++ b/java/ql/test/query-tests/security/CWE-352/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8/:${testdir}/../../../stubs/org.mybatis-3.5.4/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-logging-1.2/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/org.mybatis-3.5.4/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-logging-1.2/
diff --git a/java/ql/test/query-tests/security/CWE-502/options b/java/ql/test/query-tests/security/CWE-502/options
index f15c0b925385..698b9bf8f1a3 100644
--- a/java/ql/test/query-tests/security/CWE-502/options
+++ b/java/ql/test/query-tests/security/CWE-502/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/snakeyaml-1.21:${testdir}/../../../stubs/xstream-1.4.10:${testdir}/../../../stubs/kryo-4.0.2:${testdir}/../../../stubs/jsr311-api-1.1.1:${testdir}/../../../stubs/fastjson-1.2.74:${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/jyaml-1.3:${testdir}/../../../stubs/json-io-4.10.0:${testdir}/../../../stubs/yamlbeans-1.09:${testdir}/../../../stubs/hessian-4.0.38:${testdir}/../../../stubs/castor-1.4.1:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/jabsorb-1.3.2:${testdir}/../../../stubs/json-java-20210307:${testdir}/../../../stubs/joddjson-6.0.3:${testdir}/../../../stubs/flexjson-2.1:${testdir}/../../../stubs/gson-2.8.6:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/serialkiller-4.0.0:${testdir}/../../../stubs/jms-api-1
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/snakeyaml-1.21:${testdir}/../../../stubs/xstream-1.4.10:${testdir}/../../../stubs/kryo-4.0.2:${testdir}/../../../stubs/jsr311-api-1.1.1:${testdir}/../../../stubs/fastjson-1.2.74:${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/jyaml-1.3:${testdir}/../../../stubs/json-io-4.10.0:${testdir}/../../../stubs/yamlbeans-1.09:${testdir}/../../../stubs/hessian-4.0.38:${testdir}/../../../stubs/castor-1.4.1:${testdir}/../../../stubs/jackson-databind-2.12:${testdir}/../../../stubs/jackson-core-2.12:${testdir}/../../../stubs/jabsorb-1.3.2:${testdir}/../../../stubs/json-java-20210307:${testdir}/../../../stubs/joddjson-6.0.3:${testdir}/../../../stubs/flexjson-2.1:${testdir}/../../../stubs/gson-2.8.6:${testdir}/../../../stubs/google-android-9.0.0:${testdir}/../../../stubs/serialkiller-4.0.0:${testdir}/../../../stubs/jms-api-1
diff --git a/java/ql/test/query-tests/security/CWE-552/options b/java/ql/test/query-tests/security/CWE-552/options
index bda9516fb580..009d164e8fcf 100644
--- a/java/ql/test/query-tests/security/CWE-552/options
+++ b/java/ql/test/query-tests/security/CWE-552/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.3.8/:${testdir}/../../../stubs/javax-faces-2.3/:${testdir}/../../../stubs/undertow-io-2.2/:${testdir}/../../../stubs/jboss-vfs-3.2/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/apache-commons-fileupload-1.4/:${testdir}/../../../stubs/apache-commons-beanutils/:${testdir}/../../../stubs/saxon-xqj-9.x/:${testdir}/../../../stubs/apache-commons-lang/:${testdir}/../../../stubs/javax-servlet-2.5/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/servlet-api-2.4:${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/javax-faces-2.3/:${testdir}/../../../stubs/undertow-io-2.2/:${testdir}/../../../stubs/jboss-vfs-3.2/:${testdir}/../../../stubs/stapler-1.263/:${testdir}/../../../stubs/apache-commons-fileupload-1.4/:${testdir}/../../../stubs/apache-commons-beanutils/:${testdir}/../../../stubs/saxon-xqj-9.x/:${testdir}/../../../stubs/apache-commons-lang/:${testdir}/../../../stubs/javax-servlet-2.5/
diff --git a/java/ql/test/query-tests/security/CWE-611/options b/java/ql/test/query-tests/security/CWE-611/options
index 145681fcb031..1480b49d7168 100644
--- a/java/ql/test/query-tests/security/CWE-611/options
+++ b/java/ql/test/query-tests/security/CWE-611/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jdom-1.1.3:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/simple-xml-2.7.1:${testdir}/../../../stubs/jaxb-api-2.3.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-digester3-3.2:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/rundeck-api-java-client-13.2:${testdir}/../../../stubs/springframework-5.3.8/:${testdir}/../../../stubs/mdht-1.2.0/
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/jdom-1.1.3:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/simple-xml-2.7.1:${testdir}/../../../stubs/jaxb-api-2.3.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/apache-commons-digester3-3.2:${testdir}/../../../stubs/servlet-api-2.4/:${testdir}/../../../stubs/rundeck-api-java-client-13.2:${testdir}/../../../stubs/springframework-5.8.x/:${testdir}/../../../stubs/mdht-1.2.0/
diff --git a/java/ql/test/query-tests/security/CWE-917/options b/java/ql/test/query-tests/security/CWE-917/options
index cfb77dafac33..35f135b5f1bf 100644
--- a/java/ql/test/query-tests/security/CWE-917/options
+++ b/java/ql/test/query-tests/security/CWE-917/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/ognl-3.2.14:${testdir}/../../../stubs/struts2-core-2.5.22
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/ognl-3.2.14:${testdir}/../../../stubs/struts2-core-2.5.22
diff --git a/java/ql/test/query-tests/security/CWE-918/options b/java/ql/test/query-tests/security/CWE-918/options
index 4158843ef980..78a6c15024ae 100644
--- a/java/ql/test/query-tests/security/CWE-918/options
+++ b/java/ql/test/query-tests/security/CWE-918/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/springframework-5.3.8:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/:${testdir}/../../../stubs/cargo:${testdir}/../../../stubs/javafx-web:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/apache-http-5:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jaxws-api-2.0:${testdir}/../../../stubs/apache-cxf
+//semmle-extractor-options: --javac-args -source 11 -target 11 -cp ${testdir}/../../../stubs/springframework-5.8.x:${testdir}/../../../stubs/javax-ws-rs-api-2.1.1:${testdir}/../../../stubs/javax-ws-rs-api-3.0.0:${testdir}/../../../stubs/apache-http-4.4.13/:${testdir}/../../../stubs/projectreactor-3.4.3/:${testdir}/../../../stubs/postgresql-42.3.3/:${testdir}/../../../stubs/HikariCP-3.4.5/:${testdir}/../../../stubs/spring-jdbc-5.3.8/:${testdir}/../../../stubs/jdbi3-core-3.27.2/:${testdir}/../../../stubs/cargo:${testdir}/../../../stubs/javafx-web:${testdir}/../../../stubs/apache-commons-jelly-1.0.1:${testdir}/../../../stubs/dom4j-2.1.1:${testdir}/../../../stubs/jaxen-1.2.0:${testdir}/../../../stubs/stapler-1.263:${testdir}/../../../stubs/javax-servlet-2.5:${testdir}/../../../stubs/apache-commons-fileupload-1.4:${testdir}/../../../stubs/saxon-xqj-9.x:${testdir}/../../../stubs/apache-commons-beanutils:${testdir}/../../../stubs/apache-commons-lang:${testdir}/../../../stubs/apache-http-5:${testdir}/../../../stubs/playframework-2.6.x:${testdir}/../../../stubs/jaxws-api-2.0:${testdir}/../../../stubs/apache-cxf
diff --git a/java/ql/test/stubs/springframework-5.3.8/LICENSE.txt b/java/ql/test/stubs/springframework-5.8.x/LICENSE.txt
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/LICENSE.txt
rename to java/ql/test/stubs/springframework-5.8.x/LICENSE.txt
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/BeansException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/BeansException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/BeansException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/BeansException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/FatalBeanException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/FatalBeanException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/FatalBeanException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/FatalBeanException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/MutablePropertyValues.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/MutablePropertyValues.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/MutablePropertyValues.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/MutablePropertyValues.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValue.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValue.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValue.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValue.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValues.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValues.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/PropertyValues.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/PropertyValues.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/Aware.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/Aware.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/Aware.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/Aware.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanClassLoaderAware.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanClassLoaderAware.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanClassLoaderAware.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanClassLoaderAware.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanDefinitionStoreException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanDefinitionStoreException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanDefinitionStoreException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanDefinitionStoreException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/BeanFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/BeanFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/HierarchicalBeanFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/HierarchicalBeanFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/HierarchicalBeanFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/HierarchicalBeanFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/InitializingBean.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/InitializingBean.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/InitializingBean.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/InitializingBean.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/ListableBeanFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/ListableBeanFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/ListableBeanFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/ListableBeanFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/NoSuchBeanDefinitionException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/NoSuchBeanDefinitionException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/annotation/Autowired.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/annotation/Autowired.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/annotation/Autowired.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/annotation/Autowired.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/config/BeanDefinition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/config/BeanDefinition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/config/BeanDefinition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/config/BeanDefinition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanNameGenerator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanNameGenerator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/beans/factory/support/BeanNameGenerator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/beans/factory/support/BeanNameGenerator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/SpringBootConfiguration.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/SpringBootConfiguration.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/SpringBootConfiguration.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/SpringBootConfiguration.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/actuate/autoconfigure/security/servlet/EndpointRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/autoconfigure/SpringBootApplication.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/autoconfigure/SpringBootApplication.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/autoconfigure/SpringBootApplication.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/autoconfigure/SpringBootApplication.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/jdbc/DataSourceBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/jdbc/DataSourceBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/jdbc/DataSourceBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/boot/security/servlet/ApplicationContextRequestMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/cache/Cache.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/cache/Cache.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/cache/Cache.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/cache/Cache.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationEventPublisher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationEventPublisher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/ApplicationEventPublisher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/ApplicationEventPublisher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/HierarchicalMessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/HierarchicalMessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/HierarchicalMessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/HierarchicalMessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSourceResolvable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSourceResolvable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/MessageSourceResolvable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/MessageSourceResolvable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/AnnotationScopeMetadataResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Bean.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Bean.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Bean.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Bean.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScan.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScan.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScan.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScan.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScans.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScans.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ComponentScans.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ComponentScans.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Condition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Condition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Condition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Condition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ConditionContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ConditionContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ConditionContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ConditionContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Conditional.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Conditional.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Conditional.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Conditional.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Configuration.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Configuration.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Configuration.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Configuration.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/FilterType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/FilterType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/FilterType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/FilterType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Profile.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Profile.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/Profile.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/Profile.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ProfileCondition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ProfileCondition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ProfileCondition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ProfileCondition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadata.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadata.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadata.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadata.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadataResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadataResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopeMetadataResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopeMetadataResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopedProxyMode.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopedProxyMode.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/annotation/ScopedProxyMode.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/annotation/ScopedProxyMode.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/AbstractMessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/AbstractMessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/AbstractMessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/AbstractMessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/DefaultMessageSourceResolvable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/DefaultMessageSourceResolvable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/DefaultMessageSourceResolvable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/DefaultMessageSourceResolvable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/MessageSourceSupport.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/MessageSourceSupport.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/MessageSourceSupport.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/MessageSourceSupport.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/StaticMessageSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/StaticMessageSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/context/support/StaticMessageSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/context/support/StaticMessageSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/AliasRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/AliasRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/AliasRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/AliasRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/NestedRuntimeException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/NestedRuntimeException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/NestedRuntimeException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/NestedRuntimeException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ParameterizedTypeReference.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ParameterizedTypeReference.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ParameterizedTypeReference.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ParameterizedTypeReference.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ResolvableType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ResolvableType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/ResolvableType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/ResolvableType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/annotation/AliasFor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/annotation/AliasFor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/annotation/AliasFor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/annotation/AliasFor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/env/EnvironmentCapable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/env/EnvironmentCapable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/env/EnvironmentCapable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/env/EnvironmentCapable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractFileResolvingResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractFileResolvingResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractFileResolvingResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractFileResolvingResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/AbstractResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/AbstractResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ClassPathResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ClassPathResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ClassPathResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ClassPathResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileSystemResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileSystemResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileSystemResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileSystemResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileUrlResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileUrlResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/FileUrlResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/FileUrlResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/InputStreamSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/InputStreamSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/InputStreamSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/InputStreamSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/PathResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/PathResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/PathResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/PathResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/Resource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/Resource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/Resource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/Resource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ResourceLoader.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ResourceLoader.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/ResourceLoader.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/ResourceLoader.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/UrlResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/UrlResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/UrlResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/UrlResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/WritableResource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/WritableResource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/WritableResource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/WritableResource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourcePatternResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourcePatternResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourcePatternResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourcePatternResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourceRegion.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourceRegion.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/io/support/ResourceRegion.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/io/support/ResourceRegion.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/core/type/AnnotatedTypeMetadata.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/core/type/AnnotatedTypeMetadata.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/core/type/AnnotatedTypeMetadata.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/core/type/AnnotatedTypeMetadata.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/dao/DataAccessException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/dao/DataAccessException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/dao/DataAccessException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/dao/DataAccessException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Pageable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Pageable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Pageable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Pageable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Sort.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Sort.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/domain/Sort.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/domain/Sort.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/MethodInvocationRecorder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/MethodInvocationRecorder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/MethodInvocationRecorder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/MethodInvocationRecorder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/Streamable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/Streamable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/data/util/Streamable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/data/util/Streamable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/EvaluationException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/EvaluationException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/Expression.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/Expression.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/Expression.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/Expression.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionParser.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionParser.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ExpressionParser.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ExpressionParser.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParseException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParseException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParseException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParseException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParserContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParserContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/ParserContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/ParserContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/common/TemplateAwareExpressionParser.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/common/TemplateAwareExpressionParser.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/common/TemplateAwareExpressionParser.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/common/TemplateAwareExpressionParser.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpression.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpression.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpression.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpression.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpressionParser.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpressionParser.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/standard/SpelExpressionParser.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/standard/SpelExpressionParser.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/SimpleEvaluationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/SimpleEvaluationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/SimpleEvaluationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/SimpleEvaluationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/StandardEvaluationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/StandardEvaluationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/expression/spel/support/StandardEvaluationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/expression/spel/support/StandardEvaluationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/CacheControl.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/CacheControl.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/CacheControl.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/CacheControl.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ContentDisposition.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ContentDisposition.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ContentDisposition.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ContentDisposition.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpEntity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpEntity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpEntity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpEntity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpHeaders.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpHeaders.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpHeaders.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpHeaders.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMessage.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMessage.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMessage.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMessage.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMethod.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMethod.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpMethod.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpMethod.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRange.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRange.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRange.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRange.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpStatus.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpStatus.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/HttpStatus.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/HttpStatus.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/MediaType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/MediaType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/MediaType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/MediaType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/RequestEntity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/RequestEntity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/RequestEntity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/RequestEntity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ResponseEntity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ResponseEntity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/ResponseEntity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/ResponseEntity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/client/ClientHttpResponse.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/client/ClientHttpResponse.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/client/ClientHttpResponse.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/client/ClientHttpResponse.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/PathContainer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/PathContainer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/PathContainer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/PathContainer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/RequestPath.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/RequestPath.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/http/server/RequestPath.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/http/server/RequestPath.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/BatchPreparedStatementSetter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/BatchPreparedStatementSetter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCreator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCreator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/CallableStatementCreator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/CallableStatementCreator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ConnectionCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ConnectionCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ConnectionCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ConnectionCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcOperations.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcOperations.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcOperations.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcOperations.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/JdbcTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/JdbcTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ParameterizedPreparedStatementSetter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCreator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCreator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementCreator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementCreator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementSetter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementSetter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/PreparedStatementSetter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/PreparedStatementSetter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetExtractor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetExtractor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetExtractor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetExtractor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/ResultSetSupportingSqlParameter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowCallbackHandler.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowCallbackHandler.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowCallbackHandler.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowCallbackHandler.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowMapper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowMapper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/RowMapper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/RowMapper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/SqlParameter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/SqlParameter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/SqlParameter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/SqlParameter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/StatementCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/StatementCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/StatementCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/StatementCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcOperations.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/NamedParameterJdbcTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/ParsedSql.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/ParsedSql.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/ParsedSql.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/ParsedSql.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/SqlParameterSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/core/namedparam/SqlParameterSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/BatchSqlUpdate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/BatchSqlUpdate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/BatchSqlUpdate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/BatchSqlUpdate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQuery.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQuery.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQuery.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQuery.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/MappingSqlQueryWithParameters.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/RdbmsOperation.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/RdbmsOperation.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/RdbmsOperation.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/RdbmsOperation.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlFunction.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlFunction.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlFunction.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlFunction.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlOperation.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlOperation.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlOperation.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlOperation.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlQuery.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlQuery.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlQuery.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlQuery.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlUpdate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlUpdate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/SqlUpdate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/SqlUpdate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/UpdatableSqlQuery.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/UpdatableSqlQuery.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/object/UpdatableSqlQuery.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/object/UpdatableSqlQuery.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/JdbcAccessor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/JdbcAccessor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/JdbcAccessor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/JdbcAccessor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/KeyHolder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/KeyHolder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/KeyHolder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/KeyHolder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/SQLExceptionTranslator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/SQLExceptionTranslator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/SQLExceptionTranslator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/SQLExceptionTranslator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSet.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSet.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSet.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSet.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jdbc/support/rowset/SqlRowSetMetaData.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/jndi/JndiTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/jndi/JndiTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/lang/Nullable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/lang/Nullable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/lang/Nullable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/lang/Nullable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianServiceExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianServiceExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/caucho/HessianServiceExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/caucho/HessianServiceExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/httpinvoker/HttpInvokerServiceExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RemoteInvocationSerializingExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiBasedExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiBasedExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiBasedExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiBasedExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiServiceExporter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiServiceExporter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/remoting/rmi/RmiServiceExporter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/remoting/rmi/RmiServiceExporter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptEvaluator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptEvaluator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptEvaluator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptEvaluator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/ScriptSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/ScriptSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/bsh/BshScriptEvaluator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/bsh/BshScriptEvaluator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/bsh/BshScriptEvaluator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/bsh/BshScriptEvaluator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/support/StaticScriptSource.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/support/StaticScriptSource.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/scripting/support/StaticScriptSource.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/scripting/support/StaticScriptSource.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/Customizer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/Customizer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/Customizer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/Customizer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/AbstractSecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractHttpConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/web/server/ServerHttpSecurity.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/web/server/ServerHttpSecurity.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/config/web/server/ServerHttpSecurity.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/config/web/server/ServerHttpSecurity.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/DefaultSecurityFilterChain.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/DefaultSecurityFilterChain.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/DefaultSecurityFilterChain.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/DefaultSecurityFilterChain.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/SecurityFilterChain.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/SecurityFilterChain.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/SecurityFilterChain.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/SecurityFilterChain.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/csrf/CsrfToken.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/csrf/CsrfToken.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/csrf/CsrfToken.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/csrf/CsrfToken.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SavedRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SavedRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SavedRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SavedRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SimpleSavedRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SimpleSavedRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/savedrequest/SimpleSavedRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/savedrequest/SimpleSavedRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/util/matcher/RequestMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/util/matcher/RequestMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/security/web/util/matcher/RequestMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/security/web/util/matcher/RequestMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Component.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Component.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Component.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Component.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Controller.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Controller.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Controller.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Controller.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Indexed.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Indexed.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Indexed.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Indexed.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Repository.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Repository.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Repository.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Repository.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Service.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Service.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/stereotype/Service.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/stereotype/Service.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ConcurrentModel.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ConcurrentModel.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ConcurrentModel.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ConcurrentModel.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/Model.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/Model.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/Model.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/Model.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ModelMap.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ModelMap.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/ui/ModelMap.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/ui/ModelMap.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AntPathMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AntPathMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AntPathMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AntPathMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AutoPopulatingList.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AutoPopulatingList.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/AutoPopulatingList.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/AutoPopulatingList.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/Base64Utils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/Base64Utils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/Base64Utils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/Base64Utils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CollectionUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CollectionUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CollectionUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CollectionUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CompositeIterator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CompositeIterator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/CompositeIterator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/CompositeIterator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FastByteArrayOutputStream.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FastByteArrayOutputStream.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FastByteArrayOutputStream.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FastByteArrayOutputStream.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileCopyUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileCopyUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileCopyUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileCopyUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileSystemUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileSystemUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/FileSystemUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/FileSystemUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/LinkedMultiValueMap.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/LinkedMultiValueMap.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/LinkedMultiValueMap.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/LinkedMultiValueMap.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MimeType.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MimeType.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MimeType.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MimeType.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMap.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMap.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMap.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMap.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMapAdapter.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMapAdapter.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/MultiValueMapAdapter.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/MultiValueMapAdapter.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ObjectUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ObjectUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ObjectUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ObjectUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PathMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PathMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PathMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PathMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertiesPersister.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertiesPersister.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertiesPersister.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertiesPersister.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertyPlaceholderHelper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertyPlaceholderHelper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/PropertyPlaceholderHelper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/PropertyPlaceholderHelper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ResourceUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ResourceUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/ResourceUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/ResourceUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/RouteMatcher.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/RouteMatcher.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/RouteMatcher.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/RouteMatcher.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SerializationUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SerializationUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SerializationUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SerializationUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StreamUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StreamUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StreamUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StreamUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringValueResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringValueResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/StringValueResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/StringValueResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SystemPropertyUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SystemPropertyUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/util/SystemPropertyUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/util/SystemPropertyUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/Errors.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/Errors.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/Errors.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/Errors.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/FieldError.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/FieldError.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/FieldError.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/FieldError.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/ObjectError.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/ObjectError.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/validation/ObjectError.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/validation/ObjectError.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/CookieValue.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/CookieValue.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/CookieValue.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/CookieValue.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/GetMapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/GetMapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/GetMapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/GetMapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/Mapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/Mapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/Mapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/Mapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/MatrixVariable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/MatrixVariable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/MatrixVariable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/MatrixVariable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ModelAttribute.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ModelAttribute.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ModelAttribute.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ModelAttribute.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PathVariable.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PathVariable.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PathVariable.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PathVariable.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PostMapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PostMapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/PostMapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/PostMapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestAttribute.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestAttribute.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestAttribute.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestAttribute.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestBody.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestBody.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestBody.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestBody.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestHeader.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestHeader.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestHeader.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestHeader.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMapping.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMapping.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMapping.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMapping.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMethod.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMethod.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestMethod.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestMethod.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestParam.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestParam.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestParam.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestParam.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestPart.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestPart.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RequestPart.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RequestPart.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ResponseBody.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ResponseBody.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/ResponseBody.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/ResponseBody.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RestController.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RestController.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/RestController.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/RestController.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/SessionAttribute.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/SessionAttribute.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/annotation/SessionAttribute.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/annotation/SessionAttribute.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/support/SessionStatus.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/support/SessionStatus.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/bind/support/SessionStatus.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/bind/support/SessionStatus.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RequestCallback.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RequestCallback.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RequestCallback.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RequestCallback.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/ResponseExtractor.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/ResponseExtractor.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/ResponseExtractor.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/ResponseExtractor.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestClientException.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestClientException.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestClientException.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestClientException.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/client/RestTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/client/RestTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/WebApplicationContext.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/WebApplicationContext.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/WebApplicationContext.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/WebApplicationContext.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/NativeWebRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/NativeWebRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/NativeWebRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/NativeWebRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/RequestAttributes.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/RequestAttributes.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/RequestAttributes.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/RequestAttributes.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/WebRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/WebRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/context/request/WebRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/context/request/WebRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartFile.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartFile.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartFile.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartFile.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartHttpServletRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartHttpServletRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartHttpServletRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartHttpServletRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartRequest.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartRequest.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartRequest.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartRequest.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartResolver.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartResolver.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/multipart/MultipartResolver.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/multipart/MultipartResolver.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/DefaultWebClientBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/WebClient.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/WebClient.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/reactive/function/client/WebClient.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/reactive/function/client/WebClient.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/ModelAndView.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/ModelAndView.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/ModelAndView.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/ModelAndView.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/View.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/View.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/View.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/View.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/mvc/support/RedirectAttributes.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/mvc/support/RedirectAttributes.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/AbstractUrlBasedView.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/AbstractUrlBasedView.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/AbstractUrlBasedView.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/AbstractUrlBasedView.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/RedirectView.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/RedirectView.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/servlet/view/RedirectView.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/servlet/view/RedirectView.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/AbstractUriTemplateHandler.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/AbstractUriTemplateHandler.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/AbstractUriTemplateHandler.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/AbstractUriTemplateHandler.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingRequestWrapper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingRequestWrapper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingRequestWrapper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingRequestWrapper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingResponseWrapper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingResponseWrapper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ContentCachingResponseWrapper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ContentCachingResponseWrapper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/CookieGenerator.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/CookieGenerator.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/CookieGenerator.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/CookieGenerator.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/DefaultUriBuilderFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/DefaultUriBuilderFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/DefaultUriBuilderFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/DefaultUriBuilderFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/HtmlUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/HtmlUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/HtmlUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/HtmlUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletContextPropertyUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletContextPropertyUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletContextPropertyUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletContextPropertyUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletRequestPathUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletRequestPathUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/ServletRequestPathUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/ServletRequestPathUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilderFactory.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilderFactory.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriBuilderFactory.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriBuilderFactory.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponents.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponents.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponents.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponents.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponentsBuilder.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponentsBuilder.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriComponentsBuilder.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriComponentsBuilder.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplate.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplate.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplate.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplate.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplateHandler.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplateHandler.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriTemplateHandler.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriTemplateHandler.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UriUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UriUtils.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UrlPathHelper.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UrlPathHelper.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/UrlPathHelper.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/UrlPathHelper.java
diff --git a/java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/WebUtils.java b/java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/WebUtils.java
similarity index 100%
rename from java/ql/test/stubs/springframework-5.3.8/org/springframework/web/util/WebUtils.java
rename to java/ql/test/stubs/springframework-5.8.x/org/springframework/web/util/WebUtils.java