You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/12/23 12:07:30 UTC
[67/71] [abbrv] incubator-brooklyn git commit: [ALL] keep version
properties in one place
[ALL] keep version properties in one place
in server/pom.xml (inherited by parent) for most things, but library/pom.xml for software
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0781581e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0781581e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0781581e
Branch: refs/heads/master
Commit: 0781581e7617cf50eebc28aa80a762370bcd3596
Parents: 0509bba
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Dec 22 16:08:20 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Dec 22 16:49:42 2015 +0000
----------------------------------------------------------------------
brooklyn-dist/dist/pom.xml | 1 +
brooklyn-library/pom.xml | 113 +------------------------
brooklyn-server/karaf/pom.xml | 1 +
brooklyn-server/parent/pom.xml | 1 +
brooklyn-server/pom.xml | 65 ++++++--------
brooklyn-server/storage/hazelcast/pom.xml | 4 +
6 files changed, 37 insertions(+), 148 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0781581e/brooklyn-dist/dist/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-dist/dist/pom.xml b/brooklyn-dist/dist/pom.xml
index a595094..0d01390 100644
--- a/brooklyn-dist/dist/pom.xml
+++ b/brooklyn-dist/dist/pom.xml
@@ -98,6 +98,7 @@
<excludes combine.children="append">
<!-- Exclude sample config files because they are illustrative, intended for changing -->
<exclude>src/main/dist/conf/**</exclude>
+ <exclude>src/main/dist/README.md</exclude>
<exclude>licensing/licenses/**</exclude>
<exclude>licensing/README.md</exclude>
<exclude>licensing/*LICENSE*</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0781581e/brooklyn-library/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-library/pom.xml b/brooklyn-library/pom.xml
index c89d7a1..71b87f4 100644
--- a/brooklyn-library/pom.xml
+++ b/brooklyn-library/pom.xml
@@ -73,127 +73,22 @@
</mailingLists>
<properties>
- <brooklyn.version>0.9.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
-
- <!-- Compilation -->
- <java.version>1.7</java.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- <!-- Testing -->
- <assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used as v 3.20 introduces Java8 dependencies-->
- <cobertura.plugin.version>2.7</cobertura.plugin.version>
- <surefire.version>2.18.1</surefire.version>
- <plantuml.version>6121</plantuml.version>
- <ant.version>1.8.4</ant.version>
- <includedTestGroups />
- <excludedTestGroups>Integration,Acceptance,Live,WIP,Broken</excludedTestGroups>
- <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
-
- <!-- Dependencies -->
- <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION -->
-
- <!-- These dependencies also appear in usage/downstream-parent/pom.xml -
- - please synchronise versions between these two pom files -->
- <jclouds.version>1.9.1</jclouds.version> <!-- JCLOUDS_VERSION -->
- <logback.version>1.0.7</logback.version>
- <slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
- <guava.version>17.0</guava.version>
- <xstream.version>1.4.7</xstream.version>
- <jackson.version>1.9.13</jackson.version> <!-- codehaus jackson, used by brooklyn rest server -->
- <fasterxml.jackson.version>2.4.5</fasterxml.jackson.version> <!-- more recent jackson, but not compatible with old annotations! -->
- <jersey.version>1.19</jersey.version>
- <httpclient.version>4.4.1</httpclient.version>
- <commons-lang3.version>3.1</commons-lang3.version>
- <groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
- <jsr305.version>2.0.1</jsr305.version>
- <snakeyaml.version>1.11</snakeyaml.version>
-
- <!-- Ordinary dependencies -->
- <testng.version>6.8.8</testng.version>
- <mockito.version>1.10.8</mockito.version>
- <swagger.version>1.5.3</swagger.version>
- <jansi.version>1.2.1</jansi.version>
- <gson.version>2.3</gson.version>
- <ivy.version>2.2.0</ivy.version>
- <mx4j.version>3.0.1</mx4j.version>
- <bouncycastle.version>1.49</bouncycastle.version>
- <sshj.version>0.8.1</sshj.version>
- <felix.framework.version>4.4.0</felix.framework.version>
- <reflections.version>0.9.9-RC1</reflections.version>
- <jetty.version>9.2.13.v20150730</jetty.version>
- <jetty-schemas.version>3.1.M0</jetty-schemas.version>
- <airline.version>0.6</airline.version>
- <mockwebserver.version>20121111</mockwebserver.version>
- <freemarker.version>2.3.22</freemarker.version>
- <commons-io.version>2.4</commons-io.version>
- <hazelcast.version>3.5.4</hazelcast.version>
- <jsonPath.version>2.0.0</jsonPath.version>
- <commons-compress.version>1.4</commons-compress.version>
+
+ <!-- Versions of Software we Blueprint -->
<qpid.version>0.20</qpid.version>
<mongodb.version>3.0.3</mongodb.version>
<riak.version>1.4.0</riak.version>
- <maven-war-plugin.version>2.4</maven-war-plugin.version>
- <validation-api.version>1.1.0.Final</validation-api.version>
- <geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
- <geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
- <sleepycat-je.version>5.0.34</sleepycat-je.version>
+ <hazelcast.version>3.5.4</hazelcast.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.10.0</activemq.version>
<rabbitmq-version>2.8.7</rabbitmq-version>
<kafka.version>0.8.2.1</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.8.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>
- <nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
- <jasmine-maven-plugin.version>1.3.1.5</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>
- <javax-servlet.version>3.1.0</javax-servlet.version>
- <jcommander.version>1.27</jcommander.version>
- <xml-apis.version>1.0.b2</xml-apis.version>
- <jsr250-api.version>1.0</jsr250-api.version>
- <guice.version>3.0</guice.version>
- <javax-inject.version>1</javax-inject.version>
- <aopalliance.version>1.0</aopalliance.version>
- <commons-configuration.version>1.7</commons-configuration.version>
- <commons-lang.version>2.4</commons-lang.version>
- <hamcrest.version>1.1</hamcrest.version>
- <jsr311-api.version>1.1.1</jsr311-api.version>
- <maxmind.version>0.8.1</maxmind.version>
- <jna.version>4.0.0</jna.version>
- <winrm4j.version>0.1.0</winrm4j.version>
- <coverage.target>${working.dir}</coverage.target>
-
- <!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
- <clojure.version>1.4.0</clojure.version>
- <zookeeper.version>3.3.4</zookeeper.version>
- <ring-core.version>1.1.5</ring-core.version>
- <clj-time.version>0.4.1</clj-time.version>
- <commons-codec.version>1.9</commons-codec.version>
- <log4j.version>1.2.17</log4j.version>
- <commons-logging.version>1.2</commons-logging.version>
- <jline.version>2.12</jline.version>
- <jsonSmart.version>2.1.1</jsonSmart.version>
- <minidev.asm.version>1.0.2</minidev.asm.version>
- <commons-beanutils.version>1.9.1</commons-beanutils.version>
- <commons-collections.version>3.2.1</commons-collections.version>
-
- <!-- Compilation -->
+
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0781581e/brooklyn-server/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/karaf/pom.xml b/brooklyn-server/karaf/pom.xml
index 9d4d07a..c09222c 100644
--- a/brooklyn-server/karaf/pom.xml
+++ b/brooklyn-server/karaf/pom.xml
@@ -26,6 +26,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
+ <!-- if this depends on brooklyn-server/parent, the usual parent point, then karaf-itest has failures -->
<artifactId>brooklyn-server</artifactId>
<version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0781581e/brooklyn-server/parent/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/parent/pom.xml b/brooklyn-server/parent/pom.xml
index b98d412..6c1817e 100644
--- a/brooklyn-server/parent/pom.xml
+++ b/brooklyn-server/parent/pom.xml
@@ -23,6 +23,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
<version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>brooklyn-parent</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0781581e/brooklyn-server/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/pom.xml b/brooklyn-server/pom.xml
index 57dd3d5..d5ae3a8 100644
--- a/brooklyn-server/pom.xml
+++ b/brooklyn-server/pom.xml
@@ -80,21 +80,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <!-- Testing -->
- <assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used as v 3.20 introduces Java8 dependencies-->
- <cobertura.plugin.version>2.7</cobertura.plugin.version>
- <surefire.version>2.18.1</surefire.version>
- <plantuml.version>6121</plantuml.version>
- <ant.version>1.8.4</ant.version>
+ <!-- Dependency Configuration -->
+ <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION -->
+
+ <!-- Testing Configuration -->
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP,Broken</excludedTestGroups>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
+ <coverage.target>${working.dir}</coverage.target>
- <!-- Dependencies -->
- <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION -->
-
- <!-- These dependencies also appear in usage/downstream-parent/pom.xml -
- - please synchronise versions between these two pom files -->
+ <!-- Dependency Versions -->
<jclouds.version>1.9.1</jclouds.version> <!-- JCLOUDS_VERSION -->
<logback.version>1.0.7</logback.version>
<slf4j.version>1.6.6</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception -->
@@ -108,10 +103,6 @@
<groovy.version>2.3.7</groovy.version> <!-- Version supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes -->
<jsr305.version>2.0.1</jsr305.version>
<snakeyaml.version>1.11</snakeyaml.version>
-
- <!-- Ordinary dependencies -->
- <testng.version>6.8.8</testng.version>
- <mockito.version>1.10.8</mockito.version>
<swagger.version>1.5.3</swagger.version>
<jansi.version>1.2.1</jansi.version>
<gson.version>2.3</gson.version>
@@ -127,42 +118,21 @@
<mockwebserver.version>20121111</mockwebserver.version>
<freemarker.version>2.3.22</freemarker.version>
<commons-io.version>2.4</commons-io.version>
- <hazelcast.version>3.5.4</hazelcast.version>
<jsonPath.version>2.0.0</jsonPath.version>
<commons-compress.version>1.4</commons-compress.version>
- <qpid.version>0.20</qpid.version>
- <mongodb.version>3.0.3</mongodb.version>
- <riak.version>1.4.0</riak.version>
- <maven-war-plugin.version>2.4</maven-war-plugin.version>
<validation-api.version>1.1.0.Final</validation-api.version>
<geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_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.10.0</activemq.version>
- <rabbitmq-version>2.8.7</rabbitmq-version>
- <kafka.version>0.8.2.1</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.8.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>
- <nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
- <jasmine-maven-plugin.version>1.3.1.5</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>
<javax-servlet.version>3.1.0</javax-servlet.version>
<jcommander.version>1.27</jcommander.version>
<xml-apis.version>1.0.b2</xml-apis.version>
@@ -177,8 +147,7 @@
<maxmind.version>0.8.1</maxmind.version>
<jna.version>4.0.0</jna.version>
<winrm4j.version>0.1.0</winrm4j.version>
- <coverage.target>${working.dir}</coverage.target>
-
+
<!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
<clojure.version>1.4.0</clojure.version>
<zookeeper.version>3.3.4</zookeeper.version>
@@ -193,7 +162,25 @@
<commons-beanutils.version>1.9.1</commons-beanutils.version>
<commons-collections.version>3.2.1</commons-collections.version>
- <!-- Compilation -->
+ <!-- Testing Dependency Versions -->
+ <testng.version>6.8.8</testng.version>
+ <mockito.version>1.10.8</mockito.version>
+ <assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used as v 3.20 introduces Java8 dependencies-->
+ <cobertura.plugin.version>2.7</cobertura.plugin.version>
+ <surefire.version>2.18.1</surefire.version>
+ <plantuml.version>6121</plantuml.version>
+ <ant.version>1.8.4</ant.version>
+
+ <!-- Build Tool Versions -->
+ <maven-war-plugin.version>2.4</maven-war-plugin.version>
+ <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+ <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
+ <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
+ <nodejs-maven-binaries.version>0.10.25</nodejs-maven-binaries.version>
+ <jasmine-maven-plugin.version>1.3.1.5</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>
+
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0781581e/brooklyn-server/storage/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/storage/hazelcast/pom.xml b/brooklyn-server/storage/hazelcast/pom.xml
index a15b173..d9dee5c 100644
--- a/brooklyn-server/storage/hazelcast/pom.xml
+++ b/brooklyn-server/storage/hazelcast/pom.xml
@@ -33,6 +33,10 @@
<relativePath>../../parent/pom.xml</relativePath>
</parent>
+ <properties>
+ <hazelcast.version>3.5.4</hazelcast.version>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>