diff --git a/spring-starters/pom.xml b/spring-starters/pom.xml index d88cc6e2a85..d189a6da7e9 100644 --- a/spring-starters/pom.xml +++ b/spring-starters/pom.xml @@ -11,9 +11,6 @@ pom ${basedir}/.. - UTF-8 - UTF-8 - 0.5.0.BUILD-SNAPSHOT spring-starter @@ -21,171 +18,8 @@ spring-starter-batch spring-starter-integration spring-starter-data-jpa + spring-starter-maven-parent spring-starter-security spring-starter-web - - - - org.springframework.zero - spring-bootstrap - ${spring.zero.version} - - - org.springframework.zero - spring-actuator - ${spring.zero.version} - - - org.springframework.zero - spring-starter - ${spring.zero.version} - - - org.springframework.zero - spring-starter-actuator - ${spring.zero.version} - - - org.springframework.zero - spring-starter-web - ${spring.zero.version} - - - org.springframework.zero - spring-starter-tomcat - ${spring.zero.version} - - - org.springframework.zero - spring-starter-data-jpa - ${spring.zero.version} - - - org.springframework.zero - spring-starter-batch - ${spring.zero.version} - - - org.springframework.zero - spring-starter-integration - ${spring.zero.version} - - - org.springframework.zero - spring-starter-security - ${spring.zero.version} - - - - - - org.springframework - spring-test - - - commons-logging - commons-logging - - - test - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - - - - - org.springframework.zero - spring-package-maven-plugin - ${spring.zero.version} - true - true - - - - - - - org.codehaus.mojo - exec-maven-plugin - - true - ${start-class} - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - org.springframework.zero - spring-package-maven-plugin - ${spring.zero.version} - - - - true - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - META-INF/spring.handlers - - - META-INF/spring.factories - - - META-INF/spring.schemas - - - - ${start-class} - - - - - - - - - diff --git a/spring-starters/spring-starter-data-jpa/pom.xml b/spring-starters/spring-starter-data-jpa/pom.xml index 825132f9c7d..42419b4afd4 100644 --- a/spring-starters/spring-starter-data-jpa/pom.xml +++ b/spring-starters/spring-starter-data-jpa/pom.xml @@ -22,6 +22,10 @@ org.hibernate hibernate-entitymanager + + org.springframework + spring-aop + org.springframework spring-orm diff --git a/spring-starters/spring-starter-integration/pom.xml b/spring-starters/spring-starter-integration/pom.xml index 46e5f9e22ab..dc16234ac05 100644 --- a/spring-starters/spring-starter-integration/pom.xml +++ b/spring-starters/spring-starter-integration/pom.xml @@ -18,6 +18,22 @@ spring-starter ${project.version} + + org.springframework + spring-aop + + + org.springframework + spring-tx + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + org.springframework.integration spring-integration-core diff --git a/spring-starters/spring-starter-maven-parent/pom.xml b/spring-starters/spring-starter-maven-parent/pom.xml new file mode 100644 index 00000000000..17f87e1c006 --- /dev/null +++ b/spring-starters/spring-starter-maven-parent/pom.xml @@ -0,0 +1,347 @@ + + + 4.0.0 + + org.springframework.zero + spring-starter-maven-parent + 0.5.0.BUILD-SNAPSHOT + pom + + 1.6 + UTF-8 + UTF-8 + 4.0.0.BUILD-SNAPSHOT + 0.5.0.BUILD-SNAPSHOT + + + 3.0 + + + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-context-support + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-expression + ${spring.version} + + + org.springframework + spring-instrument + ${spring.version} + + + org.springframework + spring-jdbc + ${spring.version} + + + org.springframework + spring-jms + ${spring.version} + + + org.springframework + spring-orm + ${spring.version} + + + org.springframework + spring-oxm + ${spring.version} + + + org.springframework + spring-test + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + + + org.springframework + spring-websocket + ${spring.version} + + + org.springframework.zero + spring-bootstrap + ${spring.zero.version} + + + org.springframework.zero + spring-actuator + ${spring.zero.version} + + + org.springframework.zero + spring-starter + ${spring.zero.version} + + + org.springframework.zero + spring-starter-actuator + ${spring.zero.version} + + + org.springframework.zero + spring-starter-web + ${spring.zero.version} + + + org.springframework.zero + spring-starter-tomcat + ${spring.zero.version} + + + org.springframework.zero + spring-starter-data-jpa + ${spring.zero.version} + + + org.springframework.zero + spring-starter-batch + ${spring.zero.version} + + + org.springframework.zero + spring-starter-integration + ${spring.zero.version} + + + org.springframework.zero + spring-starter-security + ${spring.zero.version} + + + junit + junit + 4.11 + + + org.mockito + mockito-core + 1.9.5 + + + org.hamcrest + hamcrest-library + 1.3 + + + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.hamcrest + hamcrest-library + test + + + + + + + + maven-assembly-plugin + 2.4 + + + maven-clean-plugin + 2.5 + + + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + + + + maven-deploy-plugin + 2.7 + + + maven-dependency-plugin + 2.8 + + + maven-eclipse-plugin + 2.9 + + + maven-failsafe-plugin + 2.13 + + + maven-install-plugin + 2.4 + + + maven-invoker-plugin + 1.8 + + + maven-jar-plugin + 2.4 + + + maven-javadoc-plugin + 2.9 + + + maven-plugin-plugin + 3.2 + + + maven-resources-plugin + 2.6 + + + maven-site-plugin + 3.2 + + + maven-source-plugin + 2.2.1 + + + maven-surefire-plugin + 2.15 + + + maven-war-plugin + 2.3 + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + true + ${start-class} + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.0 + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.1 + + + org.springframework.zero + spring-package-maven-plugin + ${spring.zero.version} + + + + true + true + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + package + + shade + + + + + META-INF/spring.handlers + + + META-INF/spring.factories + + + META-INF/spring.schemas + + + + ${start-class} + + + + + + + + + + diff --git a/spring-starters/spring-starter/pom.xml b/spring-starters/spring-starter/pom.xml index 9ef7545c200..c2dbc1e241e 100644 --- a/spring-starters/spring-starter/pom.xml +++ b/spring-starters/spring-starter/pom.xml @@ -23,10 +23,6 @@ spring-autoconfigure ${project.version} - - com.fasterxml.jackson.core - jackson-databind - org.hibernate hibernate-validator