From 2c17719313d59b3179d3eef2f8e8c598b886d7ec Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 2 Sep 2010 15:57:05 +0000 Subject: [PATCH] Introduce Maven release:update-versions plugin (INT-1320) - Upgrade to version 2.0 of the maven-release-plugin in order to get the new 'update-versions' goal, which allows for doing nothing other than updating pom versions - no tagging, no checkins, etc. - Accommodate idiosyncracies of the plugin. When running for the first time, it became clear that update-versions not only updates versions as advertised, but also formats certain elements of the pom. Committing just those format changes now so that future actual version updates will not have to deal with this uninvited 'help'. - How to run the command: mvn --batch-mode release:update-versions -DdevelopmentVersion=2.0.0.M7 This will edit the elements in the poms of the projects listed in the root pom's section. --- pom.xml | 23 ++++++++++++++++------- spring-integration-core/pom.xml | 3 +-- spring-integration-event/pom.xml | 3 +-- spring-integration-file/pom.xml | 3 +-- spring-integration-ftp/pom.xml | 4 +--- spring-integration-groovy/pom.xml | 4 +--- spring-integration-http/pom.xml | 3 +-- spring-integration-httpinvoker/pom.xml | 3 +-- spring-integration-ip/pom.xml | 3 +-- spring-integration-jdbc/pom.xml | 3 +-- spring-integration-jms/pom.xml | 3 +-- spring-integration-jmx/pom.xml | 3 +-- spring-integration-mail/pom.xml | 3 +-- spring-integration-parent/pom.xml | 5 ++--- spring-integration-rmi/pom.xml | 3 +-- spring-integration-security/pom.xml | 3 +-- spring-integration-sftp/pom.xml | 4 +--- spring-integration-stream/pom.xml | 3 +-- spring-integration-test/pom.xml | 3 +-- spring-integration-twitter/pom.xml | 4 +--- spring-integration-ws/pom.xml | 3 +-- spring-integration-xml/pom.xml | 3 +-- spring-integration-xmpp/pom.xml | 4 +--- 23 files changed, 39 insertions(+), 57 deletions(-) diff --git a/pom.xml b/pom.xml index dd9cd0c66e..48fe40974d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration spring-integration @@ -31,6 +30,11 @@ spring-integration-sftp spring-integration-twitter + + scm:svn:https://src.springframework.org/svn/spring-integration/trunk + scm:svn:https://src.springframework.org/svn/spring-integration/trunk/ + https://fisheye.springframework.org/browse/spring-integration/trunk + UTF-8 @@ -149,9 +153,7 @@ - + @@ -166,7 +168,7 @@ package - true + true true
Spring Integration
1.5 @@ -300,7 +302,7 @@ - + @@ -322,6 +324,13 @@ + + + org.apache.maven.plugins + maven-release-plugin + 2.0 + diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml index 31a30cfcde..abf62e0d09 100644 --- a/spring-integration-core/pom.xml +++ b/spring-integration-core/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml index 6fc7395358..c9a6b45458 100644 --- a/spring-integration-event/pom.xml +++ b/spring-integration-event/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml index 09d31d0509..04e1816828 100644 --- a/spring-integration-file/pom.xml +++ b/spring-integration-file/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index 5611ebd74a..f402efa788 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml index 76c4e0fd7d..03f33d398c 100644 --- a/spring-integration-groovy/pom.xml +++ b/spring-integration-groovy/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml index 7f791e826c..dae30d4ea9 100644 --- a/spring-integration-http/pom.xml +++ b/spring-integration-http/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-httpinvoker/pom.xml b/spring-integration-httpinvoker/pom.xml index 81aff18f4a..1d68c05a25 100644 --- a/spring-integration-httpinvoker/pom.xml +++ b/spring-integration-httpinvoker/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index fe62f3d924..d27670166f 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index 7bb93554d1..8591cf4ff8 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml index e676edd2dd..6c2a67c80a 100644 --- a/spring-integration-jms/pom.xml +++ b/spring-integration-jms/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml index f38d06844a..20b3d6cecb 100644 --- a/spring-integration-jmx/pom.xml +++ b/spring-integration-jmx/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml index 7ac9b67101..6a6af54f6e 100644 --- a/spring-integration-mail/pom.xml +++ b/spring-integration-mail/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml index 6db1a6fd40..cb46a8ce21 100644 --- a/spring-integration-parent/pom.xml +++ b/spring-integration-parent/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration spring-integration-parent @@ -252,7 +251,7 @@ dependency definitions to be inherited by child poms. any declarations here will automatically show up on child project classpaths. only items that are truly common across all - projects should go here. otherwise, consider + projects should go here. otherwise, consider --> log4j diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml index ba41d85a3e..ecdcef54c6 100644 --- a/spring-integration-rmi/pom.xml +++ b/spring-integration-rmi/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml index 68e46e61dc..485eaa7f66 100644 --- a/spring-integration-security/pom.xml +++ b/spring-integration-security/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml index 083d7d31cc..e51907f177 100644 --- a/spring-integration-sftp/pom.xml +++ b/spring-integration-sftp/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml index 03601b79fe..ef26380908 100644 --- a/spring-integration-stream/pom.xml +++ b/spring-integration-stream/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml index 3804b657e0..4ff26f9037 100644 --- a/spring-integration-test/pom.xml +++ b/spring-integration-test/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index 9186900e9b..5d2d8a39fa 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index 7a2a3ec77c..dd3bcd5ba8 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml index 78884ffa0b..c0ce14ed25 100644 --- a/spring-integration-xml/pom.xml +++ b/spring-integration-xml/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 org.springframework.integration diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml index b609d586b1..bfc09700fe 100644 --- a/spring-integration-xmpp/pom.xml +++ b/spring-integration-xmpp/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 org.springframework.integration