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 95a49ab99c..2454461ce0 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 @@ -13,7 +13,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + @maven-compiler-plugin.version@ 1.6 1.6 @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + @maven-dependency-plugin.version@ unpack @@ -73,17 +73,17 @@ org.eclipse.jetty jetty-webapp - 8.1.14.v20131031 + @jetty.version@ org.eclipse.jetty jetty-annotations - 8.1.14.v20131031 + @jetty.version@ org.springframework spring-webmvc - 4.0.5.RELEASE + @spring.version@ 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 79a2b37fd8..e094f31b5b 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 @@ -13,7 +13,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + @maven-compiler-plugin.version@ 1.6 1.6 @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + @maven-dependency-plugin.version@ unpack @@ -86,17 +86,17 @@ org.eclipse.jetty jetty-webapp - 8.1.14.v20131031 + @jetty.version@ org.eclipse.jetty jetty-annotations - 8.1.14.v20131031 + @jetty.version@ org.springframework spring-webmvc - 4.0.5.RELEASE + @spring.version@ diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml index 50b0f033e9..eeb46ffe33 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml @@ -13,7 +13,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + @maven-compiler-plugin.version@ 1.6 1.6 @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + @maven-dependency-plugin.version@ unpack @@ -98,7 +98,7 @@ org.springframework spring-context - 4.1.4.RELEASE + @spring.version@ diff --git a/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml b/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml index ac5eaa5184..86b1e0d401 100644 --- a/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml +++ b/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml @@ -13,7 +13,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + @maven-compiler-plugin.version@ 1.6 1.6 @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + @maven-dependency-plugin.version@ unpack @@ -86,7 +86,7 @@ org.springframework spring-context - 4.1.4.RELEASE + @spring.version@ 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 583f40768f..c96a0771bf 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 @@ -14,7 +14,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + @maven-compiler-plugin.version@ 1.6 1.6 @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + @maven-war-plugin.version@ @@ -39,7 +39,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.10 + @maven-dependency-plugin.version@ unpack @@ -67,22 +67,22 @@ org.eclipse.jetty jetty-webapp - 8.1.14.v20131031 + @jetty.version@ org.eclipse.jetty jetty-plus - 8.1.14.v20131031 + @jetty.version@ org.eclipse.jetty jetty-annotations - 8.1.14.v20131031 + @jetty.version@ org.springframework spring-webmvc - 4.0.5.RELEASE + @spring.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml index b9692a22bb..8bc88c54ad 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -37,6 +37,9 @@ true ${skipTests} true + + + diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml index 5677aff7f2..8cf54bbd53 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-attach-disabled/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml index 9538ec1f66..3db291202b 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-create-dir/pom.xml @@ -29,7 +29,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml index 758874cea3..97e84a7b30 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-dir/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml index 1facd708d4..d6e0b366db 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-custom-launcher/pom.xml @@ -31,7 +31,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml index b8f24f81d5..a1b8e36efc 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-artifact/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml index f4b86dcd60..39f50c7096 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-entry/pom.xml @@ -33,7 +33,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml index 34abd05130..a13abd757e 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-exclude-group/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ @@ -54,7 +54,7 @@ org.apache.logging.log4j log4j-api - 2.4.1 + @log4j2.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml index 769b509c7d..74923354a3 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-executable/pom.xml @@ -30,7 +30,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml index 15f46aa695..6fc88119ee 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-lib-name-conflict/test-project/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml index a65dd9ae0d..d16524b17f 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-non-executable/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml index 10229883bf..a9c3d4b029 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope-default/pom.xml @@ -25,7 +25,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml index 04a99d4e39..9188c3d924 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-system-scope/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml index d3ba2034a6..d503585402 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-test-scope/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ @@ -54,7 +54,7 @@ org.apache.logging.log4j log4j-api - 2.4.1 + @log4j2.version@ test diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml index 015944e662..f6ed12cd57 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/jar-with-unpack/pom.xml @@ -33,7 +33,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ 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 c93303bea9..d23a616d19 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 @@ -25,7 +25,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml index 7c78404a8b..8d0da4a4d1 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/module/pom.xml @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ 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 adbc252cb7..f3f62d0cbd 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 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.4 + @maven-jar-plugin.version@ diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-automatic-fork/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-automatic-fork/pom.xml index 577fd23131..934a03570d 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-automatic-fork/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-automatic-fork/pom.xml @@ -13,6 +13,7 @@ org.codehaus.mojo build-helper-maven-plugin + @build-helper-maven-plugin.version@ reserve-jmx-port diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/pom.xml index d2e1046c13..313e6fc040 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/start-stop-fork/pom.xml @@ -13,6 +13,7 @@ org.codehaus.mojo build-helper-maven-plugin + @build-helper-maven-plugin.version@ reserve-jmx-port diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml index 3b2d0d710e..f274b77001 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-reactor/war/pom.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + @maven-war-plugin.version@ false diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml index 02d0aa838e..8307530abf 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/src/it/war-with-unpack/pom.xml @@ -34,7 +34,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + @maven-war-plugin.version@ false 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 9ebafb04ea..7b5a12b5e3 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 @@ -26,7 +26,7 @@ org.apache.maven.plugins maven-war-plugin - 2.3 + @maven-war-plugin.version@ false