From b87f9c11f11b1ab4cfc5a537a5a88f7b463c0f1d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 31 May 2017 14:27:23 -0700 Subject: [PATCH] Fix POMs for the updated build/release process Fix POMs following project relocations and apply CI friendly Maven conventions. See gh-9316 --- pom.xml | 413 ++++------------- spring-boot-project/pom.xml | 32 ++ .../pom.xml | 9 +- .../spring-boot-actuator/pom.xml | 9 +- .../spring-boot-autoconfigure/pom.xml | 9 +- spring-boot-project/spring-boot-cli/pom.xml | 67 +-- .../spring-boot-dependencies/pom.xml | 318 ++++++------- .../main/xslt/post-process-flattened-pom.xsl | 31 ++ .../spring-boot-devtools/pom.xml | 9 +- spring-boot-project/spring-boot-docs/pom.xml | 92 ++-- .../spring-boot-parent/pom.xml | 421 +++++------------- .../src/checkstyle/checkstyle.xml | 2 +- .../spring-boot-starters/pom.xml | 46 +- .../spring-boot-starter-activemq/pom.xml | 12 +- .../spring-boot-starter-actuator/pom.xml | 9 +- .../spring-boot-starter-amqp/pom.xml | 12 +- .../spring-boot-starter-aop/pom.xml | 12 +- .../spring-boot-starter-artemis/pom.xml | 12 +- .../spring-boot-starter-batch/pom.xml | 12 +- .../spring-boot-starter-cache/pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 14 +- .../pom.xml | 12 +- .../pom.xml | 34 +- .../pom.xml | 12 +- .../spring-boot-starter-data-jpa/pom.xml | 34 +- .../spring-boot-starter-data-ldap/pom.xml | 31 +- .../pom.xml | 12 +- .../spring-boot-starter-data-mongodb/pom.xml | 12 +- .../spring-boot-starter-data-neo4j/pom.xml | 12 +- .../spring-boot-starter-data-redis/pom.xml | 34 +- .../spring-boot-starter-data-rest/pom.xml | 57 ++- .../spring-boot-starter-data-solr/pom.xml | 36 +- .../spring-boot-starter-freemarker/pom.xml | 12 +- .../pom.xml | 12 +- .../spring-boot-starter-hateoas/pom.xml | 12 +- .../spring-boot-starter-integration/pom.xml | 12 +- .../spring-boot-starter-jdbc/pom.xml | 12 +- .../spring-boot-starter-jersey/pom.xml | 16 +- .../spring-boot-starter-jetty/pom.xml | 12 +- .../spring-boot-starter-jooq/pom.xml | 12 +- .../spring-boot-starter-json/pom.xml | 9 +- .../spring-boot-starter-jta-atomikos/pom.xml | 12 +- .../spring-boot-starter-jta-bitronix/pom.xml | 13 +- .../spring-boot-starter-jta-narayana/pom.xml | 12 +- .../spring-boot-starter-log4j2/pom.xml | 12 +- .../spring-boot-starter-logging/pom.xml | 12 +- .../spring-boot-starter-mail/pom.xml | 12 +- .../spring-boot-starter-mobile/pom.xml | 12 +- .../spring-boot-starter-mustache/pom.xml | 12 +- .../spring-boot-starter-parent/pom.xml | 129 +++++- .../main/xslt/post-process-flattened-pom.xsl | 17 + .../spring-boot-starter-quartz/pom.xml | 12 +- .../spring-boot-starter-reactor-netty/pom.xml | 12 +- .../pom.xml | 9 +- .../spring-boot-starter-security/pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 12 +- .../pom.xml | 12 +- .../spring-boot-starter-test/pom.xml | 12 +- .../spring-boot-starter-thymeleaf/pom.xml | 12 +- .../spring-boot-starter-tomcat/pom.xml | 12 +- .../spring-boot-starter-undertow/pom.xml | 12 +- .../spring-boot-starter-validation/pom.xml | 12 +- .../spring-boot-starter-web-services/pom.xml | 12 +- .../spring-boot-starter-web/pom.xml | 12 +- .../spring-boot-starter-webflux/pom.xml | 12 +- .../spring-boot-starter-websocket/pom.xml | 12 +- .../spring-boot-starter/pom.xml | 12 +- .../spring-boot-test-autoconfigure/pom.xml | 9 +- spring-boot-project/spring-boot-test/pom.xml | 9 +- spring-boot-project/spring-boot-tools/pom.xml | 9 +- .../spring-boot-antlib/pom.xml | 31 +- .../pom.xml | 10 +- .../pom.xml | 9 +- .../pom.xml | 9 +- .../spring-boot-gradle-plugin/pom.xml | 73 ++- .../spring-boot-loader-tools/pom.xml | 11 +- .../spring-boot-loader/pom.xml | 14 +- .../spring-boot-maven-plugin/pom.xml | 217 +++++---- .../src/site/site.xml | 2 +- .../spring-boot-test-support/pom.xml | 9 +- spring-boot-project/spring-boot/pom.xml | 9 +- spring-boot-samples-invoker/pom.xml | 84 ++++ spring-boot-tests/pom.xml | 56 +++ 85 files changed, 1219 insertions(+), 1746 deletions(-) create mode 100644 spring-boot-project/pom.xml create mode 100644 spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl create mode 100644 spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl create mode 100644 spring-boot-samples-invoker/pom.xml create mode 100644 spring-boot-tests/pom.xml diff --git a/pom.xml b/pom.xml index 6ff2420af2..da29cca314 100644 --- a/pom.xml +++ b/pom.xml @@ -1,362 +1,105 @@ - + 4.0.0 org.springframework.boot spring-boot-build - 2.0.0.BUILD-SNAPSHOT + ${revision} pom Spring Boot Build Spring Boot Build - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - - - https://github.com/spring-projects/spring-boot - - - - pwebb - Phillip Webb - pwebb at pivotal.io - Pivotal Software, Inc. - http://www.spring.io - - Project lead - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - http://www.spring.io - - Project lead - - - + 2.0.0.BUILD-SNAPSHOT ${basedir} - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - - com.google.code.maven-replacer-plugin - replacer - 1.5.3 - - - - - + + default true - spring-boot-dependencies - spring-boot-parent - spring-boot-tools - spring-boot - spring-boot-test - spring-boot-autoconfigure - spring-boot-test-autoconfigure - spring-boot-actuator - spring-boot-actuator-autoconfigure - spring-boot-devtools - spring-boot-docs - spring-boot-starters - spring-boot-cli + spring-boot-project + + spring-boot-samples-invoker + spring-boot-tests + - integration + m2e - true + + m2e.version + - spring-boot-integration-tests + spring-boot-project + spring-boot-samples + spring-boot-tests - - full - - - prepare - - true - - - spring-boot-dependencies - spring-boot-parent - spring-boot-tools - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - ant-contrib - ant-contrib - 1.0b3 - - - ant - ant - - - - - org.apache.ant - ant-nodeps - 1.8.1 - - - org.tigris.antelope - antelopetasks - 3.2.10 - - - - - generate-settings.xml - verify - - run - - false - - - - - - - - - - - - - - - - - - - - - - - fixup-dependencies-pom - verify - - run - - false - - - - - - - - - - - - - - fixup-starter-parent - verify - - run - - false - - - - - - - - - - - - - - fixup-sample-ant - verify - - run - - false - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - com.google.code.maven-replacer-plugin - replacer - - - fixup-gradle-samples - verify - - replace - - - - ${basedir}/spring-boot-samples/**/build.gradle - - springBootVersion =\s+.*+ - springBootVersion = '${project.version}' - - - - fixup-ant-samples - verify - - replace - - - - ${basedir}/spring-boot-samples/**/build.xml - - spring-boot\.version\"\s.*+ - spring-boot.version" value="${project.version}" /> - - - - - - - - - ci - - - - com.google.code.maven-replacer-plugin - replacer - - - remove-repo-samples - - replace - - - - ${basedir}/spring-boot-dependencies/pom.xml - - - DOTALL - - \n\t<profiles>.*</profiles> - - - - - - - - + + + + central + https://repo.maven.apache.org/maven2 + + false + + + + spring-milestone + Spring Milestone + http://repo.spring.io/milestone + + false + + + + spring-snapshot + Spring Snapshot + http://repo.spring.io/snapshot + + true + + + + rabbit-milestone + Rabbit Milestone + https://dl.bintray.com/rabbitmq/maven-milestones + + false + + + + + + central + https://repo.maven.apache.org/maven2 + + false + + + + spring-milestone + Spring Milestone + http://repo.spring.io/milestone + + false + + + + spring-snapshot + Spring Snapshot + http://repo.spring.io/snapshot + + true + + + diff --git a/spring-boot-project/pom.xml b/spring-boot-project/pom.xml new file mode 100644 index 0000000000..ddd69c56ad --- /dev/null +++ b/spring-boot-project/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-build + ${revision} + + spring-boot-project + pom + Spring Boot Build + Spring Boot Build + + ${basedir}/../.. + + + spring-boot-dependencies + spring-boot-parent + spring-boot + spring-boot-actuator + spring-boot-actuator-autoconfigure + spring-boot-autoconfigure + spring-boot-cli + spring-boot-devtools + spring-boot-test + spring-boot-test-autoconfigure + spring-boot-tools + spring-boot-starters + spring-boot-docs + + diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml index 8e85717eb5..9c7e2f9550 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml @@ -5,19 +5,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-actuator-autoconfigure Spring Boot Actuator AutoConfigure Spring Boot Actuator AutoConfigure - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-project/spring-boot-actuator/pom.xml b/spring-boot-project/spring-boot-actuator/pom.xml index 6f42b7e5c7..2d08eefbb8 100644 --- a/spring-boot-project/spring-boot-actuator/pom.xml +++ b/spring-boot-project/spring-boot-actuator/pom.xml @@ -5,19 +5,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-actuator Spring Boot Actuator Spring Boot Actuator - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-project/spring-boot-autoconfigure/pom.xml b/spring-boot-project/spring-boot-autoconfigure/pom.xml index 20e8798836..a22911a996 100755 --- a/spring-boot-project/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-autoconfigure/pom.xml @@ -5,19 +5,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-autoconfigure Spring Boot AutoConfigure Spring Boot AutoConfigure - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml index 1db89e2f34..5747c970e6 100644 --- a/spring-boot-project/spring-boot-cli/pom.xml +++ b/spring-boot-project/spring-boot-cli/pom.xml @@ -1,37 +1,22 @@ - + 4.0.0 org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-cli Spring Boot CLI Spring Boot CLI - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. org.springframework.boot.cli.SpringCli default ${project.build.directory}/generated-resources/org/springframework/boot/cli/compiler/dependencies - - - integration - - true - - - integration - - - @@ -117,6 +102,13 @@ aether-util + + org.springframework.boot + spring-boot-dependencies + effective-pom + provided + ${project.version} + org.codehaus.groovy groovy-templates @@ -197,7 +189,6 @@ org.springframework.boot spring-boot-dependencies - ${project.version} effective-pom true ${generated.pom.dir} @@ -316,21 +307,30 @@ - - - - + + + + - - - + + + - + @@ -391,4 +391,15 @@ + + + integration + + true + + + integration + + + diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index f9a6de79b3..9ea829f092 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -2,17 +2,17 @@ 4.0.0 - org.springframework.boot + + org.springframework.boot + spring-boot-build + ${revision} + ../.. + spring-boot-dependencies - 2.0.0.BUILD-SNAPSHOT pom Spring Boot Dependencies Spring Boot Dependencies http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - Apache License, Version 2.0 @@ -22,28 +22,6 @@ https://github.com/spring-projects/spring-boot - - - pwebb - Phillip Webb - pwebb at pivotal.io - Pivotal Software, Inc. - http://www.spring.io - - Project lead - - - - dsyer - Dave Syer - dsyer at pivotal.io - Pivotal Software, Inc. - http://www.spring.io - - Project lead - - - 5.15.0 @@ -220,11 +198,13 @@ 3.0.0-M1 3.0.1 2.4.3 - 3.5.1 + 3.6 3.0.1 2.20.1 3.1.0 2.3 + 1.0.1 + 1.0.0 @@ -232,67 +212,67 @@ org.springframework.boot spring-boot - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-test - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-test-autoconfigure - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-actuator - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-actuator-autoconfigure - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-autoconfigure - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-autoconfigure-processor - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-configuration-metadata - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-configuration-processor - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-devtools - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-loader - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-loader-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter - 2.0.0.BUILD-SNAPSHOT + ${revision} commons-logging @@ -303,207 +283,207 @@ org.springframework.boot spring-boot-starter-activemq - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-actuator - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-amqp - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-aop - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-artemis - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-batch - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-cache - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-cloud-connectors - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-cassandra - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-cassandra-reactive - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-couchbase - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-elasticsearch - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-jpa - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-ldap - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-mongodb - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-mongodb-reactive - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-redis - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-redis-reactive - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-neo4j - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-rest - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-data-solr - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-freemarker - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-groovy-templates - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-hateoas - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-integration - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jdbc - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jersey - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jetty - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jooq - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-json - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jta-atomikos - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jta-bitronix - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-jta-narayana - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-log4j2 - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-logging - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-mail - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-mobile - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-mustache - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-reactor-netty - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-quartz - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-security - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot @@ -513,22 +493,22 @@ org.springframework.boot spring-boot-starter-social-facebook - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-social-linkedin - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-social-twitter - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-test - 2.0.0.BUILD-SNAPSHOT + ${revision} commons-logging @@ -539,42 +519,42 @@ org.springframework.boot spring-boot-starter-thymeleaf - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-tomcat - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-undertow - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-validation - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-web - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-webflux - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-websocket - 2.0.0.BUILD-SNAPSHOT + ${revision} org.springframework.boot spring-boot-starter-web-services - 2.0.0.BUILD-SNAPSHOT + ${revision} @@ -2888,7 +2868,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.0.0.BUILD-SNAPSHOT + ${revision} org.apache.maven.plugins @@ -3008,6 +2988,16 @@ versions-maven-plugin ${versions-maven-plugin.version} + + org.codehaus.mojo + xml-maven-plugin + ${xml-maven-plugin.version} + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + org.flywaydb flyway-maven-plugin @@ -3022,42 +3012,108 @@ - maven-help-plugin + org.codehaus.mojo + flatten-maven-plugin false - generate-effective-dependencies-pom - generate-resources + + flatten-effective-pom + process-resources - effective-pom + flatten - ${project.build.directory}/effective-pom/spring-boot-dependencies.xml + false + ${project.build.directory}/effective-pom + spring-boot-dependencies.xml + oss + + expand + expand + remove + remove + + + + flatten + process-resources + + flatten + + + true + bom + + keep + + + + + flatten-clean + clean + + clean + + org.codehaus.mojo xml-maven-plugin - 1.0 false + + post-process-effective-pom + process-resources transform + + + + ${project.build.directory}/effective-pom + ${project.build.directory}/effective-pom + src/main/xslt/post-process-flattened-pom.xsl + + + indent + yes + + + + + + + + + post-process-flattened-pom + process-resources + + transform + + + + + ${project.basedir} + ${project.basedir} + .flattened-pom.xml + src/main/xslt/post-process-flattened-pom.xsl + + + indent + yes + + + + + - - - - ${project.build.directory}/effective-pom - src/main/xslt/single-project.xsl - ${project.build.directory}/effective-pom - - - org.codehaus.mojo @@ -3065,6 +3121,7 @@ false + attach-artifacts package @@ -3083,43 +3140,4 @@ - - - default - - true - - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - rabbit-milestones - Rabbit Milestones - https://dl.bintray.com/rabbitmq/maven-milestones - - false - - - - - - integration-test - - diff --git a/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl b/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl new file mode 100644 index 0000000000..72e984b0f9 --- /dev/null +++ b/spring-boot-project/spring-boot-dependencies/src/main/xslt/post-process-flattened-pom.xsl @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-project/spring-boot-devtools/pom.xml b/spring-boot-project/spring-boot-devtools/pom.xml index 559a2470a3..ead29219ec 100644 --- a/spring-boot-project/spring-boot-devtools/pom.xml +++ b/spring-boot-project/spring-boot-devtools/pom.xml @@ -4,19 +4,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-devtools Spring Boot Developer Tools Spring Boot Developer Tools - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-project/spring-boot-docs/pom.xml b/spring-boot-project/spring-boot-docs/pom.xml index 04ed9aaf9d..b6bcac2797 100644 --- a/spring-boot-project/spring-boot-docs/pom.xml +++ b/spring-boot-project/spring-boot-docs/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-docs Spring Boot Docs Spring Boot Docs - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. @@ -35,6 +31,17 @@ org.springframework.boot spring-boot-autoconfigure + + org.springframework.boot + spring-boot-cli + ${revision} + + + org.springframework.boot + spring-boot-starters + ${revision} + pom + org.springframework.boot spring-boot-devtools @@ -848,9 +855,9 @@ org.apache.maven.plugins maven-jar-plugin - - ** - + + ** + @@ -858,6 +865,11 @@ full + + + full + + @@ -906,7 +918,7 @@ org.springframework.boot spring-boot-starters - ${project.version} + ${revision} pom true ${project.build.directory}/external-resources @@ -926,7 +938,7 @@ org.springframework.boot spring-boot-maven-plugin - ${project.version} + ${revision} site jar @@ -937,7 +949,7 @@ org.springframework.boot spring-boot-gradle-plugin - ${project.version} + ${revision} docs zip ${project.build.directory}/contents/gradle-plugin @@ -957,7 +969,7 @@ org.springframework.boot spring-boot-dependencies - ${project.version} + ${revision} effective-pom true ${project.build.directory}/external-resources @@ -977,7 +989,7 @@ org.springframework.boot spring-boot-autoconfigure - ${project.version} + ${revision} ${project.build.directory}/auto-config/spring-boot-autoconfigure @@ -986,7 +998,7 @@ org.springframework.boot spring-boot-actuator-autoconfigure - ${project.version} + ${revision} ${project.build.directory}/auto-config/spring-boot-actuator-autoconfigure @@ -1006,7 +1018,7 @@ org.springframework.boot spring-boot-starters - ${project.version} + ${revision} zip starter-poms ${project.build.directory}/external-resources/starter-poms @@ -1025,7 +1037,7 @@ org.springframework.boot spring-boot-test-autoconfigure - ${project.version} + ${revision} ${project.build.directory}/test-auto-config @@ -1055,7 +1067,8 @@ src/main/xslt/dependencyVersions.xsl - + .adoc @@ -1098,7 +1111,6 @@ org.asciidoctor asciidoctor-maven-plugin - 1.5.0 generate-docbook @@ -1113,8 +1125,8 @@ true ${spring.version} - ${project.version} - ${project.version} + ${revision} + ${revision} ${spring-boot-repo} ${spring.version} ${spring-security.version} @@ -1223,7 +1235,8 @@ - + @@ -1242,7 +1255,8 @@ - + @@ -1283,8 +1297,11 @@ - - + + @@ -1301,16 +1318,21 @@ - - - - - + + + + + - - + + @@ -1329,7 +1351,7 @@ ${project.build.directory}/${project.artifactId}-${project.version}.zip - zip;zip.type=docs;zip.deployed=false + zip diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 8cc51cd6f1..2324f01264 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -5,25 +5,24 @@ org.springframework.boot spring-boot-dependencies - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-dependencies spring-boot-parent pom Spring Boot Parent Spring Boot Parent - http://projects.spring.io/spring-boot/ Pivotal Software, Inc. http://www.spring.io - ${basedir}/.. + ${basedir}/../.. false 1.8 - 1.0.2.v20150114 UTF-8 UTF-8 + 1.0.2.v20150114 3.1.1 1.0-groovy-2.4 @@ -36,21 +35,20 @@ Github https://github.com/spring-projects/spring-boot/issues - - Bamboo - https://build.spring.io/browse/BOOT-PUB - + + 3.5 + + org.springframework.boot spring-boot-test-support - 2.0.0.BUILD-SNAPSHOT + ${revision} - - - + + + log4j log4j 1.2.17 @@ -270,6 +268,11 @@ + + org.asciidoctor + asciidoctor-maven-plugin + 1.5.5 + org.apache.maven.plugins maven-checkstyle-plugin @@ -285,7 +288,6 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.18 @@ -298,17 +300,16 @@ org.apache.maven.plugins maven-plugin-plugin - 3.3 - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 + 3.5 org.apache.maven.plugins maven-site-plugin - 3.4 + + + org.basepom.maven + duplicate-finder-maven-plugin + 1.2.1 org.codehaus.cargo @@ -334,6 +335,19 @@ + + + org.basepom.maven + duplicate-finder-maven-plugin + [1,2) + + check + + + + + + @@ -455,6 +469,25 @@ + + + + org.codehaus.mojo + + + flatten-maven-plugin + + + [1.0.0,) + + + flatten + + + + + + @@ -462,6 +495,30 @@ + + org.codehaus.mojo + flatten-maven-plugin + true + + + + flatten + process-resources + + flatten + + + true + oss + + expand + remove + remove + + + + + org.apache.maven.plugins maven-checkstyle-plugin @@ -529,15 +586,15 @@ main.basedir - - project.organization.name - project.name project.description + + true + true @@ -572,6 +629,8 @@ -Xmx1024m false + true + alphabetical @@ -593,66 +652,6 @@ - - default - - true - - - - spring-ext - http://repo.spring.io/ext-release-local/ - - true - - - false - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - rabbit-milestones - Rabbit Milestones - https://dl.bintray.com/rabbitmq/maven-milestones - - false - - - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - fast @@ -663,161 +662,14 @@ true - - - spring-ext - http://repo.spring.io/ext-release-local/ - - true - - - false - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - rabbit-milestones - Rabbit Milestones - https://dl.bintray.com/rabbitmq/maven-milestones - - false - - - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - - - eclipse.profile - - - m2e.version - - - - false - false - false - false - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - true - - - - - - - spring-ext - http://repo.spring.io/ext-release-local/ - - true - - - false - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - rabbit-milestones - Rabbit Milestones - https://dl.bintray.com/rabbitmq/maven-milestones - - false - - - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - - - prepare - - - spring-ext - http://repo.spring.io/ext-release-local/ - - true - - - false - - - full + + + full + + @@ -835,93 +687,20 @@ - - - objectstyle - ObjectStyle.org Repository - http://objectstyle.org/maven2/ - - false - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - snapshot - - - milestone - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-milestone-rules - - enforce - - - - - (1.8,1.9) - - - - - true - - - - - - - - - release - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-release-rules - - enforce - - - - - (1.8,1.9) - - - - - true - - - - - - + eclipse.profile + + + m2e.version + + + + false + false + false + false + java9 diff --git a/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml index 75a2bbde52..fc343f4c16 100644 --- a/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml +++ b/spring-boot-project/spring-boot-parent/src/checkstyle/checkstyle.xml @@ -80,7 +80,7 @@ - + diff --git a/spring-boot-project/spring-boot-starters/pom.xml b/spring-boot-project/spring-boot-starters/pom.xml index e77dceefce..e0ae6b2cb6 100644 --- a/spring-boot-project/spring-boot-starters/pom.xml +++ b/spring-boot-project/spring-boot-starters/pom.xml @@ -1,23 +1,19 @@ - + 4.0.0 org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-starters pom Spring Boot Starters Spring Boot Starters - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. spring-boot-starter @@ -76,7 +72,6 @@ spring-boot-starter-websocket spring-boot-starter-web-services - @@ -141,7 +136,6 @@ org.basepom.maven duplicate-finder-maven-plugin - 1.2.1 duplicate-dependencies @@ -151,39 +145,13 @@ true + + changelog.txt + - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.basepom.maven - duplicate-finder-maven-plugin - [1,2) - - check - - - - - - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml index bcb73ed76a..251633f105 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-activemq/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-activemq Spring Boot ActiveMQ Starter Starter for JMS messaging using Apache ActiveMQ - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/pom.xml index 3414f65621..f3911fcdf1 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-actuator/pom.xml @@ -5,19 +5,14 @@ org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-actuator Spring Boot Actuator Starter Starter for using Spring Boot's Actuator which provides production ready features to help you monitor and manage your application - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/pom.xml index 5368e6c94f..44ba680c16 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-amqp/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-amqp Spring Boot AMQP Starter Starter for using Spring AMQP and Rabbit MQ - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/pom.xml index 121a5903bb..ffb3791021 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-aop/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-aop Spring Boot AOP Starter Starter for aspect-oriented programming with Spring AOP and AspectJ - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml index 8ecb8fd640..1092f9ab94 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-artemis/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-artemis Spring Boot Artemis Starter Starter for JMS messaging using Apache Artemis - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/pom.xml index 1451efa2bd..0b6a8a2328 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-batch/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-batch Spring Boot Batch Starter Starter for using Spring Batch - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/pom.xml index 3c9ff096a9..55dcd85c14 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-cache/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-cache Spring Boot Cache Starter Starter for using Spring Framework's caching support - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml index 26fbf9f771..ccc0eb564a 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-cloud-connectors Spring Boot Spring Cloud Connectors Starter Starter for using Spring Cloud Connectors which simplifies connecting to services in cloud platforms like Cloud Foundry and Heroku - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/pom.xml index 6d97e683a3..2952fcdfba 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra-reactive/pom.xml @@ -1,25 +1,19 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-cassandra-reactive Spring Boot Data Cassandra Reactive Starter Starter for using Cassandra distributed database and Spring Data Cassandra Reactive - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml index d949164ff5..bd5a70b701 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-cassandra/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-cassandra Spring Boot Data Cassandra Starter Starter for using Cassandra distributed database and Spring Data Cassandra - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml index 78049ffecd..006721ef9b 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 spring-boot-starters org.springframework.boot - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-couchbase Spring Boot Data Couchbase Starter Starter for using Couchbase document-oriented database and Spring Data Couchbase - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -38,26 +34,4 @@ - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - changelog.txt - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml index 753493710a..31a9d47182 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-elasticsearch Spring Boot Data Elasticsearch Starter Starter for using Elasticsearch search and analytics engine and Spring Data Elasticsearch - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index 7c5e857c86..134d54560c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-jpa Spring Boot Data JPA Starter Starter for using Spring Data JPA with Hibernate - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -65,26 +61,4 @@ spring-aspects - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - changelog.txt - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml index 0cae3e0081..bd8035b020 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-ldap/pom.xml @@ -5,18 +5,13 @@ spring-boot-starters org.springframework.boot - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-ldap Spring Boot Data LDAP Starter Starter for using Spring Data LDAP - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -34,26 +29,4 @@ - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - changelog.txt - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/pom.xml index 59cba3e114..609e37d03c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb-reactive/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-mongodb-reactive Spring Boot Data MongoDB Reactive Starter Starter for using MongoDB document-oriented database and Spring Data MongoDB Reactive - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml index 806634cb01..244ce053ad 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-mongodb Spring Boot Data MongoDB Starter Starter for using MongoDB document-oriented database and Spring Data MongoDB - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml index bdae018fe8..ab58899446 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-neo4j Spring Boot Data Neo4j Starter Starter for using Neo4j graph database and Spring Data Neo4j - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/pom.xml index 2821fb0bf0..93445086b0 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-redis/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-redis Spring Boot Data Redis Starter Starter for using Redis key-value data store with Spring Data Redis and the Lettuce client - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -38,26 +34,4 @@ lettuce-core - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - changelog.txt - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml index e386e8af56..c26b68d113 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-rest Spring Boot Data REST Starter Starter for exposing Spring Data repositories over REST using Spring Data REST - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -43,28 +39,25 @@ - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - javax.annotation.* - - - changelog.txt - - - - - - - + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + javax.annotation.* + + + + + + + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/pom.xml index a7ced6c7b9..f5f5f2b1a7 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-solr/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-data-solr Spring Boot Data Solr Starter Starter for using the Apache Solr search platform with Spring Data Solr - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -48,30 +44,8 @@ - org.apache.httpcomponents + org.apache.httpcomponents httpmime - - - - org.basepom.maven - duplicate-finder-maven-plugin - - - duplicate-dependencies - validate - - check - - - - changelog.txt - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml index 3b17a7f10d..2015c592f6 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-freemarker Spring Boot FreeMarker Starter Starter for building MVC web applications using FreeMarker views - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml index 89a2eb97e2..67a13f49de 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-groovy-templates Spring Boot Groovy Templates Starter Starter for building MVC web applications using Groovy Templates views - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml index 4e5201611c..529255aea9 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-hateoas Spring Boot HATEOAS Starter Starter for building hypermedia-based RESTful web application with Spring MVC and Spring HATEOAS - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/pom.xml index 6ca4b5fd0b..21f70b8753 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-integration/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-integration Spring Boot Integration Starter Starter for using Spring Integration - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml index 2c15313df7..a416828427 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jdbc/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jdbc Spring Boot JDBC Starter Starter for using JDBC with the Tomcat JDBC connection pool - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml index 4b837b3d82..44fbe6d5a3 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jersey/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jersey Spring Boot Jersey Starter Starter for building RESTful web applications using JAX-RS and Jersey. An alternative to spring-boot-starter-web - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -91,7 +87,7 @@ org.jvnet - tiger-types + tiger-types org.glassfish.hk2.external @@ -108,7 +104,7 @@ jersey-media-json-jackson - + org.basepom.maven diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml index 31dba4128b..d3adee93c9 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jetty/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jetty Spring Boot Jetty Starter Starter for using Jetty as the embedded servlet container. An alternative to spring-boot-starter-tomcat - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml index 4d23873956..f96dbe7f38 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jooq/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jooq Spring Boot JOOQ Starter Starter for using jOOQ to access SQL databases. An alternative to spring-boot-starter-data-jpa or spring-boot-starter-jdbc - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-json/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-json/pom.xml index 8d4b87f739..8c978b1b1d 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-json/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-json/pom.xml @@ -4,18 +4,13 @@ org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-json Spring Boot Json Starter Starter for reading and writing json - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml index b3f7af6ae7..783612a809 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jta-atomikos Spring Boot Atomikos JTA Starter Starter for JTA transactions using Atomikos - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml index 1ea34ba42d..4aad29f9b5 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jta-bitronix Spring Boot Bitronix JTA Starter Starter for JTA transactions using Bitronix - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -40,6 +36,5 @@ - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml index d56548e083..62164bdfc4 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-jta-narayana/pom.xml @@ -1,17 +1,17 @@ - + 4.0.0 spring-boot-starters org.springframework.boot - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-jta-narayana Spring Boot Narayana JTA Starter Spring Boot Narayana JTA Starter - http://projects.spring.io/spring-boot/ - ${basedir}/../.. + ${basedir}/../../.. @@ -24,11 +24,11 @@ org.jboss.spec.javax.transaction - jboss-transaction-api_1.2_spec + jboss-transaction-api_1.2_spec org.jboss.spec.javax.transaction - jboss-transaction-api_1.1_spec + jboss-transaction-api_1.1_spec diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/pom.xml index 267938ff98..d1f4415afb 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-log4j2/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-log4j2 Spring Boot Log4j 2 Starter Starter for using Log4j2 for logging. An alternative to spring-boot-starter-logging - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml index a451fe6a6c..6328e9a834 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-logging/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-logging Spring Boot Logging Starter Starter for logging using Logback. Default logging starter - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml index 36c79101db..2296224670 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-mail/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-mail Spring Boot Mail Starter Starter for using Java Mail and Spring Framework's email sending support - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-mobile/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-mobile/pom.xml index fe645d59a8..0d3b44ca91 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-mobile/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-mobile/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-mobile Spring Boot Mobile Starter Starter for building web applications using Spring Mobile - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/pom.xml index 04e4698544..cb7ae04303 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-mustache/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-mustache Spring Boot Mustache Starter Starter for building web applications using Mustache views - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml index 6fdfd96bb2..1da8f07d80 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -1,9 +1,11 @@ - + + 4.0.0 org.springframework.boot spring-boot-dependencies - 2.0.0.BUILD-SNAPSHOT + ${revision} ../../spring-boot-dependencies spring-boot-starter-parent @@ -11,11 +13,6 @@ Spring Boot Starter Parent Parent pom providing dependency and plugin management for applications built with Maven - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - 1.8 @ @@ -159,13 +156,6 @@ org.apache.maven.plugins maven-shade-plugin - - - org.springframework.boot - spring-boot-maven-plugin - 2.0.0.BUILD-SNAPSHOT - - true true @@ -188,17 +178,22 @@ - + META-INF/spring.handlers - + META-INF/spring.factories - + META-INF/spring.schemas - - + + ${start-class} @@ -206,7 +201,103 @@ + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.codehaus.mojo + + + flatten-maven-plugin + + + [1.0.0,) + + + flatten + + + + + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + false + + + + flatten + process-resources + + flatten + + + true + + keep + expand + keep + keep + keep + + + + + flatten-clean + clean + + clean + + + + + + org.codehaus.mojo + xml-maven-plugin + false + + + + post-process-flattened-pom + process-resources + + transform + + + + + ${project.basedir} + ${project.basedir} + .flattened-pom.xml + src/main/xslt/post-process-flattened-pom.xsl + + + indent + yes + + + + + + + + + diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl new file mode 100644 index 0000000000..6a5e8a78da --- /dev/null +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/src/main/xslt/post-process-flattened-pom.xsl @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/pom.xml index a2f0c7489f..a8ca7deefc 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-quartz/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-quartz Spring Boot Quartz Starter Spring Boot Quartz Starter - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml index bfc2601e71..9b0868ce91 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-reactor-netty/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-reactor-netty Spring Boot Reactor Netty Starter Starter for using Reactor Netty as the embedded reactive HTTP server. - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-security-reactive/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-security-reactive/pom.xml index 59b25b6935..9ede7dbfbc 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-security-reactive/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-security-reactive/pom.xml @@ -5,18 +5,13 @@ org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-security-reactive Spring Boot Security Reactive Starter Starter for using reactive Spring Security - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml index 8990ea7d19..f5077fd946 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-security/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-security Spring Boot Security Starter Starter for using Spring Security - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml index 4e1475a506..fe118f3bb3 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-social-facebook Spring Boot Social Facebook Starter Starter for using Spring Social Facebook - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml index 450847b76e..fd4b74961c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-social-linkedin Spring Boot Social LinkedIn Starter Stater for using Spring Social LinkedIn - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml index 83e92e4af8..449cbd93b7 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-social-twitter Spring Boot Social Twitter Starter Starter for using Spring Social Twitter - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml index 7ec5396354..859058d106 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-test/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-test Spring Boot Test Starter Starter for testing Spring Boot applications with libraries including JUnit, Hamcrest and Mockito - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml index d09f138f83..d8b36e00dd 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-thymeleaf Spring Boot Thymeleaf Starter Starter for building MVC web applications using Thymeleaf views - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml index 572e6ae805..611f387e40 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-tomcat Spring Boot Tomcat Starter Starter for using Tomcat as the embedded servlet container. Default servlet container starter used by spring-boot-starter-web - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml index ff3360c8e8..c29c6bbc2c 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-undertow/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-undertow Spring Boot Undertow Starter Starter for using Undertow as the embedded servlet container. An alternative to spring-boot-starter-tomcat - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml index 04139fb7b8..a4247b59dc 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-validation/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-validation Spring Boot Validation Starter Starter for using Java Bean Validation with Hibernate Validator - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml index 3877bb200b..70ceb7460d 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-web-services Spring Boot Web Services Starter Starter for using Spring Web Services - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml index d4b9190e81..83791dad77 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-web Spring Boot Web Starter Starter for building web, including RESTful, applications using Spring MVC. Uses Tomcat as the default embedded container - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml index b48c0b84f2..947b4dac0f 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-webflux/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-webflux Spring Boot WebFlux Starter Starter for building WebFlux applications using Spring Framework's Reactive Web support - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml index cba2cd0098..0e880528e9 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter-websocket Spring Boot WebSocket Starter Starter for building WebSocket applications using Spring Framework's WebSocket support - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml index 2d9c595886..fa1bcde462 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter/pom.xml @@ -1,21 +1,17 @@ - + 4.0.0 org.springframework.boot spring-boot-starters - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-starter Spring Boot Starter Core starter, including auto-configuration support, logging and YAML - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-test-autoconfigure/pom.xml b/spring-boot-project/spring-boot-test-autoconfigure/pom.xml index 6a84c62526..00c9a685ae 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/pom.xml +++ b/spring-boot-project/spring-boot-test-autoconfigure/pom.xml @@ -4,19 +4,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-test-autoconfigure Spring Boot Test Auto-Configure Spring Boot Test Auto-Configure - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-project/spring-boot-test/pom.xml b/spring-boot-project/spring-boot-test/pom.xml index 30b1c504dc..2c98894a12 100644 --- a/spring-boot-project/spring-boot-test/pom.xml +++ b/spring-boot-project/spring-boot-test/pom.xml @@ -4,19 +4,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-test Spring Boot Test Spring Boot Test - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-project/spring-boot-tools/pom.xml b/spring-boot-project/spring-boot-tools/pom.xml index db0d874c67..9e2c8bc4a8 100644 --- a/spring-boot-project/spring-boot-tools/pom.xml +++ b/spring-boot-project/spring-boot-tools/pom.xml @@ -4,20 +4,15 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot-tools pom Spring Boot Tools Spring Boot Tools - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. spring-boot-antlib diff --git a/spring-boot-project/spring-boot-tools/spring-boot-antlib/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-antlib/pom.xml index be5911287a..315d4741db 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-antlib/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-antlib/pom.xml @@ -1,34 +1,32 @@ - + 4.0.0 org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-antlib Spring Boot Antlib Spring Boot Antlib - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. 1.9.3 - - org.springframework.boot - spring-boot-loader - provided - + org.springframework.boot spring-boot-loader-tools compile + + + org.springframework.boot + spring-boot-loader + provided + org.apache.ant ant @@ -51,6 +49,7 @@ true false true + false @@ -76,7 +75,8 @@ - + @@ -86,7 +86,8 @@ - + ${skipTests} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml index dd03d6f4d5..75272ab467 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-autoconfigure-processor/pom.xml @@ -5,20 +5,16 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-autoconfigure-processor Spring Boot Auto-Configure Annotation Processor Spring Auto-Configure Annotation Processor - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. + org.springframework.boot spring-boot-test-support diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/pom.xml index cfd2f20e52..4ceec4d86f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/pom.xml @@ -4,18 +4,13 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-configuration-metadata Spring Boot Configuration Metadata Spring Boot Configuration Metadata - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml index d617d97412..386fc836b6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/pom.xml @@ -5,18 +5,13 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-configuration-processor Spring Boot Configuration Processor Spring Boot Configuration Processor - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml index 9ac6671e1d..8c121fca62 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml @@ -1,22 +1,18 @@ - + 4.0.0 org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-gradle-plugin pom Spring Boot Gradle Plugin Spring Boot Gradle Plugin - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. ./gradlew build @@ -37,15 +33,31 @@ - maven-help-plugin + org.apache.maven.plugins + maven-dependency-plugin - prepare-package + copy-compile-dependencies + generate-resources - effective-pom + copy-dependencies + false - ${project.build.directory}/effective-pom.xml + compile + ${project.build.directory}/dependencies/compile + + + + copy-test-dependencies + generate-resources + + copy-dependencies + + false + + test + ${project.build.directory}/dependencies/test @@ -132,6 +144,11 @@ full + + + full + + @@ -173,12 +190,17 @@ - - - - + + + + - + @@ -190,12 +212,18 @@ - - - + + + - - + + @@ -206,7 +234,6 @@ org.asciidoctor asciidoctor-maven-plugin - 1.5.3 generate-html-documentation diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/pom.xml index 276a0a8f7d..98433dbe52 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/pom.xml @@ -4,18 +4,13 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-loader-tools Spring Boot Loader Tools Spring Boot Loader Tools - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. @@ -52,7 +47,7 @@ maven-dependency-plugin - include-layout-jar + include-loader-jar generate-resources copy diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml index 9a9072e32d..e7720fdbaa 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/pom.xml @@ -5,22 +5,16 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-loader Spring Boot Loader Spring Boot Loader - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - - ${basedir}/../.. + ${basedir}/../../.. - + org.springframework spring-core @@ -42,8 +36,8 @@ spring-webmvc test - + org.bouncycastle bcprov-jdk16 1.46 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml index b3ef10d519..681bc5832f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -5,124 +5,15 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-maven-plugin maven-plugin Spring Boot Maven Plugin Spring Boot Maven Plugin - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. - - - integration - - true - - - - - org.apache.maven.plugins - maven-invoker-plugin - - ${project.build.directory}/it - src/it/settings.xml - ${project.build.directory}/local-repo - verify - true - ${skipTests} - true - - - - integration-test - - install - run - - - - - - - - - full - - - - org.apache.maven.plugins - maven-site-plugin - - - generate-site - - jar - - - - - - org.apache.maven.plugins - maven-invoker-plugin - - ${project.build.directory}/it - src/it/settings.xml - ${project.build.directory}/local-repo - verify - true - ${skipTests} - true - - - - integration-test - - install - run - - - - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - - index - cim - issue-tracking - license - scm - - - - - https://github.com/spring-projects/spring-boot/ - scm:git:git://github.com/spring-projects/spring-boot.git - scm:git:ssh://git@github.com/spring-projects/spring-boot.git - - - - - - @@ -222,4 +113,108 @@ + + + integration + + true + + + + + org.apache.maven.plugins + maven-invoker-plugin + + ${project.build.directory}/it + src/it/settings.xml + ${project.build.directory}/local-repo + verify + true + ${skipTests} + true + + + + integration-test + + install + run + + + + + + + + + full + + + full + + + + + + org.apache.maven.plugins + maven-site-plugin + + + generate-site + + jar + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + ${project.build.directory}/it + src/it/settings.xml + ${project.build.directory}/local-repo + verify + true + ${skipTests} + true + + + + integration-test + + install + run + + + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.9 + + + + index + cim + issue-tracking + license + scm + + + + + + + + diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/site.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/site.xml index b735284ba9..2ecc646eca 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/site.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/site/site.xml @@ -22,6 +22,6 @@ org.apache.maven.skins maven-fluido-skin - 1.3.1 + 1.6 diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml index 0a8076dbe5..937a89f810 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/pom.xml @@ -5,18 +5,13 @@ org.springframework.boot spring-boot-tools - 2.0.0.BUILD-SNAPSHOT + ${revision} spring-boot-test-support Spring Boot Testing Support Spring Boot Testing Support - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/../.. + ${basedir}/../../.. diff --git a/spring-boot-project/spring-boot/pom.xml b/spring-boot-project/spring-boot/pom.xml index 94d046d555..e757a0e457 100644 --- a/spring-boot-project/spring-boot/pom.xml +++ b/spring-boot-project/spring-boot/pom.xml @@ -4,19 +4,14 @@ org.springframework.boot spring-boot-parent - 2.0.0.BUILD-SNAPSHOT + ${revision} ../spring-boot-parent spring-boot Spring Boot Spring Boot - http://projects.spring.io/spring-boot/ - - Pivotal Software, Inc. - http://www.spring.io - - ${basedir}/.. + ${basedir}/../.. diff --git a/spring-boot-samples-invoker/pom.xml b/spring-boot-samples-invoker/pom.xml new file mode 100644 index 0000000000..3431398e57 --- /dev/null +++ b/spring-boot-samples-invoker/pom.xml @@ -0,0 +1,84 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-parent + ${revision} + ../spring-boot-project/spring-boot-parent + + spring-boot-samples-invoker + pom + Spring Boot Samples Invoker + Spring Boot Samples Invoker + + ${basedir}/.. + + + + + + org.apache.maven.plugins + maven-invoker-plugin + + 2.0.0 + false + + ${main.basedir}/spring-boot-samples + + ${skipTests} + true + + pom.xml + + + + + integration-test + install + + run + + + + + + org.apache.maven.plugins + maven-antrun-plugin + false + + + clean-samples + clean + + run + + + + + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + false + + + clean-samples + clean + + clean + + + + + + + diff --git a/spring-boot-tests/pom.xml b/spring-boot-tests/pom.xml new file mode 100644 index 0000000000..b959e45a28 --- /dev/null +++ b/spring-boot-tests/pom.xml @@ -0,0 +1,56 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-parent + ${revision} + ../spring-boot-project/spring-boot-parent + + spring-boot-tests + pom + Spring Boot Tests + Spring Boot Test + + ${basedir}/.. + + + + spring-boot-integration-tests + + + + + m2e + + + m2e.version + + + + spring-boot-integration-tests + spring-boot-deployment-tests + + + + + + + org.apache.maven.plugins + maven-install-plugin + + true + + + + org.apache.maven.plugins + maven-javadoc-plugin + + true + + true + + + +