diff --git a/pom.xml b/pom.xml index cb9d8c34efa..96c26b71387 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot - spring-boot-parent + spring-boot-build 0.5.0.BUILD-SNAPSHOT pom @@ -11,33 +11,10 @@ ${basedir} - 1.6 - UTF-8 - 3.0.5 - 4.0.0.M2 - 3.2.0.M2 - 2.2.4.RELEASE - 2.2.0.RELEASE - 2.1.6 - 1.6 - 7.0.42 - 8.1.9.v20130131 - 1.7.3 - 1.0.0.M1 - - http://github.com/SpringSource/spring-boot - scm:git:git://github.com/SpringSource/spring-boot.git - scm:git:ssh://git@github.com/SpringSource/spring-boot.git - - - - spring - SpringSource - http://www.springsource.org - - + spring-boot-dependencies + spring-boot-parent spring-boot spring-boot-autoconfigure spring-boot-tools @@ -46,770 +23,16 @@ spring-boot-cli spring-boot-integration-tests - - - spring-ext - http://repo.springsource.org/ext-release-local/ - - true - - - false - - - - gradle - http://repo.gradle.org/gradle/libs-releases-local - - true - - - false - - - - - - - maven-assembly-plugin - 2.4 - - - maven-clean-plugin - 2.5 - - - maven-compiler-plugin - 3.1 - - - maven-deploy-plugin - 2.7 - - - maven-dependency-plugin - 2.8 - - - maven-eclipse-plugin - 2.9 - - - maven-failsafe-plugin - 2.15 - - - maven-install-plugin - 2.4 - - - maven-invoker-plugin - 1.8 - - - maven-jar-plugin - 2.4 - - - - true - true - - - - - - maven-javadoc-plugin - 2.9 - - - maven-plugin-plugin - 3.2 - - - maven-resources-plugin - 2.6 - - - maven-shade-plugin - 2.1 - - - maven-site-plugin - 3.2 - - - maven-source-plugin - 2.2.1 - - - maven-surefire-plugin - 2.15 - - - maven-war-plugin - 2.3 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - org.codehaus.mojo - sonar-maven-plugin - 2.0 - - - org.codehaus.mojo - versions-maven-plugin - 2.0 - - - - - maven-compiler-plugin - - ${java.version} - ${java.version} - - org.apache.maven.plugins - maven-eclipse-plugin + maven-deploy-plugin - false - - - .settings/org.eclipse.jdt.ui.prefs - ${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs - - - .settings/org.eclipse.jdt.core.prefs - ${main.basedir}/eclipse/org.eclipse.jdt.core.prefs - - + true - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Tests.java - - - **/Abstract*.java - - - file:/dev/./urandom - - -Xmx1024m -XX:MaxPermSize=256m - - - - org.codehaus.mojo - versions-maven-plugin + false - - - - ch.qos.logback - logback-classic - 1.0.13 - - - com.fasterxml.jackson.core - jackson-databind - 2.2.2 - - - com.fasterxml.jackson.core - jackson-core - 2.2.2 - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.2.2 - - - commons-dbcp - commons-dbcp - 1.4 - - - commons-httpclient - commons-httpclient - 3.1 - - - javax.servlet - javax.servlet-api - 3.0.1 - - - javax.servlet - jstl - 1.2 - - - junit - junit - 4.11 - - - log4j - log4j - 1.2.17 - - - net.sf.jopt-simple - jopt-simple - 4.5 - - - nz.net.ultraq.thymeleaf - thymeleaf-layout-dialect - 1.1.1 - - - org.apache.ivy - ivy - 2.3.0 - - - org.apache.maven - maven-archiver - 2.5 - - - org.apache.maven - maven-artifact - ${maven.version} - - - org.apache.maven - maven-core - ${maven.version} - - - org.apache.maven - maven-model - ${maven.version} - - - org.apache.maven - maven-plugin-api - ${maven.version} - - - org.apache.maven - maven-settings - ${maven.version} - - - org.apache.maven.plugins - maven-shade-plugin - 2.1 - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.2 - - - 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.tomcat - tomcat-jdbc - ${tomcat.version} - - - org.apache.tomcat - tomcat-jsp-api - ${tomcat.version} - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjweaver - ${aspectj.version} - - - org.codehaus.groovy - groovy - ${groovy.version} - - - org.codehaus.groovy - groovy-all - ${groovy.version} - - - org.codehaus.groovy - groovy-templates - ${groovy.version} - - - org.codehaus.plexus - plexus-archiver - 2.4.1 - - - org.codehaus.plexus - plexus-utils - 3.0.10 - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - javax.servlet - org.eclipse.jetty.orbit - - - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-jsp - ${jetty.version} - - - org.eclipse.jetty - jetty-annotations - ${jetty.version} - - - org.gradle - gradle-core - ${gradle.version} - - - org.gradle - gradle-base-services - ${gradle.version} - - - org.gradle - gradle-base-services-groovy - ${gradle.version} - - - org.gradle - gradle-plugins - ${gradle.version} - - - org.hamcrest - hamcrest-library - 1.3 - - - com.h2database - h2 - 1.3.172 - - - org.hibernate - hibernate-entitymanager - 4.2.1.Final - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.1.Final - - - org.hibernate - hibernate-validator - 4.3.1.Final - - - org.hsqldb - hsqldb - 2.2.9 - - - org.projectreactor - reactor-spring - ${reactor.version} - - - org.mockito - mockito-core - 1.9.5 - - - org.ow2.asm - asm - 4.1 - - - org.slf4j - jcl-over-slf4j - 1.7.5 - - - org.slf4j - slf4j-api - 1.7.5 - - - org.slf4j - jul-to-slf4j - 1.7.5 - - - org.slf4j - slf4j-log4j12 - 1.7.5 - - - org.slf4j - slf4j-jdk14 - 1.7.5 - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - quartz - quartz - - - - - org.springframework - spring-expression - ${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} - - - commons-lang - commons-lang - - - - - 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.batch - spring-batch-core - ${spring.batch.version} - - - org.springframework.data - spring-data-jpa - 1.3.2.RELEASE - - - org.springframework - spring-jdbc - - - org.springframework - spring-orm - - - - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - - - org.springframework.integration - spring-integration-file - ${spring.integration.version} - - - org.springframework.integration - spring-integration-http - ${spring.integration.version} - - - org.springframework.integration - spring-integration-ip - ${spring.integration.version} - - - org.springframework.integration - spring-integration-stream - ${spring.integration.version} - - - org.springframework.security - spring-security-core - ${spring.security.version} - - - org.springframework.security - spring-security-config - ${spring.security.version} - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - org.springframework.security - spring-security-acl - ${spring.security.version} - - - org.thymeleaf - thymeleaf - 2.0.16 - - - org.thymeleaf - thymeleaf-spring3 - 2.0.16 - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity3 - 2.0.0 - - - org.yaml - snakeyaml - 1.12 - - - org.zeroturnaround - zt-zip - 1.6 - - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - org.springframework - spring-test - test - - - - http://www.springsource.com/download/community - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/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 - - - - - milestone - - false - - - - spring-repo-milestone - Spring Milestone Repository - http://repo.springsource.org/libs-milestone-local - - - - - - development - - true - - - - spring-snapshots - Spring Snapshots - http://maven.springframework.org/snapshot - - true - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - - - spring-snapshots - Spring Snapshots - http://maven.springframework.org/snapshot - - true - - - - spring-milestones - Spring Milestones - http://maven.springframework.org/milestone - - false - - - - - - jdk8 - - 1.8 - - - - - maven-javadoc-plugin - - -Xdoclint:none -quiet - - - - - - diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index 7c983e8d623..b886e39d71f 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-actuator jar diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index 679e9b4b2f5..36e9e72a6cf 100644 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-autoconfigure jar diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index 5df942c36a9..1d789a4afe9 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-cli jar diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml new file mode 100644 index 00000000000..18e2114a013 --- /dev/null +++ b/spring-boot-dependencies/pom.xml @@ -0,0 +1,485 @@ + + + 4.0.0 + org.springframework.boot + spring-boot-dependencies + 0.5.0.BUILD-SNAPSHOT + pom + + 4.0.0.M2 + 3.2.0.M2 + 2.2.4.RELEASE + 2.2.0.RELEASE + 2.1.6 + 1.6 + 7.0.42 + 8.1.9.v20130131 + 1.7.3 + 1.0.0.M1 + + + + + ch.qos.logback + logback-classic + 1.0.13 + + + com.fasterxml.jackson.core + jackson-databind + 2.2.2 + + + com.fasterxml.jackson.core + jackson-core + 2.2.2 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.2.2 + + + commons-dbcp + commons-dbcp + 1.4 + + + commons-httpclient + commons-httpclient + 3.1 + + + javax.servlet + javax.servlet-api + 3.0.1 + + + javax.servlet + jstl + 1.2 + + + junit + junit + 4.11 + + + log4j + log4j + 1.2.17 + + + nz.net.ultraq.thymeleaf + thymeleaf-layout-dialect + 1.1.1 + + + 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.tomcat + tomcat-jdbc + ${tomcat.version} + + + org.apache.tomcat + tomcat-jsp-api + ${tomcat.version} + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjweaver + ${aspectj.version} + + + org.eclipse.jetty + jetty-webapp + ${jetty.version} + + + javax.servlet + org.eclipse.jetty.orbit + + + + + org.eclipse.jetty + jetty-util + ${jetty.version} + + + org.eclipse.jetty + jetty-jsp + ${jetty.version} + + + org.eclipse.jetty + jetty-annotations + ${jetty.version} + + + org.hamcrest + hamcrest-library + 1.3 + + + com.h2database + h2 + 1.3.172 + + + org.hibernate + hibernate-entitymanager + 4.2.1.Final + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + 1.0.1.Final + + + org.hibernate + hibernate-validator + 4.3.1.Final + + + org.hsqldb + hsqldb + 2.2.9 + + + org.projectreactor + reactor-spring + ${reactor.version} + + + org.mockito + mockito-core + 1.9.5 + + + org.slf4j + jcl-over-slf4j + 1.7.5 + + + org.slf4j + slf4j-api + 1.7.5 + + + org.slf4j + jul-to-slf4j + 1.7.5 + + + org.slf4j + slf4j-log4j12 + 1.7.5 + + + org.slf4j + slf4j-jdk14 + 1.7.5 + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-context-support + ${spring.version} + + + quartz + quartz + + + + + org.springframework + spring-expression + ${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} + + + commons-lang + commons-lang + + + + + 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.batch + spring-batch-core + ${spring.batch.version} + + + org.springframework.data + spring-data-jpa + 1.3.2.RELEASE + + + org.springframework + spring-jdbc + + + org.springframework + spring-orm + + + + + org.springframework.integration + spring-integration-core + ${spring.integration.version} + + + org.springframework.integration + spring-integration-file + ${spring.integration.version} + + + org.springframework.integration + spring-integration-http + ${spring.integration.version} + + + org.springframework.integration + spring-integration-ip + ${spring.integration.version} + + + org.springframework.integration + spring-integration-stream + ${spring.integration.version} + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework.security + spring-security-config + ${spring.security.version} + + + org.springframework.security + spring-security-web + ${spring.security.version} + + + org.springframework.security + spring-security-acl + ${spring.security.version} + + + org.thymeleaf + thymeleaf + 2.0.16 + + + org.thymeleaf + thymeleaf-spring3 + 2.0.16 + + + org.thymeleaf.extras + thymeleaf-extras-springsecurity3 + 2.0.0 + + + org.yaml + snakeyaml + 1.12 + + + + + + + + maven-assembly-plugin + 2.4 + + + maven-clean-plugin + 2.5 + + + maven-compiler-plugin + 3.1 + + + maven-deploy-plugin + 2.7 + + + maven-dependency-plugin + 2.8 + + + maven-eclipse-plugin + 2.9 + + + maven-failsafe-plugin + 2.15 + + + maven-install-plugin + 2.4 + + + maven-jar-plugin + 2.4 + + + maven-javadoc-plugin + 2.9 + + + maven-resources-plugin + 2.6 + + + maven-shade-plugin + 2.1 + + + maven-site-plugin + 3.2 + + + maven-source-plugin + 2.2.1 + + + maven-surefire-plugin + 2.15 + + + maven-war-plugin + 2.3 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.8 + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + org.codehaus.mojo + versions-maven-plugin + 2.0 + + + pl.project13.maven + git-commit-id-plugin + 1.9 + + + + + + + spring-deploy + + http://www.springsource.com/download/community + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/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-boot-integration-tests/pom.xml b/spring-boot-integration-tests/pom.xml index fd1377658e9..7bc794cba0c 100644 --- a/spring-boot-integration-tests/pom.xml +++ b/spring-boot-integration-tests/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-integration-tests pom @@ -13,7 +14,8 @@ ${basedir}/.. - + ${project.groupId} spring-boot @@ -104,7 +106,15 @@ - + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + maven-invoker-plugin src/it/settings.xml diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml new file mode 100644 index 00000000000..046ce9b8744 --- /dev/null +++ b/spring-boot-parent/pom.xml @@ -0,0 +1,351 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-dependencies + 0.5.0.BUILD-SNAPSHOT + ../spring-boot-dependencies + + spring-boot-parent + pom + + 1.6 + UTF-8 + UTF-8 + 3.0.5 + + + + spring + SpringSource + http://www.springsource.org + + + + 3.0.0 + + + http://github.com/SpringSource/spring-boot + scm:git:git://github.com/SpringSource/spring-boot.git + scm:git:ssh://git@github.com/SpringSource/spring-boot.git + + + + + + net.sf.jopt-simple + jopt-simple + 4.5 + + + org.apache.ivy + ivy + 2.3.0 + + + org.apache.maven + maven-archiver + 2.5 + + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven + maven-core + ${maven.version} + + + org.apache.maven + maven-model + ${maven.version} + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.apache.maven + maven-settings + ${maven.version} + + + org.apache.maven.plugins + maven-shade-plugin + 2.1 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.2 + + + org.codehaus.groovy + groovy + ${groovy.version} + + + org.codehaus.groovy + groovy-all + ${groovy.version} + + + org.codehaus.groovy + groovy-templates + ${groovy.version} + + + org.codehaus.plexus + plexus-archiver + 2.4.1 + + + org.codehaus.plexus + plexus-utils + 3.0.10 + + + org.gradle + gradle-core + ${gradle.version} + + + org.gradle + gradle-base-services + ${gradle.version} + + + org.gradle + gradle-base-services-groovy + ${gradle.version} + + + org.gradle + gradle-plugins + ${gradle.version} + + + org.ow2.asm + asm + 4.1 + + + org.zeroturnaround + zt-zip + 1.6 + + + + + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.hamcrest + hamcrest-library + test + + + org.springframework + spring-test + test + + + + + spring-ext + http://repo.springsource.org/ext-release-local/ + + true + + + false + + + + gradle + http://repo.gradle.org/gradle/libs-releases-local + + true + + + false + + + + + + + + maven-invoker-plugin + 1.8 + + + maven-plugin-plugin + 3.2 + + + org.codehaus.mojo + sonar-maven-plugin + 2.0 + + + + + + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + maven-eclipse-plugin + + false + + + .settings/org.eclipse.jdt.ui.prefs + ${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs + + + .settings/org.eclipse.jdt.core.prefs + ${main.basedir}/eclipse/org.eclipse.jdt.core.prefs + + + + + + maven-jar-plugin + + + + true + true + + + + + + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + maven-surefire-plugin + + + **/*Tests.java + + + **/Abstract*.java + + + file:/dev/./urandom + + -Xmx1024m -XX:MaxPermSize=256m + + + + maven-war-plugin + + false + + + + + + + + spring-snapshot-build + + + true + + + + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + + + + spring-snapshots + Spring Snapshots + http://maven.springframework.org/snapshot + + true + + + + + + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + + + + spring-snapshots + Spring Snapshots + http://maven.springframework.org/snapshot + + true + + + + + + jdk8 + + 1.8 + + + + + maven-javadoc-plugin + + -Xdoclint:none -quiet + + + + + + + diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index 57f4bb9a6c7..b0d670ebc24 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-samples pom @@ -30,6 +31,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + ${project.groupId} spring-boot-maven-plugin diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index 3d8e0cab874..a255a5b0183 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-starters pom @@ -32,7 +33,7 @@ maven-resources-plugin - process-resources + validate copy-resources diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index 00d06e1d77e..8450f22aa3d 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -1,58 +1,25 @@ - + - - 4.0.0 - - - org.springframework.boot + + org.springframework.boot + spring-boot-dependencies + 0.5.0.BUILD-SNAPSHOT + ../../spring-boot-dependencies + spring-boot-starter-parent - 0.5.0.BUILD-SNAPSHOT - pom - - 1.6 - UTF-8 - UTF-8 - 4.0.0.M2 - 3.2.0.M2 - 2.2.4.RELEASE - 2.2.0.RELEASE - 2.1.6 - 1.6 - 7.0.42 - 8.1.9.v20130131 - 1.7.3 - 1.0.0.M1 0.5.0.BUILD-SNAPSHOT - - - 3.0 - - - - org.springframework.boot - spring-boot-parent - ${spring.boot.version} - pom - import - org.springframework.boot spring-boot-strap @@ -110,32 +77,8 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - org.springframework - spring-test - test - - - + src/main/resources @@ -155,15 +98,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - - maven-assembly-plugin - 2.4 - - - maven-clean-plugin - 2.5 - + maven-compiler-plugin 3.1 @@ -172,33 +107,8 @@ NOTE: If you are editing a local checkout of this file, be sure to modify ${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 @@ -207,35 +117,6 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - 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 @@ -251,7 +132,6 @@ NOTE: If you are editing a local checkout of this file, be sure to modify maven-war-plugin - 2.3 false @@ -261,15 +141,15 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - org.codehaus.mojo - versions-maven-plugin - 2.0 + exec-maven-plugin + + + ${start-class} + + - - pl.project13.maven git-commit-id-plugin @@ -288,8 +168,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify src/main/resources/git.properties - - + org.springframework.boot spring-boot-maven-plugin @@ -305,8 +184,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify ${start-class} - - + org.apache.maven.plugins maven-shade-plugin @@ -366,40 +244,45 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - spring-deploy - - http://www.springsource.com/download/community - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version} - + spring-snapshot-build + - spring-repo-release - Spring Release Repository - http://repo.springsource.org/libs-release-local + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + - - spring-repo-snapshot - Spring Snapshot Repository - http://repo.springsource.org/libs-snapshot-local - - + + spring-snapshots + Spring Snapshots + http://maven.springframework.org/snapshot + + true + + + + + + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + + + + spring-snapshots + Spring Snapshots + http://maven.springframework.org/snapshot + + true + + + - - milestone - - false - - - - spring-repo-milestone - Spring Milestone Repository - http://repo.springsource.org/libs-milestone-local - - - diff --git a/spring-boot-starters/src/main/parent/pom.xml b/spring-boot-starters/src/main/parent/pom.xml index 25739441f6a..4bd3b9b40ea 100644 --- a/spring-boot-starters/src/main/parent/pom.xml +++ b/spring-boot-starters/src/main/parent/pom.xml @@ -1,58 +1,25 @@ - + - - 4.0.0 - - - org.springframework.boot + + org.springframework.boot + spring-boot-dependencies + 0.5.0.BUILD-SNAPSHOT + ../../spring-boot-dependencies + spring-boot-starter-parent - 0.5.0.BUILD-SNAPSHOT - pom - - 1.6 - UTF-8 - UTF-8 - @{spring.version} - @{spring.security.version} - @{spring.integration.version} - @{spring.batch.version} - @{groovy.version} - @{gradle.version} - @{tomcat.version} - @{jetty.version} - @{aspectj.version} - @{reactor.version} @{project.version} - - - 3.0 - - - - org.springframework.boot - spring-boot-parent - ${spring.boot.version} - pom - import - org.springframework.boot spring-boot-strap @@ -110,32 +77,8 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - org.springframework - spring-test - test - - - + src/main/resources @@ -155,15 +98,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - - maven-assembly-plugin - 2.4 - - - maven-clean-plugin - 2.5 - + maven-compiler-plugin 3.1 @@ -172,33 +107,8 @@ NOTE: If you are editing a local checkout of this file, be sure to modify ${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 @@ -207,35 +117,6 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - 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 @@ -251,7 +132,6 @@ NOTE: If you are editing a local checkout of this file, be sure to modify maven-war-plugin - 2.3 false @@ -261,15 +141,15 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - org.codehaus.mojo - versions-maven-plugin - 2.0 + exec-maven-plugin + + + ${start-class} + + - - pl.project13.maven git-commit-id-plugin @@ -288,8 +168,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify src/main/resources/git.properties - - + org.springframework.boot spring-boot-maven-plugin @@ -305,8 +184,7 @@ NOTE: If you are editing a local checkout of this file, be sure to modify ${start-class} - - + org.apache.maven.plugins maven-shade-plugin @@ -366,40 +244,45 @@ NOTE: If you are editing a local checkout of this file, be sure to modify - - spring-deploy - - http://www.springsource.com/download/community - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version} - + spring-snapshot-build + - spring-repo-release - Spring Release Repository - http://repo.springsource.org/libs-release-local + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + - - spring-repo-snapshot - Spring Snapshot Repository - http://repo.springsource.org/libs-snapshot-local - - + + spring-snapshots + Spring Snapshots + http://maven.springframework.org/snapshot + + true + + + + + + spring-milestones + Spring Milestones + http://maven.springframework.org/milestone + + false + + + + spring-snapshots + Spring Snapshots + http://maven.springframework.org/snapshot + + true + + + - - milestone - - false - - - - spring-repo-milestone - Spring Milestone Repository - http://repo.springsource.org/libs-milestone-local - - - diff --git a/spring-boot-tools/pom.xml b/spring-boot-tools/pom.xml index 0ea74861895..ff57ff49f3e 100644 --- a/spring-boot-tools/pom.xml +++ b/spring-boot-tools/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot-tools pom diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 05e4b95ef25..24487cee38b 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -6,6 +6,7 @@ org.springframework.boot spring-boot-parent 0.5.0.BUILD-SNAPSHOT + ../spring-boot-parent spring-boot jar