diff --git a/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-tools/spring-boot-loader/pom.xml index 1d72ad5a37b..9a9072e32d9 100644 --- a/spring-boot-tools/spring-boot-loader/pom.xml +++ b/spring-boot-tools/spring-boot-loader/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 org.springframework.boot 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 2df6271e8f3..e67fd8328ad 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 @@ -12,6 +12,11 @@ + + org.apache.maven.plugins + maven-compiler-plugin + @maven-compiler-plugin.version@ + org.apache.maven.plugins maven-dependency-plugin @@ -47,10 +52,20 @@ + + org.apache.maven.plugins + maven-jar-plugin + @maven-jar-plugin.version@ + + + org.apache.maven.plugins + maven-surefire-plugin + @maven-surefire-plugin.version@ + org.codehaus.mojo exec-maven-plugin - 1.2.1 + @exec-maven-plugin.version@ java @@ -62,6 +77,15 @@ + + + + javax.annotation + javax.annotation-api + @javax-annotation.version@ + + + org.eclipse.jetty 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 3e57160e107..c4f6460cf27 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 @@ -12,6 +12,38 @@ + + maven-assembly-plugin + @maven-assembly-plugin.version@ + + + src/main/assembly/jar-with-dependencies.xml + + false + + + org.springframework.boot.loader.JarLauncher + + + org.springframework.boot.load.it.jar.EmbeddedJarStarter + + + + + + jar-with-dependencies + package + + single + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @maven-compiler-plugin.version@ + org.apache.maven.plugins maven-dependency-plugin @@ -48,33 +80,26 @@ - maven-assembly-plugin - 2.4 - - - src/main/assembly/jar-with-dependencies.xml - - - - org.springframework.boot.loader.JarLauncher - - - org.springframework.boot.load.it.jar.EmbeddedJarStarter - - - - - - jar-with-dependencies - package - - single - - - + org.apache.maven.plugins + maven-jar-plugin + @maven-jar-plugin.version@ + + + org.apache.maven.plugins + maven-surefire-plugin + @maven-surefire-plugin.version@ + + + + javax.annotation + javax.annotation-api + @javax-annotation.version@ + + + org.eclipse.jetty 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 6820957f80b..2adc1ca7709 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 @@ -12,6 +12,51 @@ + + maven-assembly-plugin + @maven-assembly-plugin.version@ + + + app + package + + single + + + + src/main/assembly/app.xml + + false + + + org.springframework.boot.loader.PropertiesLauncher + + + org.springframework.boot.launcher.it.props.EmbeddedJarStarter + + + + + + depedendencies + package + + single + + + + src/main/assembly/dependencies.xml + + false + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @maven-compiler-plugin.version@ + org.apache.maven.plugins maven-dependency-plugin @@ -48,42 +93,14 @@ - maven-assembly-plugin - 2.4 - - - app - package - - single - - - - src/main/assembly/app.xml - - - - org.springframework.boot.loader.PropertiesLauncher - - - org.springframework.boot.launcher.it.props.EmbeddedJarStarter - - - - - - depedendencies - package - - single - - - - src/main/assembly/dependencies.xml - - - - + org.apache.maven.plugins + maven-jar-plugin + @maven-jar-plugin.version@ + + + org.apache.maven.plugins + maven-surefire-plugin + @maven-surefire-plugin.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 642f422a77f..b368a360821 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 @@ -12,6 +12,38 @@ + + maven-assembly-plugin + @maven-assembly-plugin.version@ + + + src/main/assembly/jar-with-dependencies.xml + + false + + + org.springframework.boot.loader.PropertiesLauncher + + + org.springframework.boot.load.it.props.EmbeddedJarStarter + + + + + + jar-with-dependencies + package + + single + + + + + + org.apache.maven.plugins + maven-compiler-plugin + @maven-compiler-plugin.version@ + org.apache.maven.plugins maven-dependency-plugin @@ -48,30 +80,14 @@ - maven-assembly-plugin - 2.4 - - - src/main/assembly/jar-with-dependencies.xml - - - - org.springframework.boot.loader.PropertiesLauncher - - - org.springframework.boot.load.it.props.EmbeddedJarStarter - - - - - - jar-with-dependencies - package - - single - - - + org.apache.maven.plugins + maven-jar-plugin + @maven-jar-plugin.version@ + + + org.apache.maven.plugins + maven-surefire-plugin + @maven-surefire-plugin.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 1dcac180d20..7cd3bf8621f 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 @@ -15,18 +15,8 @@ org.apache.maven.plugins - maven-war-plugin - @maven-war-plugin.version@ - - - - org.springframework.boot.loader.WarLauncher - - - org.springframework.boot.load.it.war.embedded.EmbeddedWarStarter - - - + maven-compiler-plugin + @maven-compiler-plugin.version@ org.apache.maven.plugins @@ -53,8 +43,37 @@ + + org.apache.maven.plugins + maven-surefire-plugin + @maven-surefire-plugin.version@ + + + org.apache.maven.plugins + maven-war-plugin + @maven-war-plugin.version@ + + + + org.springframework.boot.loader.WarLauncher + + + org.springframework.boot.load.it.war.embedded.EmbeddedWarStarter + + + + + + + + javax.annotation + javax.annotation-api + @javax-annotation.version@ + + + org.eclipse.jetty