diff --git a/pom.xml b/pom.xml index afb8d88d40..94e19a1956 100644 --- a/pom.xml +++ b/pom.xml @@ -20,10 +20,11 @@ 1.6 UTF-8 - 4.0.0.BOOTSTRAP-SNAPSHOT - 1.0.0.CI-SNAPSHOT - 2.2.3.RELEASE - 2.2.0.RC1 + 4.0.0.BOOTSTRAP-SNAPSHOT + 1.0.0.CI-SNAPSHOT + 2.2.3.RELEASE + 2.2.0.RC1 + 7.0.39 @@ -251,17 +252,17 @@ org.apache.tomcat.embed tomcat-embed-core - 7.0.39 + ${tomcat.version} org.apache.tomcat.embed tomcat-embed-logging-juli - 7.0.39 + ${tomcat.version} org.apache.tomcat.embed tomcat-embed-jasper - 7.0.39 + ${tomcat.version} org.codehaus.groovy @@ -317,27 +318,27 @@ org.springframework.security spring-security-javaconfig - ${dependency.security.javaconfig.version} + ${spring.security.javaconfig.version} org.springframework spring-aop - ${dependency.springframework.version} + ${spring.version} org.springframework spring-beans - ${dependency.springframework.version} + ${spring.version} org.springframework spring-expression - ${dependency.springframework.version} + ${spring.version} org.springframework spring-core - ${dependency.springframework.version} + ${spring.version} commons-logging @@ -348,47 +349,47 @@ org.springframework spring-context - ${dependency.springframework.version} + ${spring.version} org.springframework spring-web - ${dependency.springframework.version} + ${spring.version} org.springframework spring-webmvc - ${dependency.springframework.version} + ${spring.version} org.springframework spring-jdbc - ${dependency.springframework.version} + ${spring.version} org.springframework spring-orm - ${dependency.springframework.version} + ${spring.version} org.springframework spring-test - ${dependency.springframework.version} + ${spring.version} org.springframework spring-tx - ${dependency.springframework.version} + ${spring.version} org.springframework.batch spring-batch-core - ${dependency.spring.batch.version} + ${spring.batch.version} org.springframework.integration spring-integration-core - ${dependency.spring.integration.version} + ${spring.integration.version} org.springframework.data diff --git a/spring-bootstrap-applications/pom.xml b/spring-bootstrap-applications/pom.xml index 9d2626d38f..d43f99b7f5 100644 --- a/spring-bootstrap-applications/pom.xml +++ b/spring-bootstrap-applications/pom.xml @@ -82,7 +82,8 @@ org.codehaus.mojo exec-maven-plugin - + + true ${start-class} @@ -97,6 +98,7 @@ + true true diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml index 1d196d6020..a6aff37cec 100644 --- a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml +++ b/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml @@ -25,7 +25,7 @@ org.springframework.integration spring-integration-file - ${dependency.spring.integration.version} + ${spring.integration.version} ch.qos.logback diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml index 338b5c2266..0f1783d442 100644 --- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml +++ b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml @@ -12,57 +12,9 @@ / + org.springframework.bootstrap.sample.trad.TradBootstrapApplication - - - tomcat - - true - - - - org.apache.tomcat.embed - tomcat-embed-core - provided - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - provided - - - org.apache.tomcat.embed - tomcat-embed-jasper - provided - - - - - jetty - - false - - - - org.eclipse.jetty - jetty-webapp - provided - - - javax.servlet - javax.servlet-api - provided - - - org.eclipse.jetty - jetty-jsp - provided - - - - - @@ -81,13 +33,6 @@ spring-webmvc - - - cglib - cglib-nodep - 2.2 - - org.slf4j @@ -116,8 +61,65 @@ ${project.version} provided + + org.apache.tomcat.embed + tomcat-embed-core + provided + + + org.apache.tomcat.embed + tomcat-embed-logging-juli + provided + + + org.apache.tomcat.embed + tomcat-embed-jasper + provided + + + + + org.codehaus.mojo + exec-maven-plugin + + true + ${start-class} + + + + ${project.groupId} + spring-bootstrap + ${project.version} + + + org.apache.tomcat.embed + tomcat-embed-core + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-logging-juli + ${tomcat.version} + + + org.apache.tomcat.embed + tomcat-embed-jasper + ${tomcat.version} + + + + + org.apache.maven.plugins + maven-war-plugin + + false + + + + +