From 64a8e2fe62d934582c4e794f42cdd6dbce237bb7 Mon Sep 17 00:00:00 2001 From: Andrea Turli Date: Thu, 14 Sep 2017 20:57:59 +0200 Subject: [PATCH 1/2] Change version to 2.6.0-SNAPSHOT - bump etcd version to 3.2.7 --- catalog.bom | 4 ++-- catalog/etcd/catalog.bom | 3 ++- catalog/etcd/etcd.bom | 4 ++-- pom.xml | 2 +- src/main/java/io/brooklyn/entity/nosql/etcd/EtcdNode.java | 6 +++--- tests/etcd/etcd.tests.bom | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/catalog.bom b/catalog.bom index cc9c5e9..db14921 100644 --- a/catalog.bom +++ b/catalog.bom @@ -1,5 +1,5 @@ brooklyn.catalog: - version: "2.5.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION + version: "2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION iconUrl: classpath://io.brooklyn.etcd.brooklyn-etcd:icons/etcd.png description: | CoreOS etcd is an open-source distributed key-value store that serves as @@ -11,7 +11,7 @@ brooklyn.catalog: overview: README.md brooklyn.libraries: - - "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.etcd&a=brooklyn-etcd&v=2.5.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION + - "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.etcd&a=brooklyn-etcd&v=2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION items: - classpath://io.brooklyn.etcd.brooklyn-etcd:etcd/catalog.bom diff --git a/catalog/etcd/catalog.bom b/catalog/etcd/catalog.bom index 632ecb3..8d607a4 100644 --- a/catalog/etcd/catalog.bom +++ b/catalog/etcd/catalog.bom @@ -1,4 +1,5 @@ brooklyn.catalog: + version: "2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION items: - classpath://io.brooklyn.etcd.brooklyn-etcd:etcd/etcd.bom @@ -19,7 +20,7 @@ brooklyn.catalog: description: | The version of etcd to install type: string - default: "2.3.1" + default: "3.2.7" - name: etcd.client.port label: Etcd Client Port description: | diff --git a/catalog/etcd/etcd.bom b/catalog/etcd/etcd.bom index 899b584..063d1e7 100644 --- a/catalog/etcd/etcd.bom +++ b/catalog/etcd/etcd.bom @@ -1,5 +1,5 @@ brooklyn.catalog: - version: "2.5.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION + version: "2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION iconUrl: classpath://io.brooklyn.etcd.brooklyn-etcd:icons/etcd.png description: | CoreOS etcd is an open-source distributed key-value store that serves as @@ -29,7 +29,7 @@ brooklyn.catalog: description: | The version of etcd to install type: string - default: "2.3.1" + default: "3.2.7" - name: etcd.client.port label: Etcd Client Port description: | diff --git a/pom.xml b/pom.xml index 4989c65..fed3731 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 io.brooklyn.etcd brooklyn-etcd - 2.5.0-SNAPSHOT + 2.6.0-SNAPSHOT bundle Brooklyn Etcd Entities diff --git a/src/main/java/io/brooklyn/entity/nosql/etcd/EtcdNode.java b/src/main/java/io/brooklyn/entity/nosql/etcd/EtcdNode.java index 32439b4..e1e44a3 100644 --- a/src/main/java/io/brooklyn/entity/nosql/etcd/EtcdNode.java +++ b/src/main/java/io/brooklyn/entity/nosql/etcd/EtcdNode.java @@ -38,7 +38,7 @@ public interface EtcdNode extends SoftwareProcess { @SetFromFlag("version") - ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "2.3.1"); + ConfigKey SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "3.2.7"); @SetFromFlag("startTimeout") ConfigKey START_TIMEOUT = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.START_TIMEOUT, Duration.minutes(10)); @@ -67,7 +67,7 @@ public interface EtcdNode extends SoftwareProcess { /** @since 2.1.0 */ @SetFromFlag("etcdSecurePeer") ConfigKey SECURE_CLIENT = ConfigKeys.newBooleanConfigKey("etcd.client.secure"); - + /** @since 2.2.1 */ AttributeSensor CLIENT_SCHEME = Sensors.newStringSensor("etcd.client.scheme", "The scheme for the client URL"); @@ -84,7 +84,7 @@ public interface EtcdNode extends SoftwareProcess { AttributeSensor ETCD_NODE_HAS_JOINED_CLUSTER = Sensors.newBooleanSensor( "etcd.node.nodeHasJoinedCluster", "Flag to indicate whether the etcd node has joined a cluster member"); - + MethodEffector JOIN_ETCD_CLUSTER = new MethodEffector(EtcdNode.class, "joinCluster"); MethodEffector LEAVE_ETCD_CLUSTER = new MethodEffector(EtcdNode.class, "leaveCluster"); diff --git a/tests/etcd/etcd.tests.bom b/tests/etcd/etcd.tests.bom index 89ee9c7..a7ac3b4 100644 --- a/tests/etcd/etcd.tests.bom +++ b/tests/etcd/etcd.tests.bom @@ -2,7 +2,7 @@ brooklyn.catalog: items: - "https://github.com/brooklyncentral/common-catalog-utils/releases/download/v0.1.0/common.tests.bom" - id: etcd-cluster-tests - version: "2.5.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION + version: "2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION iconUrl: classpath://io.brooklyn.etcd.brooklyn-etcd:icons/etcd.png name: "Etcd cluster and single node tests" license_code: APACHE-2.0 @@ -54,7 +54,7 @@ brooklyn.catalog: matches: "Hello" - type: test-case - name: "Etc cluster tests" + name: "Etcd cluster tests" brooklyn.children: - type: etcd-cluster From 782e8d5c10ff704a627b755e3aa8a78f94cf7e51 Mon Sep 17 00:00:00 2001 From: Andrea Turli Date: Fri, 15 Sep 2017 11:59:40 +0200 Subject: [PATCH 2/2] Edit catalog.bom - remove brooklyn.libraries - point to latest etcd/etc.bom file in Sonatype --- catalog.bom | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/catalog.bom b/catalog.bom index db14921..2904b2e 100644 --- a/catalog.bom +++ b/catalog.bom @@ -10,8 +10,5 @@ brooklyn.catalog: license_url: http://www.apache.org/licenses/LICENSE-2.0.txt overview: README.md - brooklyn.libraries: - - "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.etcd&a=brooklyn-etcd&v=2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION - items: - - classpath://io.brooklyn.etcd.brooklyn-etcd:etcd/catalog.bom + - "https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=io.brooklyn.etcd&a=brooklyn-etcd&v=2.6.0-SNAPSHOT&p=bom&c=etcd" # BROOKLYN_ETCD_VERSION