You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/07/31 15:48:19 UTC
[1/6] git commit: Fix "Used undeclared" from mvn dependency:analyze
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 07bfb0550 -> 8a4d1324b
Fix "Used undeclared" from mvn dependency:analyze
Means that the dependencies actually *used* in a module's code are
reflected in pom.xml (and not merely implicitly on the classpath due to
a transitive dependency)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/49cbd936
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/49cbd936
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/49cbd936
Branch: refs/heads/master
Commit: 49cbd93600ea79c131b322702e4fc759c9f36c74
Parents: 07bfb05
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 17:01:25 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 31 13:23:05 2014 +0100
----------------------------------------------------------------------
api/pom.xml | 12 ++
camp/camp-base/pom.xml | 17 +++
camp/camp-server/pom.xml | 60 +++++++++-
core/pom.xml | 53 +++++++++
examples/global-web-fabric/pom.xml | 8 ++
examples/simple-nosql-cluster/pom.xml | 8 ++
examples/simple-web-cluster/pom.xml | 12 ++
locations/jclouds/pom.xml | 59 ++++++++++
policy/pom.xml | 35 ++++++
pom.xml | 171 +++++++++++++++++++++++++++++
software/base/pom.xml | 53 ++++++++-
software/database/pom.xml | 42 +++++++
software/messaging/pom.xml | 29 +++++
software/monitoring/pom.xml | 28 ++++-
software/network/pom.xml | 25 +++++
software/nosql/pom.xml | 46 ++++++++
software/osgi/pom.xml | 32 +++++-
software/webapp/pom.xml | 52 +++++++++
storage/hazelcast/pom.xml | 17 +++
usage/camp/pom.xml | 25 ++++-
usage/cli/pom.xml | 53 +++++++--
usage/dist/pom.xml | 5 +
usage/jsgui/pom.xml | 35 ++++++
usage/launcher/pom.xml | 106 +++++++++++++++---
usage/qa/pom.xml | 19 +++-
usage/rest-api/pom.xml | 39 ++++++-
usage/rest-client/pom.xml | 39 +++++++
usage/rest-server/pom.xml | 86 ++++++++++++++-
usage/test-support/pom.xml | 16 +++
utils/common/pom.xml | 4 +
utils/groovy/pom.xml | 13 +++
utils/jmx/jmxmp-ssl-agent/pom.xml | 13 +++
utils/rest-swagger/pom.xml | 17 +++
utils/test-support/pom.xml | 4 +
34 files changed, 1193 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index bcacae6..50e0ac9 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -41,6 +41,18 @@
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index e8638b1..5daddf7 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -48,6 +48,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
@@ -57,6 +62,18 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
<!-- just for logging, not exported -->
<!--
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 7415155..a54ccac 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -57,6 +57,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-test-support</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
@@ -67,18 +73,20 @@
<artifactId>jackson-annotations</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
-
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -101,12 +109,15 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
<dependency>
<groupId>javax.validation</groupId>
@@ -119,12 +130,55 @@
<artifactId>jetty-webapp</artifactId>
<version>${jetty.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
<version>${brooklyn.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <!-- ATTN: this moves the dependency version from 1.9.2 to 1.9.13 -->
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-core_2.9.1</artifactId>
+ </dependency>
<!-- TODO have a camp.log / logging module -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 53b32a8..6249cae 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -140,6 +140,44 @@
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>${mx4j.version}</version>
@@ -168,6 +206,21 @@
<artifactId>json-path</artifactId>
<version>${jsonPath.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- add maxmind geo-ip library; exact copy of source included as required by LGPL2 -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/examples/global-web-fabric/pom.xml
----------------------------------------------------------------------
diff --git a/examples/global-web-fabric/pom.xml b/examples/global-web-fabric/pom.xml
index 7672878..b834606 100644
--- a/examples/global-web-fabric/pom.xml
+++ b/examples/global-web-fabric/pom.xml
@@ -37,6 +37,14 @@
<version>${project.version}</version>
<classifier>with-dependencies</classifier>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/examples/simple-nosql-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-nosql-cluster/pom.xml b/examples/simple-nosql-cluster/pom.xml
index a8ba6af..f49e4cc 100644
--- a/examples/simple-nosql-cluster/pom.xml
+++ b/examples/simple-nosql-cluster/pom.xml
@@ -41,6 +41,14 @@
<artifactId>brooklyn-all</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/examples/simple-web-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml
index d94208b..daddf7a 100644
--- a/examples/simple-web-cluster/pom.xml
+++ b/examples/simple-web-cluster/pom.xml
@@ -44,6 +44,18 @@
<version>${project.version}</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 4ff853e..1ea244c 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -39,6 +39,60 @@
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>${jclouds.groupId}.driver</groupId>
@@ -99,6 +153,11 @@
<!-- test dependencies -->
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/policy/pom.xml
----------------------------------------------------------------------
diff --git a/policy/pom.xml b/policy/pom.xml
index 3ede010..583f423 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -39,6 +39,31 @@
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -58,6 +83,16 @@
<version>${mockwebserver.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a53ae40..86b1746 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,17 @@
<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>
+ <jetty-orbit-javax-servlet.version>3.0.0.v201112011016</jetty-orbit-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>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
@@ -291,6 +302,166 @@
<artifactId>plantuml</artifactId>
<version>${plantuml.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons-lang3.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-core_2.9.1</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>${jetty-orbit-javax-servlet.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>${jcommander.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jsr250-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>${guice.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${javax-inject.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons-io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>${aopalliance.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>${gson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons-configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons-lang.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>${reflections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>${felix.framework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311-api.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 264eee0..2326745 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -50,7 +50,19 @@
<artifactId>brooklyn-jmxrmi-agent</artifactId>
<version>${brooklyn.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
@@ -61,8 +73,41 @@
<artifactId>freemarker</artifactId>
<version>${freemarker.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
@@ -75,6 +120,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>${jclouds.groupId}</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index ce33d65..fd62590 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -40,8 +40,50 @@
<artifactId>brooklyn-software-base</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index e4c309f..6c0851a 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -46,6 +46,30 @@
<artifactId>brooklyn-software-base</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -73,6 +97,11 @@
<version>${brooklyn.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- for qpid -->
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/software/monitoring/pom.xml b/software/monitoring/pom.xml
index ac1e3e2..cc2aee9 100644
--- a/software/monitoring/pom.xml
+++ b/software/monitoring/pom.xml
@@ -45,7 +45,33 @@
<artifactId>brooklyn-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/network/pom.xml
----------------------------------------------------------------------
diff --git a/software/network/pom.xml b/software/network/pom.xml
index 9f37967..27f574e 100644
--- a/software/network/pom.xml
+++ b/software/network/pom.xml
@@ -39,6 +39,31 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 20ae22e..a16deac 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -50,6 +50,47 @@
<artifactId>brooklyn-software-database</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-policy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- for mongodb sensors -->
<dependency>
@@ -128,6 +169,11 @@
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index c81129b..a8ac422 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -40,13 +40,41 @@
<artifactId>brooklyn-software-base</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi-core.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index cf250a4..5b78500 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -56,9 +56,55 @@
<artifactId>brooklyn-software-base</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-groovy</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
<version>${mx4j.version}</version>
@@ -97,6 +143,12 @@
<version>${brooklyn.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>${jclouds.groupId}</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/storage/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml
index 755dcf7..79c66b7 100644
--- a/storage/hazelcast/pom.xml
+++ b/storage/hazelcast/pom.xml
@@ -39,6 +39,18 @@
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>com.hazelcast</groupId>
@@ -48,6 +60,11 @@
<!-- test dependencies -->
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index c5edcfb..630749c 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -41,12 +41,35 @@
<artifactId>brooklyn-core</artifactId>
<version>${brooklyn.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-policy</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
<dependency>
<groupId>io.brooklyn.camp</groupId>
<artifactId>camp-base</artifactId>
<version>${brooklyn.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- TODO not enamoured of including software-base here, but it allows us to reference chef and vanilla for short names;
ideally there is a mixin strategy by which they can be discovered (eg using java service discovery) -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index 84f35ef..3c90675 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -39,6 +39,10 @@
<dependencies>
<dependency>
<groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
</dependency>
<dependency>
@@ -48,10 +52,48 @@
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.airlift</groupId>
+ <artifactId>airline</artifactId>
+ <version>${airline.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-xml</artifactId>
<!-- optional so that this project has logging; dependencies may redeclare or supply their own -->
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
@@ -64,17 +106,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.airlift</groupId>
- <artifactId>airline</artifactId>
- <version>${airline.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index c63b5b1..9fe3cac 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -53,6 +53,11 @@
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 6bac888..9d0db96 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -48,6 +48,21 @@
<dependencies>
<dependency>
<groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-rest-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
@@ -99,6 +114,26 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 1fb4fcd..91d178c 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -40,6 +40,10 @@
<dependencies>
<dependency>
<groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
</dependency>
<dependency>
@@ -54,15 +58,84 @@
</dependency>
<dependency>
<groupId>io.brooklyn.camp</groupId>
- <artifactId>camp-server</artifactId>
+ <artifactId>camp-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn.camp</groupId>
<artifactId>camp-server</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
- <classifier>tests</classifier>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-software-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ <version>${concurrentlinkedhashmap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
@@ -73,6 +146,18 @@
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn.camp</groupId>
+ <artifactId>camp-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <classifier>tests</classifier>
+ </dependency>
+ <dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
@@ -97,27 +182,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-software-nosql</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${osgi-core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
- <artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>${concurrentlinkedhashmap.version}</version>
- </dependency>
-
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-camp</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index 6c97f01..8b371cd 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -50,7 +50,24 @@
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index d39a673..78ce013 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -34,7 +34,11 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
@@ -50,6 +54,30 @@
<artifactId>validation-api</artifactId>
<version>${validation-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-core_2.9.1</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -57,10 +85,19 @@
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
<version>${brooklyn.version}</version>
</dependency>
<dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml
index bc32113..e64ac31 100644
--- a/usage/rest-client/pom.xml
+++ b/usage/rest-client/pom.xml
@@ -41,6 +41,10 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>${resteasy.version}</version>
@@ -63,6 +67,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version>
@@ -78,6 +87,36 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>brooklyn-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index 4ba5013..5f36d7e 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -50,12 +50,62 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>io.brooklyn.camp</groupId>
+ <artifactId>camp-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-software-base</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
<version>${brooklyn.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-core_2.9.1</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>${jersey.version}</version>
@@ -68,6 +118,10 @@
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>${jersey.version}</version>
</dependency>
@@ -82,6 +136,22 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson.version}</version>
@@ -158,7 +228,21 @@
<version>${dropwizard.version}</version>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/usage/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml
index 82e7f1f..ff3b1a0 100644
--- a/usage/test-support/pom.xml
+++ b/usage/test-support/pom.xml
@@ -43,6 +43,22 @@
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/utils/common/pom.xml
----------------------------------------------------------------------
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 54de72a..68eba22 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -52,6 +52,10 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/utils/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index 617d550..fcdd338 100644
--- a/utils/groovy/pom.xml
+++ b/utils/groovy/pom.xml
@@ -43,11 +43,24 @@
<version>${brooklyn.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/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 fc5ea0d..7bf1938 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -40,6 +40,10 @@
<dependencies>
<dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-utils-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.external</groupId>
<artifactId>opendmk_jmxremote_optional_jar</artifactId>
<version>${opendmk_jmxremote_optional_jar.version}</version>
@@ -60,6 +64,15 @@
<artifactId>brooklyn-test-support</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index bd3ce29..0adc8e1 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -45,6 +45,23 @@
<version>${jetty.version}</version>
</dependency>
+ <!-- ATTN: this moves jersey-server from 1.7 to 1.12 -->
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/49cbd936/utils/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml
index ad5fe10..220a137 100644
--- a/utils/test-support/pom.xml
+++ b/utils/test-support/pom.xml
@@ -49,6 +49,10 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
</dependencies>
</project>
[4/6] git commit: Specify dependency versions in root pom.xml ONLY
Posted by ri...@apache.org.
Specify dependency versions in root pom.xml ONLY
Goes through all child pom.xml files and removes version from each
dependency; specify all versions in a <dependencyManagement> section of
the root pom.xml instead. Ensures that we will not be introducing
conflicting version numbers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c1bd24ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c1bd24ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c1bd24ba
Branch: refs/heads/master
Commit: c1bd24ba7f2dae6d00f9d42e7228e0fff0b94f38
Parents: d4185a0
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 21 15:01:11 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 31 13:23:07 2014 +0100
----------------------------------------------------------------------
camp/camp-base/pom.xml | 2 -
camp/camp-server/pom.xml | 9 --
core/pom.xml | 15 ---
locations/jclouds/pom.xml | 2 -
policy/pom.xml | 1 -
pom.xml | 175 +++++++++++++++++++++++++++++++++
software/base/pom.xml | 3 -
software/osgi/pom.xml | 1 -
usage/camp/pom.xml | 1 -
usage/cli/pom.xml | 1 -
usage/launcher/pom.xml | 6 +-
usage/qa/pom.xml | 2 -
usage/rest-api/pom.xml | 4 -
usage/rest-client/pom.xml | 6 --
usage/rest-server/pom.xml | 8 --
utils/common/pom.xml | 2 -
utils/jmx/jmxmp-ssl-agent/pom.xml | 1 -
utils/rest-swagger/pom.xml | 3 -
18 files changed, 177 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index dd10afa..4cd0ceb 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -55,12 +55,10 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>${commons-compress.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 2ec937b..9459833 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -71,17 +71,14 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -91,17 +88,14 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
@@ -112,7 +106,6 @@
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -122,13 +115,11 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>${validation-api.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 12ca972..80025da 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -69,7 +69,6 @@
<dependency>
<groupId>net.schmizz</groupId>
<artifactId>sshj</artifactId>
- <version>${sshj.version}</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -78,35 +77,29 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>${gson.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
<scope>compile</scope>
<exclusions>
<!-- provided by bcprov-ext instead -->
@@ -120,13 +113,11 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>${felix.framework.version}</version>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>${reflections.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
@@ -138,7 +129,6 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
</dependency>
<dependency>
@@ -183,31 +173,26 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
- <version>${mx4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.mockwebserver</groupId>
<artifactId>mockwebserver</artifactId>
- <version>${mockwebserver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>${jetty.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path</artifactId>
- <version>${jsonPath.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index c853edf..3b647f8 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -151,7 +151,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>${logback.version}</version>
</dependency>
<!-- test dependencies -->
@@ -176,7 +175,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/policy/pom.xml
----------------------------------------------------------------------
diff --git a/policy/pom.xml b/policy/pom.xml
index 7b55672..43ee79a 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -84,7 +84,6 @@
<dependency>
<groupId>com.google.mockwebserver</groupId>
<artifactId>mockwebserver</artifactId>
- <version>${mockwebserver.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fcc18b0..82505bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,6 +276,11 @@
<version>${jersey.version}</version>
</dependency>
<dependency>
+ <groupId>com.sun.jersey.contribs</groupId>
+ <artifactId>jersey-multipart</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
@@ -301,21 +306,61 @@
<version>${jackson.version}</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-xc</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${fasterxml.jackson.version}</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${fasterxml.jackson.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-core_2.9.1</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
+ <groupId>com.wordnik</groupId>
+ <artifactId>swagger-jaxrs_2.9.1</artifactId>
+ <version>${swagger.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId>
<version>${jetty-orbit-javax-servlet.version}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
@@ -371,6 +416,11 @@
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>${gson.version}</version>
@@ -425,6 +475,131 @@
<artifactId>jsr311-api</artifactId>
<version>${jsr311-api.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.external</groupId>
+ <artifactId>opendmk_jmxremote_optional_jar</artifactId>
+ <version>${opendmk_jmxremote_optional_jar.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-json</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.yammer.dropwizard</groupId>
+ <artifactId>dropwizard-testing</artifactId>
+ <version>${dropwizard.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>jaxrs-api</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${validation-api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jopt-simple</groupId>
+ <artifactId>jopt-simple</artifactId>
+ <version>${jopt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
+ <version>${concurrentlinkedhashmap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.airlift</groupId>
+ <artifactId>airline</artifactId>
+ <version>${airline.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.whirr</groupId>
+ <artifactId>whirr-hadoop</artifactId>
+ <version>${whirr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.whirr</groupId>
+ <artifactId>whirr-core</artifactId>
+ <version>${whirr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.whirr</groupId>
+ <artifactId>whirr-cli</artifactId>
+ <version>${whirr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.whirr</groupId>
+ <artifactId>whirr-elasticsearch</artifactId>
+ <version>${whirr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>${commons-compress.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.schmizz</groupId>
+ <artifactId>sshj</artifactId>
+ <version>${sshj.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>${freemarker.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-tools</artifactId>
+ <version>${mx4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.mockwebserver</groupId>
+ <artifactId>mockwebserver</artifactId>
+ <version>${mockwebserver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${mockito.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ <version>${jsonPath.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/software/base/pom.xml b/software/base/pom.xml
index fcdbe0c..8386d71 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -75,7 +75,6 @@
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
- <version>${freemarker.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -133,7 +132,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -146,7 +144,6 @@
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j-tools</artifactId>
- <version>${mx4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index 6d865b1..43a6563 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -70,7 +70,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi-core.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 2b5e4d8..89ebcd4 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -93,7 +93,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${fasterxml.jackson.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index c5c2d57..6775121 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -60,7 +60,6 @@
<dependency>
<groupId>io.airlift</groupId>
<artifactId>airline</artifactId>
- <version>${airline.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index b8bdcb0..3a326c4 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -81,12 +81,10 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${osgi-core.version}</version>
</dependency>
<dependency>
- <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
- <artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>${concurrentlinkedhashmap.version}</version>
+ <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+ <artifactId>concurrentlinkedhashmap-lru</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index 8fb1f12..fae1c5d 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -43,12 +43,10 @@
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
- <version>${jopt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index ee9ee5a..456f7a3 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -42,17 +42,14 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>${validation-api.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -108,7 +105,6 @@
<dependency>
<groupId>com.yammer.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
- <version>${dropwizard.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml
index e1188a8..2487b6c 100644
--- a/usage/rest-client/pom.xml
+++ b/usage/rest-client/pom.xml
@@ -48,7 +48,6 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -59,7 +58,6 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson-provider</artifactId>
- <version>${resteasy.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -70,22 +68,18 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index bc9775a..39c6ecb 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -111,7 +111,6 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.xml.bind</groupId>
@@ -126,17 +125,14 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
- <version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -157,17 +153,14 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
@@ -230,7 +223,6 @@
<dependency>
<groupId>com.yammer.dropwizard</groupId>
<artifactId>dropwizard-testing</artifactId>
- <version>${dropwizard.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/utils/common/pom.xml
----------------------------------------------------------------------
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 15d505a..0b2900a 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -49,7 +49,6 @@
<!-- redirect java.util.logging messages to slf4j/logback -->
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
- <version>${slf4j.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -58,7 +57,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c1bd24ba/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 152e6d1..1e336b4 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.glassfish.external</groupId>
<artifactId>opendmk_jmxremote_optional_jar</artifactId>
- <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/c1bd24ba/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index 8488c8e..e9330fa 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>${jetty.version}</version>
</dependency>
<!-- ATTN: this moves jersey-server from 1.7 to 1.12 -->
@@ -79,7 +78,6 @@
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-core_2.9.1</artifactId>
- <version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -90,7 +88,6 @@
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-jaxrs_2.9.1</artifactId>
- <version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
[6/6] git commit: Merge and close #85
Posted by ri...@apache.org.
Merge and close #85
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/8a4d1324
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/8a4d1324
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/8a4d1324
Branch: refs/heads/master
Commit: 8a4d1324b160f8e0bb7f0c9250bb7202f91d37e4
Parents: 07bfb05 d3407e3
Author: Richard Downer <ri...@apache.org>
Authored: Thu Jul 31 14:47:42 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 31 14:47:42 2014 +0100
----------------------------------------------------------------------
api/pom.xml | 13 +
camp/camp-base/pom.xml | 27 +-
camp/camp-server/pom.xml | 75 ++++-
core/pom.xml | 74 +++--
examples/global-web-fabric/pom.xml | 10 +-
examples/pom.xml | 1 -
examples/simple-messaging-pubsub/pom.xml | 1 -
examples/simple-nosql-cluster/pom.xml | 8 +
examples/simple-open-loop-policy/pom.xml | 4 +-
examples/simple-web-cluster/pom.xml | 16 +-
locations/jclouds/pom.xml | 67 ++++-
policy/pom.xml | 42 ++-
pom.xml | 389 +++++++++++++++++++++++---
sandbox/dropwizard/pom.xml | 3 +-
software/base/pom.xml | 69 ++++-
software/database/pom.xml | 50 +++-
software/messaging/pom.xml | 37 ++-
software/monitoring/pom.xml | 35 ++-
software/network/pom.xml | 33 ++-
software/nosql/pom.xml | 56 +++-
software/osgi/pom.xml | 41 ++-
software/webapp/pom.xml | 61 +++-
storage/hazelcast/pom.xml | 23 +-
usage/all/pom.xml | 3 +-
usage/archetypes/quickstart/pom.xml | 1 -
usage/camp/pom.xml | 45 ++-
usage/cli/pom.xml | 57 +++-
usage/dist/pom.xml | 6 +
usage/jsgui/pom.xml | 45 ++-
usage/launcher/pom.xml | 111 ++++++--
usage/qa/pom.xml | 23 +-
usage/rest-api/pom.xml | 50 +++-
usage/rest-client/pom.xml | 60 +++-
usage/rest-server/pom.xml | 117 ++++++--
usage/test-support/pom.xml | 20 +-
utils/common/pom.xml | 9 +-
utils/groovy/pom.xml | 16 +-
utils/jmx/jmxmp-ssl-agent/pom.xml | 17 +-
utils/jmx/jmxrmi-agent/pom.xml | 1 +
utils/rest-swagger/pom.xml | 26 +-
utils/test-support/pom.xml | 4 +
41 files changed, 1534 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: Remove apache-rat-plugin version in child modules
Posted by ri...@apache.org.
Remove apache-rat-plugin version in child modules
It is only required in the root POM.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fd067dc2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fd067dc2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fd067dc2
Branch: refs/heads/master
Commit: fd067dc2cdfe4433460c953ccaf8b4c7a59d445d
Parents: c1bd24b
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 21 15:20:33 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 31 13:23:07 2014 +0100
----------------------------------------------------------------------
core/pom.xml | 1 -
examples/pom.xml | 1 -
examples/simple-messaging-pubsub/pom.xml | 1 -
software/nosql/pom.xml | 1 -
usage/archetypes/quickstart/pom.xml | 1 -
usage/jsgui/pom.xml | 1 -
usage/qa/pom.xml | 1 -
7 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 80025da..4e3c2ea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -238,7 +238,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/src/main/resources/brooklyn/location/geo/external-ip-address-resolvers.txt</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 23c8929..e32293d 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -61,7 +61,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/simple-open-loop-policy/localrepo/io/brooklyn/org.marre.smsj/1.0.0-20051126/org.marre.smsj-1.0.0-20051126.pom</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index ec43750..9826c7c 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -126,7 +126,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/src/main/resources/passwd</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index a77ab61..e26f250 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -211,7 +211,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/couchdb/couch.uri</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index ec356fc..d0a6c7a 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/pom.xml
@@ -199,7 +199,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/src/main/resources/archetype-resources/README.md</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index c2c9eb5..85e90bc 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -231,7 +231,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/src/main/webapp/assets/js/libs/*</exclude>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/fd067dc2/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index fae1c5d..c8c72333 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -96,7 +96,6 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.10</version>
<configuration>
<excludes combine.children="append">
<exclude>**/log-exclusions.txt</exclude>
[5/6] git commit: Prevent swagger from importing slf4j
Posted by ri...@apache.org.
Prevent swagger from importing slf4j
Without this, there will be "multiple SLF4J bindings" exceptions
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d3407e3c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d3407e3c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d3407e3c
Branch: refs/heads/master
Commit: d3407e3ce07c49fb5f70a5dcaced7842ffa8dc5f
Parents: fd067dc
Author: Richard Downer <ri...@apache.org>
Authored: Tue Jul 22 12:16:36 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 31 13:23:07 2014 +0100
----------------------------------------------------------------------
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d3407e3c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82505bf..ec3b713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,6 +344,12 @@
<groupId>com.wordnik</groupId>
<artifactId>swagger-core_2.9.1</artifactId>
<version>${swagger.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
[2/6] git commit: Refer to brooklyn project inter-dependencies
consistently
Posted by ri...@apache.org.
Refer to brooklyn project inter-dependencies consistently
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d4185a09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d4185a09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d4185a09
Branch: refs/heads/master
Commit: d4185a09b2c9ddeba86e8bd89daeebbe709d9574
Parents: 49cbd93
Author: Richard Downer <ri...@apache.org>
Authored: Wed Jul 9 17:07:24 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Thu Jul 31 13:23:06 2014 +0100
----------------------------------------------------------------------
api/pom.xml | 1 +
camp/camp-base/pom.xml | 8 +++---
camp/camp-server/pom.xml | 6 ++---
core/pom.xml | 5 +++-
examples/global-web-fabric/pom.xml | 2 +-
examples/simple-open-loop-policy/pom.xml | 4 +--
examples/simple-web-cluster/pom.xml | 4 +--
locations/jclouds/pom.xml | 6 ++++-
policy/pom.xml | 6 ++++-
pom.xml | 37 ---------------------------
sandbox/dropwizard/pom.xml | 3 ++-
software/base/pom.xml | 13 +++++++---
software/database/pom.xml | 8 ++++--
software/messaging/pom.xml | 8 ++++--
software/monitoring/pom.xml | 7 +++--
software/network/pom.xml | 8 ++++--
software/nosql/pom.xml | 9 +++++--
software/osgi/pom.xml | 8 ++++--
software/webapp/pom.xml | 9 +++++--
storage/hazelcast/pom.xml | 6 ++++-
usage/all/pom.xml | 3 ++-
usage/camp/pom.xml | 19 +++++++++-----
usage/cli/pom.xml | 5 ++++
usage/dist/pom.xml | 1 +
usage/jsgui/pom.xml | 9 +++++--
usage/launcher/pom.xml | 7 ++++-
usage/qa/pom.xml | 1 +
usage/rest-api/pom.xml | 7 +++--
usage/rest-client/pom.xml | 17 +++++++-----
usage/rest-server/pom.xml | 23 ++++++++++-------
usage/test-support/pom.xml | 4 ++-
utils/common/pom.xml | 3 ++-
utils/groovy/pom.xml | 3 ++-
utils/jmx/jmxmp-ssl-agent/pom.xml | 3 +++
utils/jmx/jmxrmi-agent/pom.xml | 1 +
utils/rest-swagger/pom.xml | 6 +++--
36 files changed, 164 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 50e0ac9..c134dfe 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -40,6 +40,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 5daddf7..dd10afa 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -39,12 +39,12 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-test-support</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -80,14 +80,14 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-xml</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
<scope>tests</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<optional>true</optional>
<scope>tests</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index a54ccac..2ec937b 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -46,7 +46,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-test-support</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -150,7 +150,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -184,7 +184,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-xml</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<!-- optional so that this project has logging; dependencies may redeclare or supply their own -->
<optional>true</optional>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 6249cae..12ca972 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -37,14 +37,16 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -146,6 +148,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/examples/global-web-fabric/pom.xml
----------------------------------------------------------------------
diff --git a/examples/global-web-fabric/pom.xml b/examples/global-web-fabric/pom.xml
index b834606..fe392d8 100644
--- a/examples/global-web-fabric/pom.xml
+++ b/examples/global-web-fabric/pom.xml
@@ -64,7 +64,7 @@
<artifactItem>
<!-- this can fail in eclipse trying to copy _from_ target/classes.
see http://jira.codehaus.org/browse/MDEP-259 -->
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn.example</groupId>
<artifactId>brooklyn-example-hello-world-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/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 fba0529..2b67d4b 100644
--- a/examples/simple-open-loop-policy/pom.xml
+++ b/examples/simple-open-loop-policy/pom.xml
@@ -82,7 +82,7 @@
<!-- these can fail in eclipse trying to copy _from_ target/classes.
see http://jira.codehaus.org/browse/MDEP-259 -->
<artifactItem>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn.example</groupId>
<artifactId>brooklyn-example-hello-world-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -91,7 +91,7 @@
<destFileName>hello-world-webapp.war</destFileName>
</artifactItem>
<artifactItem>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn.example</groupId>
<artifactId>brooklyn-example-hello-world-sql-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/examples/simple-web-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml
index daddf7a..72f0f2e 100644
--- a/examples/simple-web-cluster/pom.xml
+++ b/examples/simple-web-cluster/pom.xml
@@ -94,7 +94,7 @@
<!-- these can fail in eclipse trying to copy _from_ target/classes.
see http://jira.codehaus.org/browse/MDEP-259 -->
<artifactItem>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn.example</groupId>
<artifactId>brooklyn-example-hello-world-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
@@ -103,7 +103,7 @@
<destFileName>hello-world-webapp.war</destFileName>
</artifactItem>
<artifactItem>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn.example</groupId>
<artifactId>brooklyn-example-hello-world-sql-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/locations/jclouds/pom.xml
----------------------------------------------------------------------
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 1ea244c..c853edf 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -38,14 +38,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -158,8 +161,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/policy/pom.xml
----------------------------------------------------------------------
diff --git a/policy/pom.xml b/policy/pom.xml
index 583f423..7b55672 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -38,6 +38,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -50,6 +51,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -63,11 +65,13 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 86b1746..fcc18b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,43 +198,6 @@
<dependencyManagement>
<dependencies>
- <!-- include version numbers for common dependencies (including common brooklyn deps) -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-utils-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-test-support</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-policy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-logback-includes</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>brooklyn-logback-xml</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/sandbox/dropwizard/pom.xml
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/pom.xml b/sandbox/dropwizard/pom.xml
index 3a234e8..62e24db 100644
--- a/sandbox/dropwizard/pom.xml
+++ b/sandbox/dropwizard/pom.xml
@@ -130,8 +130,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/base/pom.xml
----------------------------------------------------------------------
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 2326745..fcdbe0c 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -39,24 +39,27 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-jmxmp-agent</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-jmxrmi-agent</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -66,6 +69,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -108,15 +112,16 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<!-- bring in jclouds for testing -->
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index fd62590..66c005f 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -43,14 +43,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -84,8 +87,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -106,7 +110,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 6c0851a..760045d 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -49,14 +49,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -73,8 +76,9 @@
<!-- test dependencies -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,7 +98,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/software/monitoring/pom.xml b/software/monitoring/pom.xml
index cc2aee9..9299934 100644
--- a/software/monitoring/pom.xml
+++ b/software/monitoring/pom.xml
@@ -48,10 +48,12 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -73,8 +75,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -101,7 +104,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/network/pom.xml
----------------------------------------------------------------------
diff --git a/software/network/pom.xml b/software/network/pom.xml
index 27f574e..44346bd 100644
--- a/software/network/pom.xml
+++ b/software/network/pom.xml
@@ -41,14 +41,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -64,8 +67,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -86,7 +90,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index a16deac..a77ab61 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -53,18 +53,22 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -174,8 +178,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -196,7 +201,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index a8ac422..6d865b1 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -43,14 +43,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -76,8 +79,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -98,7 +102,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index 5b78500..43f95ac 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -50,6 +50,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -59,14 +60,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -118,8 +122,9 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -140,7 +145,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/storage/hazelcast/pom.xml
----------------------------------------------------------------------
diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml
index 79c66b7..b56a32d 100644
--- a/storage/hazelcast/pom.xml
+++ b/storage/hazelcast/pom.xml
@@ -38,14 +38,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -65,8 +68,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index d1efaf6..0b4cf09 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -46,12 +46,13 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 630749c..2b5e4d8 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -39,24 +39,27 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn.camp</groupId>
<artifactId>camp-base</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
@@ -76,12 +79,13 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-software-base</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-xml</artifactId>
+ <version>${project.version}</version>
<!-- optional so that this project has logging; dependencies may redeclare or supply their own -->
<optional>true</optional>
</dependency>
@@ -97,31 +101,32 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-software-webapp</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-software-database</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-software-nosql</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/cli/pom.xml
----------------------------------------------------------------------
diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml
index 3c90675..c5c2d57 100644
--- a/usage/cli/pom.xml
+++ b/usage/cli/pom.xml
@@ -40,10 +40,12 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -53,6 +55,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
@@ -85,6 +88,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-xml</artifactId>
+ <version>${project.version}</version>
<!-- optional so that this project has logging; dependencies may redeclare or supply their own -->
<optional>true</optional>
</dependency>
@@ -97,6 +101,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 9fe3cac..57f6146 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -51,6 +51,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 9d0db96..c2c9eb5 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -49,16 +49,19 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -75,19 +78,21 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 91d178c..b8bdcb0 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -41,10 +41,12 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -74,6 +76,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -141,6 +144,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-xml</artifactId>
+ <version>${project.version}</version>
<!-- optional so that this project has logging; dependencies may redeclare or supply their own -->
<optional>true</optional>
</dependency>
@@ -160,12 +164,13 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <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$-->
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index 8b371cd..8fb1f12 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -71,6 +71,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index 78ce013..ee9ee5a 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -82,15 +82,17 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -98,8 +100,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml
index e64ac31..e1188a8 100644
--- a/usage/rest-client/pom.xml
+++ b/usage/rest-client/pom.xml
@@ -36,13 +36,14 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-rest-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
@@ -117,26 +118,28 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-rest-server</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-rest-server</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index 5f36d7e..bc9775a 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -36,13 +36,14 @@
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-rest-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -57,10 +58,12 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -70,7 +73,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-rest-swagger</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -168,40 +171,42 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-policy</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-software-base</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-rest-api</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-locations-jclouds</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/usage/test-support/pom.xml
----------------------------------------------------------------------
diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml
index ff3b1a0..cf0f56a 100644
--- a/usage/test-support/pom.xml
+++ b/usage/test-support/pom.xml
@@ -37,11 +37,12 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-test-support</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-api</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -54,6 +55,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/utils/common/pom.xml
----------------------------------------------------------------------
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index 68eba22..15d505a 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-test-support</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<!-- common includes are always included, but test-support logging config files above
@@ -82,6 +82,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-logback-includes</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/utils/groovy/pom.xml
----------------------------------------------------------------------
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index fcdd338..86e1482 100644
--- a/utils/groovy/pom.xml
+++ b/utils/groovy/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-test-support</artifactId>
- <version>${brooklyn.version}</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -52,6 +52,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/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 7bf1938..152e6d1 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -42,6 +42,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.external</groupId>
@@ -57,11 +58,13 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-core</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/utils/jmx/jmxrmi-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml
index 6981a9e..75ef4c3 100644
--- a/utils/jmx/jmxrmi-agent/pom.xml
+++ b/utils/jmx/jmxrmi-agent/pom.xml
@@ -41,6 +41,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d4185a09/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index 0adc8e1..8488c8e 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -64,13 +64,15 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-utils-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>