You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2014/07/09 11:53:46 UTC
[01/10] git commit: Fix IntelliJ compilation oddity
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master f6b5e90f0 -> 2373a6fa7
Fix IntelliJ compilation oddity
The code as it was does not build in IntelliJ, although the IDE editor
does not detect there is a problem; only at compile time. The change
fixes the compilation issue without changing the behaviour.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/31d30d53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/31d30d53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/31d30d53
Branch: refs/heads/master
Commit: 31d30d53aa2a5402cc8ae3ea6a421ac54635785a
Parents: 1a9732e
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 14:03:14 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 14:04:48 2014 +0100
----------------------------------------------------------------------
core/src/test/java/brooklyn/enricher/EnrichersTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/31d30d53/core/src/test/java/brooklyn/enricher/EnrichersTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/enricher/EnrichersTest.java b/core/src/test/java/brooklyn/enricher/EnrichersTest.java
index 9ad2c59..bab528a 100644
--- a/core/src/test/java/brooklyn/enricher/EnrichersTest.java
+++ b/core/src/test/java/brooklyn/enricher/EnrichersTest.java
@@ -84,7 +84,7 @@ public class EnrichersTest extends BrooklynAppUnitTestSupport {
.computing(new Function<Iterable<Integer>, Object>() {
@Override public Object apply(Iterable<Integer> input) {
if (input != null && Iterables.contains(input, 123)) {
- return Enrichers.sum((Iterable)input, 0, 0, TypeTokens.getTypeToken(null, Integer.class));
+ return Enrichers.sum(input, 0, 0, new TypeToken<Integer>(){});
} else {
return Entities.UNCHANGED;
}
@@ -311,7 +311,7 @@ public class EnrichersTest extends BrooklynAppUnitTestSupport {
.computing(new Function<Iterable<Integer>, Object>() {
@Override public Object apply(Iterable<Integer> input) {
if (input != null && Iterables.contains(input, 123)) {
- return Enrichers.sum((Iterable)input, 0, 0, TypeTokens.getTypeToken(null, Integer.class));
+ return Enrichers.sum(input, 0, 0, new TypeToken<Integer>(){});
} else {
return Entities.UNCHANGED;
}
[04/10] git commit: Fix interior version conflicts - qpid
Posted by an...@apache.org.
Fix interior version conflicts - qpid
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a513d8e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a513d8e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a513d8e1
Branch: refs/heads/master
Commit: a513d8e127c24107afeb7a962daafb9b4f9fd955
Parents: 9b1cbb6
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:04:36 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 15:10:19 2014 +0100
----------------------------------------------------------------------
examples/simple-messaging-pubsub/pom.xml | 4 ++--
pom.xml | 1 +
software/messaging/pom.xml | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a513d8e1/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index be09484..fe3b158 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>0.14</version>
+ <version>${qpid.version}</version>
</dependency>
</dependencies>
@@ -58,7 +58,7 @@
<artifactItem>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-bdbstore</artifactId>
- <version>0.14</version>
+ <version>${qpid.version}</version>
</artifactItem>
<artifactItem>
<groupId>com.sleepycat</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a513d8e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 27c2228..ba0e5de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,6 +125,7 @@
<hazelcast.version>3.0</hazelcast.version>
<commons-lang3.version>3.1</commons-lang3.version>
<commons-compress.version>1.4</commons-compress.version>
+ <qpid.version>0.20</qpid.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a513d8e1/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 49d444b..72b2774 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>0.20</version>
+ <version>${qpid.version}</version>
<scope>test</scope>
</dependency>
[08/10] git commit: Missing dependencies on TestNG
Posted by an...@apache.org.
Missing dependencies on TestNG
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2cf8065c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2cf8065c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2cf8065c
Branch: refs/heads/master
Commit: 2cf8065c7ee89044f03529fdb6575654c5db8a8e
Parents: b0a5d2c
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:40:42 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 16:15:54 2014 +0100
----------------------------------------------------------------------
camp/camp-base/pom.xml | 2 +-
camp/camp-server/pom.xml | 5 +++++
examples/simple-web-cluster/pom.xml | 11 +++++++++++
usage/camp/pom.xml | 10 ++++++++++
4 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2cf8065c/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 5492896..8a293de 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -26,7 +26,7 @@
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-test-support</artifactId>
<version>${brooklyn.version}</version>
- <scope>tests</scope>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2cf8065c/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 369184f..8982e55 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -35,6 +35,11 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2cf8065c/examples/simple-web-cluster/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-web-cluster/pom.xml b/examples/simple-web-cluster/pom.xml
index d2d93e9..d89b282 100644
--- a/examples/simple-web-cluster/pom.xml
+++ b/examples/simple-web-cluster/pom.xml
@@ -33,6 +33,17 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-test-support</artifactId>
+ <version>${project.version}</version>
+ <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/2cf8065c/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 14fa737..d6a6dce 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -77,6 +77,16 @@
<version>${brooklyn.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>io.brooklyn</groupId>
+ <artifactId>brooklyn-test-support</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
[10/10] git commit: This closes #50
Posted by an...@apache.org.
This closes #50
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2373a6fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2373a6fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2373a6fa
Branch: refs/heads/master
Commit: 2373a6fa7900afe554eedde04038f0b53bd84d16
Parents: f6b5e90 3c49dbf
Author: Andrea Turli <an...@gmail.com>
Authored: Wed Jul 9 11:53:00 2014 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Wed Jul 9 11:53:00 2014 +0200
----------------------------------------------------------------------
camp/camp-base/pom.xml | 4 +--
camp/camp-server/pom.xml | 12 +++----
.../ApplicationCompomentTemplateDtoTest.java | 2 +-
.../dto/PlatformCompomentTemplateDtoTest.java | 2 +-
.../test/fixture/AbstractRestResourceTest.java | 2 +-
core/pom.xml | 2 +-
.../java/brooklyn/enricher/EnrichersTest.java | 4 +--
.../brooklyn/entity/basic/EntitiesTest.java | 3 +-
.../entity/effector/EffectorBasicTest.java | 2 +-
.../entity/rebind/RebindEntityTest.java | 3 +-
.../basic/ByonLocationResolverTest.java | 3 +-
.../ssh/SshToolAbstractIntegrationTest.java | 3 +-
examples/simple-messaging-pubsub/pom.xml | 8 ++---
examples/simple-open-loop-policy/pom.xml | 2 +-
examples/simple-web-cluster/pom.xml | 11 ++++++
examples/webapps/hello-world-hadoop-jar/pom.xml | 3 +-
examples/webapps/hello-world-hadoop/pom.xml | 6 ++--
examples/webapps/hello-world-sql/pom.xml | 4 +--
.../persister/jclouds/BlobStoreExpiryTest.java | 2 +-
.../rebind/persister/jclouds/BlobStoreTest.java | 2 +-
pom.xml | 35 ++++++++++++++++++++
software/database/pom.xml | 4 +--
software/messaging/pom.xml | 12 +++----
software/nosql/pom.xml | 14 +++-----
software/osgi/pom.xml | 2 +-
software/webapp/pom.xml | 4 +--
.../AbstractWebAppFixtureIntegrationTest.java | 2 +-
usage/camp/pom.xml | 12 ++++++-
.../camp/brooklyn/LocationsYamlTest.java | 2 +-
usage/dist/pom.xml | 2 +-
usage/jsgui/pom.xml | 13 +-------
usage/launcher/pom.xml | 11 ++----
usage/qa/pom.xml | 4 +--
usage/rest-api/pom.xml | 2 +-
usage/rest-client/pom.xml | 6 +---
usage/rest-server/pom.xml | 2 +-
.../rest/resources/ScriptResourceTest.java | 3 +-
.../util/text/QuotedStringTokenizerTest.java | 3 +-
utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +-
utils/rest-swagger/pom.xml | 4 ---
40 files changed, 119 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/camp/camp-server/src/test/java/io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/camp/camp-server/src/test/java/io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/camp/camp-server/src/test/java/io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/src/test/java/brooklyn/enricher/EnrichersTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractIntegrationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/examples/simple-open-loop-policy/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/examples/simple-web-cluster/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/examples/webapps/hello-world-hadoop-jar/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/examples/webapps/hello-world-hadoop/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/examples/webapps/hello-world-sql/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/software/database/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/software/messaging/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/software/nosql/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/software/osgi/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/software/webapp/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/camp/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/dist/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/jsgui/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/launcher/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/qa/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/rest-api/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/rest-client/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/rest-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2373a6fa/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
[09/10] git commit: Specify version numbers in root pom.xml only
Posted by an...@apache.org.
Specify version numbers in root pom.xml only
This removes any hard-coded version numbers from pom.xml except for the
root; the root contains a set of properties that define version numbers.
In some cases this will change the minor version used; where this
happens, the version used will always move forward, not backward; and
the major version does not change.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3c49dbf5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3c49dbf5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3c49dbf5
Branch: refs/heads/master
Commit: 3c49dbf5f7e6a65edea43f794b8ca9ff6ff854a4
Parents: 2cf8065
Author: Richard Downer <ri...@apache.org>
Authored: Fri Jul 4 17:54:45 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 16:15:56 2014 +0100
----------------------------------------------------------------------
camp/camp-base/pom.xml | 2 +-
camp/camp-server/pom.xml | 7 +----
core/pom.xml | 2 +-
examples/simple-messaging-pubsub/pom.xml | 4 +--
examples/simple-open-loop-policy/pom.xml | 2 +-
examples/webapps/hello-world-hadoop-jar/pom.xml | 3 +-
examples/webapps/hello-world-hadoop/pom.xml | 4 +--
examples/webapps/hello-world-sql/pom.xml | 2 +-
pom.xml | 32 ++++++++++++++++++++
software/database/pom.xml | 4 +--
software/messaging/pom.xml | 10 +++---
software/nosql/pom.xml | 8 ++---
software/webapp/pom.xml | 4 +--
usage/dist/pom.xml | 2 +-
usage/jsgui/pom.xml | 12 +-------
usage/launcher/pom.xml | 11 ++-----
usage/qa/pom.xml | 4 +--
usage/rest-api/pom.xml | 2 +-
usage/rest-client/pom.xml | 6 +---
utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +-
utils/rest-swagger/pom.xml | 4 ---
21 files changed, 64 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/camp/camp-base/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 8a293de..92b564f 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.11</version>
+ <version>${snakeyaml.version}</version>
</dependency>
<!-- just for logging, not exported -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 8982e55..a77dd80 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -16,11 +16,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <properties>
- <jersey.version>1.12</jersey.version>
- <jetty.version>8.1.4.v20120524</jetty.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.brooklyn.camp</groupId>
@@ -90,7 +85,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
+ <version>${validation-api.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 01a87e1..7d71907 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/simple-messaging-pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-messaging-pubsub/pom.xml b/examples/simple-messaging-pubsub/pom.xml
index fe3b158..b6a3869 100644
--- a/examples/simple-messaging-pubsub/pom.xml
+++ b/examples/simple-messaging-pubsub/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jms_1.1_spec.version}</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
@@ -63,7 +63,7 @@
<artifactItem>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <version>5.0.34</version>
+ <version>${sleepycat-je.version}</version>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/simple-open-loop-policy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-open-loop-policy/pom.xml b/examples/simple-open-loop-policy/pom.xml
index 6157996..8c14dd1 100644
--- a/examples/simple-open-loop-policy/pom.xml
+++ b/examples/simple-open-loop-policy/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>io.brooklyn</groupId>
<artifactId>org.marre.smsj</artifactId>
- <version>1.0.0-20051126</version>
+ <version>${org.marre.smsj.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/webapps/hello-world-hadoop-jar/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-hadoop-jar/pom.xml b/examples/webapps/hello-world-hadoop-jar/pom.xml
index 37dc3b7..7e8ac4e 100644
--- a/examples/webapps/hello-world-hadoop-jar/pom.xml
+++ b/examples/webapps/hello-world-hadoop-jar/pom.xml
@@ -10,7 +10,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <hadoop.version>1.0.2</hadoop.version>
</properties>
<build>
@@ -33,7 +32,7 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.2</version>
+ <version>${commons-cli.version}</version>
</dependency>
<!-- fix for https://issues.apache.org/jira/browse/HADOOP-7461 needed if hadoop is pre 1.0.0 <dependency> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId> <version>1.0.1</version> </dependency> -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/webapps/hello-world-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-hadoop/pom.xml b/examples/webapps/hello-world-hadoop/pom.xml
index 0a3d389..06c129e 100644
--- a/examples/webapps/hello-world-hadoop/pom.xml
+++ b/examples/webapps/hello-world-hadoop/pom.xml
@@ -15,12 +15,12 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.18</version>
+ <version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>1.0.2</version>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>io.brooklyn.example</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/examples/webapps/hello-world-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml
index 2befd46..832bd10 100644
--- a/examples/webapps/hello-world-sql/pom.xml
+++ b/examples/webapps/hello-world-sql/pom.xml
@@ -15,7 +15,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.18</version>
+ <version>${mysql-connector-java.version}</version>
</dependency>
<dependency>
<groupId>org.mongodb</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2c63f54..88c735a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,6 +128,38 @@
<qpid.version>0.20</qpid.version>
<mongodb.version>2.11.4</mongodb.version>
<maven-war-plugin.version>2.4</maven-war-plugin.version>
+ <snakeyaml.version>1.11</snakeyaml.version>
+ <validation-api.version>1.0.0.GA</validation-api.version>
+ <geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
+ <sleepycat-je.version>5.0.34</sleepycat-je.version>
+ <org.marre.smsj.version>1.0.0-20051126</org.marre.smsj.version>
+ <mysql-connector-java.version>5.1.18</mysql-connector-java.version>
+ <hadoop.version>1.0.2</hadoop.version>
+ <commons-cli.version>1.2</commons-cli.version>
+ <postgresql.version>9.1-901.jdbc4</postgresql.version>
+ <activemq.version>5.7.0</activemq.version>
+ <rabbitmq-version>2.8.7</rabbitmq-version>
+ <kafka.version>0.7.0-incubating</kafka.version>
+ <storm.version>0.8.2</storm.version>
+ <redis.version>1.5.2</redis.version>
+ <astyanax.version>1.56.24</astyanax.version>
+ <jcouchdb.version>0.11.0-1</jcouchdb.version>
+ <solr.version>4.7.0</solr.version>
+ <jtidy.version>r8-20060801</jtidy.version>
+ <opendmk_jmxremote_optional_jar.version>1.0-b01-ea</opendmk_jmxremote_optional_jar.version>
+ <resteasy.version>3.0.1.Final</resteasy.version>
+ <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+ <jopt.version>4.3</jopt.version>
+ <concurrentlinkedhashmap.version>1.0_jdk5</concurrentlinkedhashmap.version>
+ <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
+ <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
+ <jasmine-maven-plugin.version>1.2.0.0</jasmine-maven-plugin.version>
+<!-- see comment about fixtures in brooklyn-jsgui
+ <jasmine-maven-plugin.version>1.3.1.2</jasmine-maven-plugin.version>
+-->
+ <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
+ <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+ <eclipse-m2e.version>1.0.0</eclipse-m2e.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/database/pom.xml
----------------------------------------------------------------------
diff --git a/software/database/pom.xml b/software/database/pom.xml
index 8ada1dc..4c38d4e 100644
--- a/software/database/pom.xml
+++ b/software/database/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.18</version>
+ <version>${mysql-connector-java.version}</version>
<scope>test</scope>
</dependency>
@@ -66,7 +66,7 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.1-901.jdbc4</version>
+ <version>${postgresql.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/messaging/pom.xml
----------------------------------------------------------------------
diff --git a/software/messaging/pom.xml b/software/messaging/pom.xml
index 72b2774..6996b4f 100644
--- a/software/messaging/pom.xml
+++ b/software/messaging/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jms_1.1_spec.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
- <version>5.7.0</version>
+ <version>${activemq.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -87,7 +87,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>2.8.7</version>
+ <version>${rabbitmq-version}</version>
<scope>test</scope>
</dependency>
@@ -95,7 +95,7 @@
<dependency>
<groupId>storm</groupId>
<artifactId>kafka</artifactId>
- <version>0.7.0-incubating</version>
+ <version>${kafka.version}</version>
<scope>test</scope>
</dependency>
@@ -103,7 +103,7 @@
<dependency>
<groupId>storm</groupId>
<artifactId>storm</artifactId>
- <version>0.8.2</version>
+ <version>${storm.version}</version>
<!-- keep storm out of the jar-with-dependencies -->
<scope>test</scope>
<exclusions>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 8e8ed97..a53c97f 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>1.5.2</version>
+ <version>${redis.version}</version>
<scope>test</scope>
</dependency>
@@ -51,7 +51,7 @@
<dependency>
<groupId>com.netflix.astyanax</groupId>
<artifactId>astyanax</artifactId>
- <version>1.56.24</version>
+ <version>${astyanax.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -75,7 +75,7 @@
<dependency>
<groupId>com.google.code.jcouchdb</groupId>
<artifactId>jcouchdb</artifactId>
- <version>0.11.0-1</version>
+ <version>${jcouchdb.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -97,7 +97,7 @@
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
- <version>4.7.0</version>
+ <version>${solr.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/software/webapp/pom.xml b/software/webapp/pom.xml
index ab1559f..53ea262 100644
--- a/software/webapp/pom.xml
+++ b/software/webapp/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>jtidy</artifactId>
- <version>r8-20060801</version>
+ <version>${jtidy.version}</version>
</dependency>
<dependency>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
- <version>1.1.1</version>
+ <version>${geronimo-jms_1.1_spec.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 7681a1c..00f5c4f 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -108,7 +108,7 @@
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
+ <version>${eclipse-m2e.version}</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index b750a50..3284408 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -20,16 +20,6 @@
</parent>
<properties>
- <maven-replacer-plugin.version>1.5.2</maven-replacer-plugin.version>
- <nodejs-maven-plugin.version>1.0.3</nodejs-maven-plugin.version>
- <jasmine-maven-plugin.version>1.2.0.0</jasmine-maven-plugin.version>
-<!-- see comment about fixtures below
- <jasmine-maven-plugin.version>1.3.1.2</jasmine-maven-plugin.version>
--->
- <requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
-
- <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
-
<project.build.webapp>
${project.build.directory}/${project.build.finalName}
</project.build.webapp>
@@ -136,7 +126,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>prep-server</id>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/launcher/pom.xml
----------------------------------------------------------------------
diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml
index 229544e..4d90969 100644
--- a/usage/launcher/pom.xml
+++ b/usage/launcher/pom.xml
@@ -71,13 +71,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.brooklyn</groupId>
- <artifactId>brooklyn-core</artifactId>
- <version>${project.version}</version><!--$NO-MVN-MAN-VER$-->
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -90,13 +83,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.3.0</version>
+ <version>${osgi-core.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.concurrentlinkedhashmap</groupId>
<artifactId>concurrentlinkedhashmap-lru</artifactId>
- <version>1.0_jdk5</version>
+ <version>${concurrentlinkedhashmap.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/qa/pom.xml
----------------------------------------------------------------------
diff --git a/usage/qa/pom.xml b/usage/qa/pom.xml
index d7cb6ff..2a82114 100644
--- a/usage/qa/pom.xml
+++ b/usage/qa/pom.xml
@@ -24,12 +24,12 @@
<dependency>
<groupId>net.sf.jopt-simple</groupId>
<artifactId>jopt-simple</artifactId>
- <version>4.3</version>
+ <version>${jopt.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.3</version>
+ <version>${httpclient.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/rest-api/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml
index 2ceb98a..770abfd 100644
--- a/usage/rest-api/pom.xml
+++ b/usage/rest-api/pom.xml
@@ -29,7 +29,7 @@
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>1.0.0.GA</version>
+ <version>${validation-api.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/usage/rest-client/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml
index 68873b3..fa8dee6 100644
--- a/usage/rest-client/pom.xml
+++ b/usage/rest-client/pom.xml
@@ -15,10 +15,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <resteasy.version>3.0.1.Final</resteasy.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -98,7 +94,7 @@
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven-dependency-plugin.version}</version>
<executions>
<execution>
<id>prep-server</id>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/utils/jmx/jmxmp-ssl-agent/pom.xml
----------------------------------------------------------------------
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index 35ddc32..1ff503e 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.glassfish.external</groupId>
<artifactId>opendmk_jmxremote_optional_jar</artifactId>
- <version>1.0-b01-ea</version>
+ <version>${opendmk_jmxremote_optional_jar.version}</version>
<!-- this is no longer avail on maven central!?
<groupId>javax.management</groupId>
<artifactId>jmxremote_optional</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3c49dbf5/utils/rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index e766036..88c3335 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -17,10 +17,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <swagger.version>1.0.1</swagger.version>
- </properties>
-
<dependencies>
<!-- need this to get the right ServletConfig as used elsewhere :( -->
[06/10] git commit: Fix interior version conflicts - MongoDB
Posted by an...@apache.org.
Fix interior version conflicts - MongoDB
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/342a00dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/342a00dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/342a00dd
Branch: refs/heads/master
Commit: 342a00dd2e59cfbd5f3747bac623221ce27db156
Parents: d694486
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:13:11 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 15:13:11 2014 +0100
----------------------------------------------------------------------
examples/webapps/hello-world-sql/pom.xml | 2 +-
pom.xml | 1 +
software/nosql/pom.xml | 6 +-----
3 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/342a00dd/examples/webapps/hello-world-sql/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-sql/pom.xml b/examples/webapps/hello-world-sql/pom.xml
index a77670b..2befd46 100644
--- a/examples/webapps/hello-world-sql/pom.xml
+++ b/examples/webapps/hello-world-sql/pom.xml
@@ -20,7 +20,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.11.4</version>
+ <version>${mongodb.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/342a00dd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ba0e5de..35d7bce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,6 +126,7 @@
<commons-lang3.version>3.1</commons-lang3.version>
<commons-compress.version>1.4</commons-compress.version>
<qpid.version>0.20</qpid.version>
+ <mongodb.version>2.11.4</mongodb.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/342a00dd/software/nosql/pom.xml
----------------------------------------------------------------------
diff --git a/software/nosql/pom.xml b/software/nosql/pom.xml
index 4597d0c..8e8ed97 100644
--- a/software/nosql/pom.xml
+++ b/software/nosql/pom.xml
@@ -14,10 +14,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <mongo-java-driver.version>2.11.3</mongo-java-driver.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.brooklyn</groupId>
@@ -40,7 +36,7 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>${mongo-java-driver.version}</version>
+ <version>${mongodb.version}</version>
</dependency>
<!-- for redis testing -->
[02/10] git commit: Change junit references to TestNG
Posted by an...@apache.org.
Change junit references to TestNG
All probably the result of accepting an IDE's suggested `import` without
looking closely!
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e800bea6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e800bea6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e800bea6
Branch: refs/heads/master
Commit: e800bea6d8046d4733f17a170324ff09efc36503
Parents: 31d30d5
Author: Richard Downer <ri...@apache.org>
Authored: Fri Jul 4 16:19:44 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 14:04:49 2014 +0100
----------------------------------------------------------------------
.../io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java | 2 +-
.../io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java | 2 +-
.../io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java | 2 +-
core/src/test/java/brooklyn/entity/basic/EntitiesTest.java | 3 +--
.../src/test/java/brooklyn/entity/effector/EffectorBasicTest.java | 2 +-
core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java | 3 +--
.../java/brooklyn/location/basic/ByonLocationResolverTest.java | 3 +--
.../util/internal/ssh/SshToolAbstractIntegrationTest.java | 3 +--
.../entity/rebind/persister/jclouds/BlobStoreExpiryTest.java | 2 +-
.../brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java | 2 +-
.../entity/webapp/AbstractWebAppFixtureIntegrationTest.java | 2 +-
.../test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java | 2 +-
.../src/test/java/brooklyn/rest/resources/ScriptResourceTest.java | 3 +--
.../test/java/brooklyn/util/text/QuotedStringTokenizerTest.java | 3 +--
14 files changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/camp/camp-server/src/test/java/io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/test/java/io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java b/camp/camp-server/src/test/java/io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java
index 36686e2..f1d6d37 100644
--- a/camp/camp-server/src/test/java/io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java
+++ b/camp/camp-server/src/test/java/io/brooklyn/camp/dto/ApplicationCompomentTemplateDtoTest.java
@@ -4,10 +4,10 @@ import io.brooklyn.camp.CampPlatform;
import io.brooklyn.camp.rest.util.DtoFactory;
import io.brooklyn.camp.spi.ApplicationComponentTemplate;
import io.brooklyn.camp.test.mock.web.MockWebPlatform;
-import junit.framework.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.Test;
public class ApplicationCompomentTemplateDtoTest {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/camp/camp-server/src/test/java/io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/test/java/io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java b/camp/camp-server/src/test/java/io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java
index 25b9f29..c543096 100644
--- a/camp/camp-server/src/test/java/io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java
+++ b/camp/camp-server/src/test/java/io/brooklyn/camp/dto/PlatformCompomentTemplateDtoTest.java
@@ -4,10 +4,10 @@ import io.brooklyn.camp.CampPlatform;
import io.brooklyn.camp.rest.util.DtoFactory;
import io.brooklyn.camp.spi.PlatformComponentTemplate;
import io.brooklyn.camp.test.mock.web.MockWebPlatform;
-import junit.framework.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.Test;
public class PlatformCompomentTemplateDtoTest {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/camp/camp-server/src/test/java/io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-server/src/test/java/io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java b/camp/camp-server/src/test/java/io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java
index d4c6f01..9b525f6 100644
--- a/camp/camp-server/src/test/java/io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java
+++ b/camp/camp-server/src/test/java/io/brooklyn/camp/test/fixture/AbstractRestResourceTest.java
@@ -6,9 +6,9 @@ import io.brooklyn.camp.BasicCampPlatform;
import io.brooklyn.camp.CampServer;
import io.brooklyn.camp.test.mock.web.MockWebPlatform;
-import org.junit.AfterClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.reporters.Files;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
index 132ff5b..c703037 100644
--- a/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
+++ b/core/src/test/java/brooklyn/entity/basic/EntitiesTest.java
@@ -6,8 +6,7 @@ import static org.testng.Assert.assertTrue;
import java.util.concurrent.atomic.AtomicReference;
-import junit.framework.Assert;
-
+import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java
index 007a3cf..7146e75 100644
--- a/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java
+++ b/core/src/test/java/brooklyn/entity/effector/EffectorBasicTest.java
@@ -2,9 +2,9 @@ package brooklyn.entity.effector;
import java.util.List;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java
index 290cc3b..e52fd45 100644
--- a/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java
+++ b/core/src/test/java/brooklyn/entity/rebind/RebindEntityTest.java
@@ -16,8 +16,7 @@ import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
-import junit.framework.Assert;
-
+import org.testng.Assert;
import org.testng.annotations.Test;
import brooklyn.config.ConfigKey;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java b/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java
index 5862e26..d32e356 100644
--- a/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java
+++ b/core/src/test/java/brooklyn/location/basic/ByonLocationResolverTest.java
@@ -12,10 +12,9 @@ import java.util.Set;
import javax.annotation.Nullable;
-import junit.framework.Assert;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractIntegrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractIntegrationTest.java b/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractIntegrationTest.java
index ccb432c..5f01417 100644
--- a/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractIntegrationTest.java
+++ b/core/src/test/java/brooklyn/util/internal/ssh/SshToolAbstractIntegrationTest.java
@@ -14,10 +14,9 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import junit.framework.Assert;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
index 19f56f7..85cd92b 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreExpiryTest.java
@@ -16,9 +16,9 @@ import org.jclouds.domain.Credentials;
import org.jclouds.openstack.domain.AuthenticationResponse;
import org.jclouds.openstack.handlers.RetryOnRenew;
import org.jclouds.openstack.reference.AuthHeaders;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
index 3fc02bc..4e95af9 100644
--- a/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/entity/rebind/persister/jclouds/BlobStoreTest.java
@@ -9,7 +9,7 @@ import org.jclouds.blobstore.domain.Blob;
import org.jclouds.blobstore.domain.PageSet;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.options.ListContainerOptions;
-import org.junit.Assert;
+import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
index 3acc864..3752b8a 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
@@ -16,9 +16,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.AfterClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java
----------------------------------------------------------------------
diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java
index 8690965..26af0ab 100644
--- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java
+++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/LocationsYamlTest.java
@@ -7,9 +7,9 @@ import static org.testng.Assert.assertTrue;
import java.io.StringReader;
import java.util.List;
-import org.junit.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testng.Assert;
import org.testng.annotations.Test;
import brooklyn.entity.Entity;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java b/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java
index 4c923db..0a5ebad 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/resources/ScriptResourceTest.java
@@ -2,8 +2,7 @@ package brooklyn.rest.resources;
import java.util.Collections;
-import junit.framework.Assert;
-
+import org.testng.Assert;
import org.testng.annotations.Test;
import brooklyn.entity.basic.Entities;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e800bea6/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java b/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
index 01f7076..e6d591c 100644
--- a/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
@@ -11,8 +11,7 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import junit.framework.Assert;
-
+import org.testng.Assert;
import org.testng.annotations.Test;
public class QuotedStringTokenizerTest {
[03/10] git commit: brooklyn-software-osgi, change OSGi dependency ref
Posted by an...@apache.org.
brooklyn-software-osgi, change OSGi dependency ref
Was previously org.osgi:core:4.3.0; changed to
org.osgi:org.osgi.core:4.3.0 to match usage/launcher/pom.xml reference
to OSGi
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/9b1cbb6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/9b1cbb6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/9b1cbb6e
Branch: refs/heads/master
Commit: 9b1cbb6e8892d5dc578c2cad508d173d14cb761a
Parents: e800bea
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 14:12:06 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 14:14:29 2014 +0100
----------------------------------------------------------------------
software/osgi/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b1cbb6e/software/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/software/osgi/pom.xml b/software/osgi/pom.xml
index 7fabc77..2b3b4da 100644
--- a/software/osgi/pom.xml
+++ b/software/osgi/pom.xml
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>core</artifactId>
+ <artifactId>org.osgi.core</artifactId>
<version>${osgi-core.version}</version>
</dependency>
[05/10] git commit: Fix interior version conflicts - slf4j
Posted by an...@apache.org.
Fix interior version conflicts - slf4j
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d6944861
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d6944861
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d6944861
Branch: refs/heads/master
Commit: d6944861c8b1168d6759da0b1716f1d943c7a23a
Parents: a513d8e
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:10:57 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 15:10:57 2014 +0100
----------------------------------------------------------------------
examples/webapps/hello-world-hadoop/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d6944861/examples/webapps/hello-world-hadoop/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webapps/hello-world-hadoop/pom.xml b/examples/webapps/hello-world-hadoop/pom.xml
index aac1999..0a3d389 100644
--- a/examples/webapps/hello-world-hadoop/pom.xml
+++ b/examples/webapps/hello-world-hadoop/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.11</version>
+ <version>${slf4j.version}</version>
</dependency>
</dependencies>
[07/10] git commit: Fix interior version conflicts - maven-war-plugin
Posted by an...@apache.org.
Fix interior version conflicts - maven-war-plugin
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b0a5d2ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b0a5d2ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b0a5d2ca
Branch: refs/heads/master
Commit: b0a5d2ca67401b87f6ca393e5da4c223a2f5fdd3
Parents: 342a00d
Author: Richard Downer <ri...@apache.org>
Authored: Mon Jul 7 15:14:49 2014 +0100
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Jul 7 15:14:49 2014 +0100
----------------------------------------------------------------------
pom.xml | 1 +
usage/camp/pom.xml | 2 +-
usage/jsgui/pom.xml | 1 -
usage/rest-server/pom.xml | 2 +-
4 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 35d7bce..2c63f54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,6 +127,7 @@
<commons-compress.version>1.4</commons-compress.version>
<qpid.version>0.20</qpid.version>
<mongodb.version>2.11.4</mongodb.version>
+ <maven-war-plugin.version>2.4</maven-war-plugin.version>
<includedTestGroups />
<excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index f529283..14fa737 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -86,7 +86,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven-war-plugin.version}</version>
<executions>
<execution>
<id>make-skinny-war</id>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 0d8a688..b750a50 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -28,7 +28,6 @@
-->
<requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
- <maven-war-plugin.version>2.4</maven-war-plugin.version>
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
<project.build.webapp>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b0a5d2ca/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index a702dec..331faaf 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -149,7 +149,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.2</version>
+ <version>${maven-war-plugin.version}</version>
<executions>
<execution>
<id>make-skinny-war</id>