You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2018/09/18 09:51:47 UTC
[1/7] brooklyn-server git commit: Add
testMergeMapsPreferringSecondOnConflict
Repository: brooklyn-server
Updated Branches:
refs/heads/master 2ec309b96 -> e27cc7b6d
Add testMergeMapsPreferringSecondOnConflict
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/71bf99b0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/71bf99b0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/71bf99b0
Branch: refs/heads/master
Commit: 71bf99b08a67483e5eb5ff81db801d09c4ab62d3
Parents: 1769771
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 18 07:39:11 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 18 07:39:11 2018 +0100
----------------------------------------------------------------------
.../brooklyn/util/collections/CollectionMergerTest.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/71bf99b0/utils/common/src/test/java/org/apache/brooklyn/util/collections/CollectionMergerTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/collections/CollectionMergerTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/collections/CollectionMergerTest.java
index f8b4f05..2b0bf76 100644
--- a/utils/common/src/test/java/org/apache/brooklyn/util/collections/CollectionMergerTest.java
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/collections/CollectionMergerTest.java
@@ -416,6 +416,18 @@ public class CollectionMergerTest {
assertNotEquals(ref1, ref2);
}
+ @Test
+ public void testMergeMapsPreferringSecondOnConflict() {
+ Map<?, ?> val1 = ImmutableMap.of("key1", "val1a", "key2", "val2");
+ Map<?, ?> val2 = ImmutableMap.of("key1", "val1b", "key3", "val3");
+
+ Map<?, ?> result1 = CollectionMerger.builder().build().merge(val1, val2);
+ Map<?, ?> result2 = CollectionMerger.builder().preferSecondOnConflict(true).build().merge(val1, val2);
+
+ assertEquals(result1, ImmutableMap.of("key1", "val1a", "key2", "val2", "key3", "val3"));
+ assertEquals(result2, ImmutableMap.of("key1", "val1b", "key2", "val2", "key3", "val3"));
+ }
+
protected Iterable<?> parseYaml(String yaml) {
return new Yaml().loadAll(new StringReader(yaml));
}
[5/7] brooklyn-server git commit: pom: bump gson to 2.5,
to match jclouds
Posted by he...@apache.org.
pom: bump gson to 2.5, to match jclouds
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/57f5da6b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/57f5da6b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/57f5da6b
Branch: refs/heads/master
Commit: 57f5da6bb02c0f5acc0dc366d82e65e1dda17711
Parents: fdc7d82
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 18 08:51:09 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 18 08:51:09 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/57f5da6b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9734434..30eeaf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
<snakeyaml.version>1.22</snakeyaml.version>
<!-- Next version of swagger requires changes to how path mapping and scanner injection are done. -->
<swagger.version>1.5.6</swagger.version>
- <gson.version>2.3</gson.version>
+ <gson.version>2.5</gson.version>
<mx4j.version>3.0.1</mx4j.version>
<bouncycastle.version>1.51</bouncycastle.version>
<sshj.version>0.20.0</sshj.version>
[4/7] brooklyn-server git commit: pom: bump felix-framework version
to match Kara 4.1.6
Posted by he...@apache.org.
pom: bump felix-framework version to match Kara 4.1.6
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/fdc7d82f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/fdc7d82f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/fdc7d82f
Branch: refs/heads/master
Commit: fdc7d82f6d69d3db956b805e45ec57707709dd5d
Parents: bab742a
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 18 08:49:48 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 18 08:49:48 2018 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/fdc7d82f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f9b5da5..9734434 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,7 +164,7 @@
<!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
<karaf.version>4.1.6</karaf.version>
<karaf.plugin.version>4.1.6</karaf.plugin.version>
- <felix.framework.version>5.6.1</felix.framework.version>
+ <felix.framework.version>5.6.10</felix.framework.version>
<jetty.version>9.3.24.v20180605</jetty.version>
<!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
[3/7] brooklyn-server git commit: pom: remove commons-beanutils
version conflict
Posted by he...@apache.org.
pom: remove commons-beanutils version conflict
camp-brooklyn depended on 1.9.1.
parent pom declared 1.9.3.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bab742a1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bab742a1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bab742a1
Branch: refs/heads/master
Commit: bab742a15ba8ed1ba619cd0698cc0cafe735dacf
Parents: bb86fe3
Author: Aled Sage <al...@gmail.com>
Authored: Tue Sep 18 08:49:20 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 18 08:49:20 2018 +0100
----------------------------------------------------------------------
camp/camp-brooklyn/pom.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bab742a1/camp/camp-brooklyn/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml
index 0a3fa50..f0a5cd2 100644
--- a/camp/camp-brooklyn/pom.xml
+++ b/camp/camp-brooklyn/pom.xml
@@ -84,7 +84,6 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.9.1</version>
<exclusions>
<!-- Dependency versions mismatch between transitive dependencies, declare explicitly -->
<exclusion>
@@ -186,7 +185,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
[2/7] brooklyn-server git commit: tidy pom.xml
Posted by he...@apache.org.
tidy pom.xml
Groups and comments dependencies more sensibly, but does
not change/add/remove any of those dependencies.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/bb86fe38
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/bb86fe38
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/bb86fe38
Branch: refs/heads/master
Commit: bb86fe38f5bc9bf62cc1c65cac19d17d6fbf88cc
Parents: 1769771
Author: Aled Sage <al...@gmail.com>
Authored: Sat Sep 15 22:23:18 2018 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 18 07:49:55 2018 +0100
----------------------------------------------------------------------
pom.xml | 53 +++++++++++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/bb86fe38/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e0b27de..f9b5da5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,18 +128,13 @@
<snakeyaml.version>1.22</snakeyaml.version>
<!-- Next version of swagger requires changes to how path mapping and scanner injection are done. -->
<swagger.version>1.5.6</swagger.version>
- <jansi.version>1.2.1</jansi.version>
<gson.version>2.3</gson.version>
- <ivy.version>2.2.0</ivy.version>
<mx4j.version>3.0.1</mx4j.version>
<bouncycastle.version>1.51</bouncycastle.version>
<sshj.version>0.20.0</sshj.version>
- <felix.framework.version>5.6.1</felix.framework.version>
<reflections.version>0.9.10</reflections.version>
- <jetty.version>9.3.24.v20180605</jetty.version>
<jetty-schemas.version>3.1.M0</jetty-schemas.version>
<airline.version>0.7</airline.version>
- <mockwebserver.version>20121111</mockwebserver.version>
<freemarker.version>2.3.25-incubating</freemarker.version>
<commons-io.version>2.4</commons-io.version>
<jsonPath.version>2.4.0</jsonPath.version>
@@ -147,17 +142,11 @@
<validation-api.version>1.1.0.Final</validation-api.version>
<geronimo-jms_1.1_spec.version>1.1.1</geronimo-jms_1.1_spec.version>
<geronimo-jta_1.1_spec.version>1.1.1</geronimo-jta_1.1_spec.version>
- <sleepycat-je.version>5.0.34</sleepycat-je.version>
- <commons-cli.version>1.2</commons-cli.version>
- <astyanax.version>3.8.0</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>
<jopt.version>4.3</jopt.version>
<javax-servlet.version>3.1.0</javax-servlet.version>
<javax-servlet-jsp.version>2.0</javax-servlet-jsp.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>
@@ -165,38 +154,57 @@
<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>
<jax-rs-api.version>2.0.1</jax-rs-api.version>
<maxmind.version>2.8.0-rc1</maxmind.version>
<maxmind-db.version>1.2.1</maxmind-db.version>
<winrm4j.version>0.5.0</winrm4j.version>
- <karaf.version>4.1.6</karaf.version>
- <karaf.plugin.version>4.1.6</karaf.plugin.version>
<felix-osgi-compendium.version>1.4.0</felix-osgi-compendium.version>
<kubernetes-client.version>1.4.27</kubernetes-client.version>
+
+ <!-- Dependencies shipped with vanilla karaf; update these when we update the karaf version -->
+ <karaf.version>4.1.6</karaf.version>
+ <karaf.plugin.version>4.1.6</karaf.plugin.version>
+ <felix.framework.version>5.6.1</felix.framework.version>
+ <jetty.version>9.3.24.v20180605</jetty.version>
+
<!-- Transitive dependencies, declared explicitly to avoid version mismatch -->
<clojure.version>1.4.0</clojure.version>
- <zookeeper.version>3.3.4</zookeeper.version>
- <ring-core.version>1.1.5</ring-core.version>
<clj-time.version>0.4.1</clj-time.version>
<commons-codec.version>1.9</commons-codec.version>
<log4j.version>1.2.17</log4j.version>
<commons-logging.version>1.2</commons-logging.version>
- <jline.version>2.12</jline.version>
<jsonSmart.version>2.3</jsonSmart.version>
<minidev.accessors-smart.version>1.2</minidev.accessors-smart.version>
- <ow2.asm.version>5.0.4</ow2.asm.version>
+ <ow2.asm.version>5.0.4</ow2.asm.version> <!-- from json-path:2.4.0 and cxf-rt-frontend-jaxws:3.1.10; clashes with 5.2 in karaf:4.1.6 -->
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.version>
<javax.mail.version>1.4.4</javax.mail.version>
<cxf.javax.annotation-api.version>1.2</cxf.javax.annotation-api.version>
+ <plantuml.version>6121</plantuml.version>
+
+ <!-- Test dependencies -->
+ <cobertura.plugin.version>2.7</cobertura.plugin.version>
+ <surefire.version>2.19.1</surefire.version>
<testng.version>6.10</testng.version>
<mockito.version>2.7.12</mockito.version>
<assertj.version>2.2.0</assertj.version> <!-- v 2.2.0 is being used as v 3.20 introduces Java8 dependencies-->
- <cobertura.plugin.version>2.7</cobertura.plugin.version>
- <surefire.version>2.19.1</surefire.version>
- <plantuml.version>6121</plantuml.version>
- <ant.version>1.8.4</ant.version>
+ <hamcrest.version>1.1</hamcrest.version>
+ <mockwebserver.version>20121111</mockwebserver.version>
+
+ <!-- Test dependencies: clients to connect to deployed entities -->
+ <astyanax.version>3.8.0</astyanax.version>
+ <jcouchdb.version>0.11.0-1</jcouchdb.version>
+ <solr.version>4.7.0</solr.version>
+ <zookeeper.version>3.3.4</zookeeper.version>
+ <ring-core.version>1.1.5</ring-core.version>
+
+ <!-- Seemingly unused dependencies! -->
+ <ivy.version>2.2.0</ivy.version>
+ <jline.version>2.12</jline.version>
+ <jansi.version>1.2.1</jansi.version> <!-- Also shipped in vanilla karaf, v1.17.1 in karaf:4.1.6 -->
+ <sleepycat-je.version>5.0.34</sleepycat-je.version>
+ <jcommander.version>1.27</jcommander.version>
+ <commons-cli.version>1.2</commons-cli.version>
<!-- Build Tool Versions -->
<maven-war-plugin.version>2.4</maven-war-plugin.version>
@@ -207,6 +215,7 @@
<jasmine-maven-plugin.version>1.3.1.5</jasmine-maven-plugin.version>
<requirejs-maven-plugin.version>2.0.0</requirejs-maven-plugin.version>
<maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
+ <ant.version>1.8.4</ant.version>
</properties>
[7/7] brooklyn-server git commit: This closes #998
Posted by he...@apache.org.
This closes #998
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e27cc7b6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e27cc7b6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e27cc7b6
Branch: refs/heads/master
Commit: e27cc7b6d7484a949f3508e18fd7f2b87ee17cbe
Parents: 9b859d7 57f5da6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 18 10:51:36 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 18 10:51:36 2018 +0100
----------------------------------------------------------------------
camp/camp-brooklyn/pom.xml | 2 --
pom.xml | 55 ++++++++++++++++++++++++-----------------
2 files changed, 32 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[6/7] brooklyn-server git commit: This closes #997
Posted by he...@apache.org.
This closes #997
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9b859d7a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9b859d7a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9b859d7a
Branch: refs/heads/master
Commit: 9b859d7ae87ca36c9091c41f571a1bc7e1d5ebf3
Parents: 2ec309b 71bf99b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 18 10:42:53 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 18 10:42:53 2018 +0100
----------------------------------------------------------------------
.../brooklyn/util/collections/CollectionMergerTest.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------