Repository: incubator-brooklyn Updated Branches: refs/heads/master 7d2359540 -> b7d636103
Cassandra multicloud snitch following package renaming to org.apache - cassandra-multicloud-snitch.jar rebuilt with the new packages - updating the pom.xml to exclude commons-codec, because of dependency convergence issues Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f70034cc Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f70034cc Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f70034cc Branch: refs/heads/master Commit: f70034cc4acd245bfc46f99a3abb298899f5a7f4 Parents: cc4ffb9 Author: Yavor Yanchev <[email protected]> Authored: Fri Aug 7 11:31:23 2015 +0300 Committer: Yavor Yanchev <[email protected]> Committed: Fri Aug 7 11:31:23 2015 +0300 ---------------------------------------------------------------------- sandbox/cassandra-multicloud-snitch/pom.xml | 6 +++++- .../cassandra/cassandra-multicloud-snitch.jar | Bin 4729 -> 15292 bytes 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f70034cc/sandbox/cassandra-multicloud-snitch/pom.xml ---------------------------------------------------------------------- diff --git a/sandbox/cassandra-multicloud-snitch/pom.xml b/sandbox/cassandra-multicloud-snitch/pom.xml index d8ad03b..18c4543 100644 --- a/sandbox/cassandra-multicloud-snitch/pom.xml +++ b/sandbox/cassandra-multicloud-snitch/pom.xml @@ -43,7 +43,7 @@ <groupId>org.apache.cassandra</groupId> <artifactId>cassandra-all</artifactId> <version>${cassandra.version}</version> <!-- note astyanax 1.56.24 pulls in 1.1.1 --> - <scope>test</scope> + <!-- scope>test</scope --> <exclusions> <exclusion> <artifactId>slf4j-log4j12</artifactId> @@ -53,6 +53,10 @@ <artifactId>log4j</artifactId> <groupId>log4j</groupId> </exclusion> + <exclusion> + <artifactId>commons-codec</artifactId> + <groupId>commons-codec</groupId> + </exclusion> </exclusions> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f70034cc/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar ---------------------------------------------------------------------- diff --git a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar index b1c1b94..2197705 100644 Binary files a/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar and b/software/nosql/src/main/resources/org/apache/brooklyn/entity/nosql/cassandra/cassandra-multicloud-snitch.jar differ
