diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 86e9974c7da..bbab0a7acd8 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -88,6 +88,7 @@ 1.1.1.RELEASE 2.0.2.RELEASE 0.9.0.RELEASE + 1.2.0.RELEASE 1.2.2.RELEASE 1.1.1.RELEASE 3.2.4.RELEASE @@ -512,6 +513,11 @@ + + org.springframework + springloaded + ${spring-loaded.version} + org.springframework.batch spring-batch-core diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml index d60ace02138..d58ed4f0caa 100644 --- a/spring-boot-tools/spring-boot-loader-tools/pom.xml +++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml @@ -36,6 +36,11 @@ zt-zip test + + org.springframework + springloaded + test + diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml index 3fc16df78df..53849e21083 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.6 + 2.8 unpack @@ -73,17 +73,17 @@ org.eclipse.jetty jetty-webapp - 8.1.8.v20121106 + 8.1.14.v20131031 org.eclipse.jetty jetty-annotations - 8.1.8.v20121106 + 8.1.14.v20131031 org.springframework spring-webmvc - 3.2.0.RELEASE + 4.0.5.RELEASE diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml index 2fffa60044d..a80b5fc6927 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.6 + 2.8 unpack @@ -86,17 +86,17 @@ org.eclipse.jetty jetty-webapp - 8.1.8.v20121106 + 8.1.14.v20131031 org.eclipse.jetty jetty-annotations - 8.1.8.v20121106 + 8.1.14.v20131031 org.springframework spring-webmvc - 3.2.0.RELEASE + 4.0.5.RELEASE diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml index 193173d667b..305c85e517a 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.6 + 2.8 unpack @@ -67,22 +67,22 @@ org.eclipse.jetty jetty-webapp - 8.1.8.v20121106 + 8.1.14.v20131031 org.eclipse.jetty jetty-plus - 8.1.8.v20121106 + 8.1.14.v20131031 org.eclipse.jetty jetty-annotations - 8.1.8.v20121106 + 8.1.14.v20131031 org.springframework spring-webmvc - 3.2.0.RELEASE + 4.0.5.RELEASE diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml index c851abd8c5c..e9208df9d75 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar/pom.xml @@ -43,7 +43,7 @@ org.springframework spring-context - 3.2.3.RELEASE + 4.0.5.RELEASE javax.servlet diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml index 2bdf8012984..b170f2e04e3 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/prop/pom.xml @@ -43,7 +43,7 @@ org.springframework spring-context - 3.2.3.RELEASE + 4.0.5.RELEASE javax.servlet diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml index b947e7b4722..de38c51db73 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war/pom.xml @@ -42,7 +42,7 @@ org.springframework spring-context - 3.2.3.RELEASE + 4.0.5.RELEASE javax.servlet