From 33082fd56d85ba23d2aaa401b2eb8730079c8b1c Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 30 Apr 2014 17:42:23 +0200 Subject: [PATCH] Harmonized maven dependency management This commit harmonizes the dependency management of internal modules so that versions can be omitted everywhere. Update the maven coordinates to provide the full groupId for consistency --- spring-boot-actuator/pom.xml | 9 +- spring-boot-autoconfigure/pom.xml | 6 +- spring-boot-cli/pom.xml | 8 +- spring-boot-dependencies/pom.xml | 168 ++++++++++++++++++ spring-boot-docs/pom.xml | 15 +- .../src/main/asciidoc/using-spring-boot.adoc | 2 +- .../spring-boot-starter-actuator/pom.xml | 6 +- .../spring-boot-starter-amqp/pom.xml | 3 +- .../spring-boot-starter-aop/pom.xml | 3 +- .../spring-boot-starter-batch/pom.xml | 3 +- .../spring-boot-starter-data-gemfire/pom.xml | 3 +- .../spring-boot-starter-data-jpa/pom.xml | 6 +- .../spring-boot-starter-data-mongodb/pom.xml | 3 +- .../spring-boot-starter-data-neo4j/pom.xml | 3 +- .../spring-boot-starter-data-rest/pom.xml | 3 +- .../spring-boot-starter-freemarker/pom.xml | 3 +- .../spring-boot-starter-integration/pom.xml | 5 +- .../spring-boot-starter-jdbc/pom.xml | 3 +- .../spring-boot-starter-mobile/pom.xml | 6 +- .../spring-boot-starter-parent/pom.xml | 141 --------------- .../spring-boot-starter-redis/pom.xml | 3 +- .../spring-boot-starter-remote-shell/pom.xml | 3 +- .../spring-boot-starter-security/pom.xml | 3 +- .../spring-boot-starter-thymeleaf/pom.xml | 3 +- .../spring-boot-starter-web/pom.xml | 6 +- .../spring-boot-starter-websocket/pom.xml | 3 +- .../spring-boot-starter/pom.xml | 9 +- .../spring-boot-gradle-plugin/pom.xml | 6 +- .../spring-boot-loader-tools/pom.xml | 5 +- .../spring-boot-maven-plugin/pom.xml | 3 +- 30 files changed, 214 insertions(+), 229 deletions(-) diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml index edb3f7a58d0..37338e0b8bd 100644 --- a/spring-boot-actuator/pom.xml +++ b/spring-boot-actuator/pom.xml @@ -21,14 +21,12 @@ - ${project.groupId} + org.springframework.boot spring-boot - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-autoconfigure - ${project.version} com.fasterxml.jackson.core @@ -125,9 +123,8 @@ test - ${project.groupId} + org.springframework.boot spring-boot - ${project.version} test-jar test diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml index d644819acd1..ea8dda29de6 100644 --- a/spring-boot-autoconfigure/pom.xml +++ b/spring-boot-autoconfigure/pom.xml @@ -22,9 +22,8 @@ - ${project.groupId} + org.springframework.boot spring-boot - ${project.version} @@ -239,9 +238,8 @@ - ${project.groupId} + org.springframework.boot spring-boot - ${project.version} test-jar test diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index ad1f21a107c..e9e3ddfb0c5 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -34,14 +34,12 @@ - ${project.groupId} + org.springframework.boot spring-boot-dependency-tools - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-loader-tools - ${project.version} jline @@ -162,7 +160,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-loader ${project.version} jar diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index bdb0adb51c3..3b051470a0f 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -45,6 +45,9 @@ + + 1.1.0.BUILD-SNAPSHOT + 5.7.0 1.7.4 3.0.2 @@ -107,6 +110,171 @@ + + + org.springframework.boot + spring-boot + ${spring-boot.version} + + + org.springframework.boot + spring-boot + test-jar + ${spring-boot.version} + + + org.springframework.boot + spring-boot-actuator + ${spring-boot.version} + + + org.springframework.boot + spring-boot-autoconfigure + ${spring-boot.version} + + + org.springframework.boot + spring-boot-dependency-tools + ${spring-boot.version} + + + org.springframework.boot + spring-boot-loader + ${spring-boot.version} + + + org.springframework.boot + spring-boot-loader-tools + ${spring-boot.version} + + + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-actuator + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-amqp + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-aop + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-batch + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-data-gemfire + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-data-jpa + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-data-mongodb + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-data-neo4j + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-data-rest + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-freemarker + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-integration + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-jdbc + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-jetty + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-log4j + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-logging + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-mobile + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-redis + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-remote-shell + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-security + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-thymeleaf + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-tomcat + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + org.springframework.boot + spring-boot-starter-websocket + ${spring-boot.version} + + + ch.qos.logback logback-classic diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index 9c9f2225037..03efe0b0f70 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -20,29 +20,24 @@ - ${project.groupId} + org.springframework.boot spring-boot - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-autoconfigure - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-actuator - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-loader - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-loader-tools - ${project.version} diff --git a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc index 9025266bcef..26514f6dadc 100644 --- a/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc +++ b/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc @@ -35,7 +35,7 @@ defaults. The parent project provides the following features: * Java 1.6 as the default compiler level. * UTF-8 source encoding. * A Dependency Management section, allowing you to omit `` tags for common - dependencies. + dependencies, inherited from the `spring-boot-dependencies` POM. * Sensible https://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html[resource filtering]. * Sensible plugin configuration (http://mojo.codehaus.org/exec-maven-plugin/[exec plugin], http://maven.apache.org/surefire/maven-surefire-plugin/[surefire], diff --git a/spring-boot-starters/spring-boot-starter-actuator/pom.xml b/spring-boot-starters/spring-boot-starter-actuator/pom.xml index 9b474861e16..afd16530c64 100644 --- a/spring-boot-starters/spring-boot-starter-actuator/pom.xml +++ b/spring-boot-starters/spring-boot-starter-actuator/pom.xml @@ -19,14 +19,12 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-actuator - ${project.version} diff --git a/spring-boot-starters/spring-boot-starter-amqp/pom.xml b/spring-boot-starters/spring-boot-starter-amqp/pom.xml index 4c450c06e59..f9c100a7a27 100644 --- a/spring-boot-starters/spring-boot-starter-amqp/pom.xml +++ b/spring-boot-starters/spring-boot-starter-amqp/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.springframework.amqp diff --git a/spring-boot-starters/spring-boot-starter-aop/pom.xml b/spring-boot-starters/spring-boot-starter-aop/pom.xml index 234e78ee903..9b3cb8c0551 100644 --- a/spring-boot-starters/spring-boot-starter-aop/pom.xml +++ b/spring-boot-starters/spring-boot-starter-aop/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.springframework diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml index 891b1ca35f1..fca59ac791d 100644 --- a/spring-boot-starters/spring-boot-starter-batch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.hsqldb diff --git a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml index 0249f3da533..cfe5af5ee4b 100644 --- a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml @@ -20,9 +20,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} com.gemstone.gemfire diff --git a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index de9ad4de5a6..89fb646b45f 100644 --- a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -19,14 +19,12 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter-aop - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-starter-jdbc - ${project.version} org.hibernate diff --git a/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml b/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml index bbffa26ef27..473bc6dcf99 100644 --- a/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.mongodb diff --git a/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml b/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml index 8382d40b33f..da9ee71e747 100644 --- a/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-neo4j/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.neo4j diff --git a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml index 45ff7f12754..8b4c823f191 100644 --- a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} org.springframework.data diff --git a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml index 033541a1c0e..3643f5d5107 100644 --- a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml +++ b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} org.freemarker diff --git a/spring-boot-starters/spring-boot-starter-integration/pom.xml b/spring-boot-starters/spring-boot-starter-integration/pom.xml index f069afec8fc..e69f31f49f0 100644 --- a/spring-boot-starters/spring-boot-starter-integration/pom.xml +++ b/spring-boot-starters/spring-boot-starter-integration/pom.xml @@ -19,12 +19,11 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-starter-aop ${project.version} diff --git a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml index d38b12f7b18..631b9175450 100644 --- a/spring-boot-starters/spring-boot-starter-jdbc/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jdbc/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.springframework diff --git a/spring-boot-starters/spring-boot-starter-mobile/pom.xml b/spring-boot-starters/spring-boot-starter-mobile/pom.xml index d69db9f9e4c..1f0ae1a526b 100644 --- a/spring-boot-starters/spring-boot-starter-mobile/pom.xml +++ b/spring-boot-starters/spring-boot-starter-mobile/pom.xml @@ -19,14 +19,12 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} org.springframework.mobile diff --git a/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-starters/spring-boot-starter-parent/pom.xml index d4c445c374c..2d3b4ba3c39 100644 --- a/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -20,7 +20,6 @@ 1.6 UTF-8 UTF-8 - 1.1.0.BUILD-SNAPSHOT @@ -36,146 +35,6 @@ - - org.springframework.boot - spring-boot - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter - ${spring-boot.version} - - - org.springframework.boot - spring-boot-actuator - ${spring-boot.version} - - - org.springframework.boot - spring-boot-autoconfigure - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-amqp - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-aop - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-actuator - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-batch - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-gemfire - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-mongodb - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-neo4j - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-rest - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-freemarker - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-integration - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-jdbc - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-jetty - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-logging - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-log4j - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-mobile - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-redis - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-security - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-remote-shell - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-test - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-thymeleaf - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-tomcat - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-websocket - ${spring-boot.version} - diff --git a/spring-boot-starters/spring-boot-starter-redis/pom.xml b/spring-boot-starters/spring-boot-starter-redis/pom.xml index 0ecd8a91007..4aba0f677d9 100644 --- a/spring-boot-starters/spring-boot-starter-redis/pom.xml +++ b/spring-boot-starters/spring-boot-starter-redis/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.springframework.data diff --git a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml index ef13728a5f7..46d2b9f4283 100644 --- a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml +++ b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter-actuator - ${project.version} org.springframework diff --git a/spring-boot-starters/spring-boot-starter-security/pom.xml b/spring-boot-starters/spring-boot-starter-security/pom.xml index fcfc2df746d..d2361131585 100644 --- a/spring-boot-starters/spring-boot-starter-security/pom.xml +++ b/spring-boot-starters/spring-boot-starter-security/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} org.springframework.security diff --git a/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml b/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml index e8dc6f4e76e..d470b68bb3c 100644 --- a/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml +++ b/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} org.thymeleaf diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml index 119280271de..a028794b8c5 100644 --- a/spring-boot-starters/spring-boot-starter-web/pom.xml +++ b/spring-boot-starters/spring-boot-starter-web/pom.xml @@ -19,14 +19,12 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-starter-tomcat - ${project.version} com.fasterxml.jackson.core diff --git a/spring-boot-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-starters/spring-boot-starter-websocket/pom.xml index 508b51a4b27..b973ca943a7 100644 --- a/spring-boot-starters/spring-boot-starter-websocket/pom.xml +++ b/spring-boot-starters/spring-boot-starter-websocket/pom.xml @@ -19,9 +19,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-starter-web - ${project.version} org.springframework diff --git a/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml index 75aa973b13d..d78faedb031 100644 --- a/spring-boot-starters/spring-boot-starter/pom.xml +++ b/spring-boot-starters/spring-boot-starter/pom.xml @@ -19,19 +19,16 @@ - ${project.groupId} + org.springframework.boot spring-boot - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-autoconfigure - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-starter-logging - ${project.version} org.yaml diff --git a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml index 76c844c6f88..57dc5f0653a 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-gradle-plugin/pom.xml @@ -20,14 +20,12 @@ - ${project.groupId} + org.springframework.boot spring-boot-loader-tools - ${project.version} - ${project.groupId} + org.springframework.boot spring-boot-dependency-tools - ${project.version} diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml index 6bef6a57a07..d1fb124c68f 100644 --- a/spring-boot-tools/spring-boot-loader-tools/pom.xml +++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml @@ -25,9 +25,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-loader - ${project.version} provided @@ -75,7 +74,7 @@ - ${project.groupId} + org.springframework.boot spring-boot-loader ${project.version} spring-boot-loader.jar diff --git a/spring-boot-tools/spring-boot-maven-plugin/pom.xml b/spring-boot-tools/spring-boot-maven-plugin/pom.xml index a085498b0d5..93b94ea879a 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/pom.xml +++ b/spring-boot-tools/spring-boot-maven-plugin/pom.xml @@ -99,9 +99,8 @@ - ${project.groupId} + org.springframework.boot spring-boot-loader-tools - ${project.version} org.apache.maven