From c055cf063d27be655fb7759dc4bd201cfd18c069 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 18 Jul 2013 14:49:18 +0100 Subject: [PATCH] Starter pom gets spring.zero.version as a property We are using a resource filter to generate that pom, so it will change when the version changes. I prefer on balance leaving the generated code in git in a place where it will be useful in a clean clone. [Fixes #53189241] [bs-227] --- spring-starters/pom.xml | 30 ++ spring-starters/spring-starter-parent/pom.xml | 42 ++- spring-starters/src/main/parent/pom.xml | 346 ++++++++++++++++++ 3 files changed, 400 insertions(+), 18 deletions(-) create mode 100644 spring-starters/src/main/parent/pom.xml diff --git a/spring-starters/pom.xml b/spring-starters/pom.xml index 05c15652d9..53af6e08c9 100644 --- a/spring-starters/pom.xml +++ b/spring-starters/pom.xml @@ -25,4 +25,34 @@ spring-starter-tomcat spring-starter-web + + + + org.apache.maven.plugins + maven-resources-plugin + + + process-resources + + copy-resources + + false + + false + + #{*} + + + + src/main/parent + true + + + ${basedir}/spring-starter-parent + + + + + + diff --git a/spring-starters/spring-starter-parent/pom.xml b/spring-starters/spring-starter-parent/pom.xml index af02229291..a9094c225d 100644 --- a/spring-starters/spring-starter-parent/pom.xml +++ b/spring-starters/spring-starter-parent/pom.xml @@ -2,7 +2,8 @@ 4.0.0 - + org.springframework.zero spring-starter-parent 0.5.0.BUILD-SNAPSHOT @@ -101,23 +102,28 @@ test - - http://www.springsource.com/download/community - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version} - - - spring-repo-release - Spring Release Repository - http://repo.springsource.org/libs-release-local - - - spring-repo-snapshot - Spring Snapshot Repository - http://repo.springsource.org/libs-snapshot-local - - + + + spring-deploy + + http://www.springsource.com/download/community + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-zero/docs/${project.version} + + + spring-repo-release + Spring Release Repository + http://repo.springsource.org/libs-release-local + + + spring-repo-snapshot + Spring Snapshot Repository + http://repo.springsource.org/libs-snapshot-local + + + + diff --git a/spring-starters/src/main/parent/pom.xml b/spring-starters/src/main/parent/pom.xml new file mode 100644 index 0000000000..8351945e40 --- /dev/null +++ b/spring-starters/src/main/parent/pom.xml @@ -0,0 +1,346 @@ + + + 4.0.0 + + org.springframework.zero + spring-starter-parent + 0.5.0.BUILD-SNAPSHOT + pom + + 1.6 + UTF-8 + UTF-8 + 4.0.0.BUILD-SNAPSHOT + #{project.version} + + + 3.0 + + + + + org.springframework.zero + spring-zero + ${spring.zero.version} + pom + import + + + 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-jetty + ${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 + test + + + org.mockito + mockito-core + test + + + org.hamcrest + hamcrest-library + test + + + + + spring-deploy + + http://www.springsource.com/download/community + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-zero/docs/${project.version} + + + spring-repo-release + Spring Release Repository + http://repo.springsource.org/libs-release-local + + + spring-repo-snapshot + Spring Snapshot Repository + http://repo.springsource.org/libs-snapshot-local + + + + + + + + src/main/resources + true + + **/application.yml + **/application.propeties + + + + src/main/resources + + **/application.yml + **/application.propeties + + + + + + + + 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 + + + exec-maven-plugin + 1.2.1 + + ${start-class} + + + + maven-surefire-plugin + 2.15 + + + **/*Tests.java + **/*Test.java + + + **/Abstract*.java + + + + + maven-war-plugin + 2.3 + + + + + org.codehaus.mojo + versions-maven-plugin + 2.0 + + + + + pl.project13.maven + git-commit-id-plugin + 1.9 + + + + revision + + + + + true + yyyy-MM-dd'T'HH:mm:ssZ + true + src/main/resources/git.properties + + + + + + org.springframework.zero + spring-package-maven-plugin + ${spring.zero.version} + + + + true + true + + + + + + + package + + + + + + + + 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} + + + + + + + + + +