You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2014/07/09 11:53:54 UTC
[09/10] git commit: Specify version numbers in root pom.xml only
Specify version numbers in root pom.xml only
This removes any hard-coded version numbers from pom.xml except for the
root; the root contains a set of properties that define version numbers.
In some cases this will change the minor version used; where this
happens, the version used will always move forward, not backward; and
the major version does not change.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3c49dbf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3c49dbf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3c49dbf5
Branch: refs/heads/master
Commit: 3c49dbf5f7e6a65edea43f794b8ca9ff6ff854a4
Parents: 2cf8065
Author: Richard Downer <ri...@apache.org>
Authored: Fri Jul 4 17:54:45 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 16:15:56 2014 +0100
----------------------------------------------------------------------
camp/camp-base/pom.xml | 2 +-
camp/camp-server/pom.xml | 7 +----
core/pom.xml | 2 +-
examples/simple-messaging-pubsub/pom.xml | 4 +--
examples/simple-open-loop-policy/pom.xml | 2 +-
examples/webapps/hello-world-hadoop-jar/pom.xml | 3 +-
examples/webapps/hello-world-hadoop/pom.xml | 4 +--
examples/webapps/hello-world-sql/pom.xml | 2 +-
pom.xml | 32 ++++++++++++++++++++
software/database/pom.xml | 4 +--
software/messaging/pom.xml | 10 +++---
software/nosql/pom.xml | 8 ++---
software/webapp/pom.xml | 4 +--
usage/dist/pom.xml | 2 +-
usage/jsgui/pom.xml | 12 +-------
usage/launcher/pom.xml | 11 ++-----
usage/qa/pom.xml | 4 +--
usage/rest-api/pom.xml | 2 +-
usage/rest-client/pom.xml | 6 +---
utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +-
utils/rest-swagger/pom.xml | 4 ---
21 files changed, 64 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 8a293de..92b564f 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.11</version>
+ <version>${snakeyaml.version}</version>
</dependency>
<!-- just for logging, not exported -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 8982e55..a77dd80 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -16,11 +16,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <properties>
- <jersey.version>1.12</jersey.version>
- <jetty.version>8.1.4.v20120524</jetty.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.brooklyn.camp</groupId>
@@ -90,7 +85,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
+ <version>${validation-api.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 01a87e1..7d71907 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index fe3b158..b6a3869 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jms_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -63,7 +63,7 @@
<artifactItem>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>5.0.34</version>
+ <version>${sleepycat-je.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/simple-open-loop-policy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-open-loop-policy/pom.xml b/examples/simple-open-loop-policy/pom.xml
index 6157996..8c14dd1 100644
--- a/examples/simple-open-loop-policy/pom.xml
+++ b/examples/simple-open-loop-policy/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>org.marre.smsj</artifactId>
- <version>1.0.0-20051126</version>
+ <version>${org.marre.smsj.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/webapps/hello-world-hadoop-jar/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-hadoop-jar/pom.xml b/examples/webapps/hello-world-hadoop-jar/pom.xml
index 37dc3b7..7e8ac4e 100644
--- a/examples/webapps/hello-world-hadoop-jar/pom.xml
+++ b/examples/webapps/hello-world-hadoop-jar/pom.xml
@@ -10,7 +10,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hadoop.version>1.0.2</hadoop.version>
</properties>
<build>
@@ -33,7 +32,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<!-- fix for https://issues.apache.org/jira/browse/HADOOP-7461 needed if hadoop is pre 1.0.0 <dependency> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId> <version>1.0.1</version> </dependency> -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/webapps/hello-world-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-hadoop/pom.xml b/examples/webapps/hello-world-hadoop/pom.xml
index 0a3d389..06c129e 100644
--- a/examples/webapps/hello-world-hadoop/pom.xml
+++ b/examples/webapps/hello-world-hadoop/pom.xml
@@ -15,12 +15,12 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.18</version>
+ <version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>1.0.2</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn.example</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/webapps/hello-world-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml
index 2befd46..832bd10 100644
--- a/examples/webapps/hello-world-sql/pom.xml
+++ b/examples/webapps/hello-world-sql/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.18</version>
+ <version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c63f54..88c735a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,38 @@
<qpid.version>0.20</qpid.version>
<mongodb.version>2.11.4</mongodb.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
+ <snakeyaml.version>1.11</snakeyaml.version>
+ <validation-api.version>1.0.0.GA</validation-api.version>
+ <geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
+ <sleepycat-je.version>5.0.34</sleepycat-je.version>
+ <org.marre.smsj.version>1.0.0-20051126</org.marre.smsj.version>
+ <mysql-connector-java.version>5.1.18</mysql-connector-java.version>
+ <hadoop.version>1.0.2</hadoop.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <postgresql.version>9.1-901.jdbc4</postgresql.version>
+ <activemq.version>5.7.0</activemq.version>
+ <rabbitmq-version>2.8.7</rabbitmq-version>
+ <kafka.version>0.7.0-incubating</kafka.version>
+ <storm.version>0.8.2</storm.version>
+ <redis.version>1.5.2</redis.version>
+ <astyanax.version>1.56.24</astyanax.version>
+ <jcouchdb.version>0.11.0-1</jcouchdb.version>
+ <solr.version>4.7.0</solr.version>
+ <jtidy.version>r8-20060801</jtidy.version>
+ <opendmk_jmxremote_optional_jar.version>1.0-b01-ea</opendmk_jmxremote_optional_jar.version>
+ <resteasy.version>3.0.1.Final</resteasy.version>
+ <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+ <jopt.version>4.3</jopt.version>
+ <concurrentlinkedhashmap.version>1.0_jdk5</concurrentlinkedhashmap.version>
+ <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
+ <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
+ <jasmine-maven-plugin.version>1.2.0.0</jasmine-maven-plugin.version>
+<!-- see comment about fixtures in brooklyn-jsgui
+ <jasmine-maven-plugin.version>1.3.1.2</jasmine-maven-plugin.version>
+-->
+ <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
+ <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+ <eclipse-m2e.version>1.0.0</eclipse-m2e.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 8ada1dc..4c38d4e 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.18</version>
+ <version>${mysql-connector-java.version}</version>
<scope>test</scope>
</dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.1-901.jdbc4</version>
+ <version>${postgresql.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 72b2774..6996b4f 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jms_1.1_spec.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>5.7.0</version>
+ <version>${activemq.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>2.8.7</version>
+ <version>${rabbitmq-version}</version>
<scope>test</scope>
</dependency>
@@ -95,7 +95,7 @@
<dependency>
<groupId>storm</groupId>
<artifactId>kafka</artifactId>
- <version>0.7.0-incubating</version>
+ <version>${kafka.version}</version>
<scope>test</scope>
</dependency>
@@ -103,7 +103,7 @@
<dependency>
<groupId>storm</groupId>
<artifactId>storm</artifactId>
- <version>0.8.2</version>
+ <version>${storm.version}</version>
<!-- keep storm out of the jar-with-dependencies -->
<scope>test</scope>
<exclusions>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 8e8ed97..a53c97f 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>1.5.2</version>
+ <version>${redis.version}</version>
<scope>test</scope>
</dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>com.netflix.astyanax</groupId>
<artifactId>astyanax</artifactId>
- <version>1.56.24</version>
+ <version>${astyanax.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -75,7 +75,7 @@
<dependency>
<groupId>com.google.code.jcouchdb</groupId>
<artifactId>jcouchdb</artifactId>
- <version>0.11.0-1</version>
+ <version>${jcouchdb.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>4.7.0</version>
+ <version>${solr.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index ab1559f..53ea262 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>jtidy</artifactId>
- <version>r8-20060801</version>
+ <version>${jtidy.version}</version>
</dependency>
<dependency>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jms_1.1_spec.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 7681a1c..00f5c4f 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -108,7 +108,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
+ <version>${eclipse-m2e.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index b750a50..3284408 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -20,16 +20,6 @@
</parent>
<properties>
- <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
- <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
- <jasmine-maven-plugin.version>1.2.0.0</jasmine-maven-plugin.version>
-<!-- see comment about fixtures below
- <jasmine-maven-plugin.version>1.3.1.2</jasmine-maven-plugin.version>
--->
- <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
-
- <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-
<project.build.webapp>
${project.build.directory}/${project.build.finalName}
</project.build.webapp>
@@ -136,7 +126,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>prep-server</id>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 229544e..4d90969 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -71,13 +71,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.brooklyn</groupId>
- <artifactId>brooklyn-core</artifactId>
- <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -90,13 +83,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
+ <version>${osgi-core.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
<artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>1.0_jdk5</version>
+ <version>${concurrentlinkedhashmap.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index d7cb6ff..2a82114 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -24,12 +24,12 @@
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
- <version>4.3</version>
+ <version>${jopt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index 2ceb98a..770abfd 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -29,7 +29,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
+ <version>${validation-api.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml
index 68873b3..fa8dee6 100644
--- a/usage/rest-client/pom.xml
+++ b/usage/rest-client/pom.xml
@@ -15,10 +15,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <resteasy.version>3.0.1.Final</resteasy.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -98,7 +94,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>prep-server</id>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index 35ddc32..1ff503e 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.glassfish.external</groupId>
<artifactId>opendmk_jmxremote_optional_jar</artifactId>
- <version>1.0-b01-ea</version>
+ <version>${opendmk_jmxremote_optional_jar.version}</version>
<!-- this is no longer avail on maven central!?
<groupId>javax.management</groupId>
<artifactId>jmxremote_optional</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index e766036..88c3335 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -17,10 +17,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <swagger.version>1.0.1</swagger.version>
- </properties>
-
<dependencies>
<!-- need this to get the right ServletConfig as used elsewhere :( -->