Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change version to 2.6.0-SNAPSHOT #19

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change version to 2.6.0-SNAPSHOT #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64a8e2f
Change version to 2.6.0-SNAPSHOT
andreaturli Sep 14, 2017
782e8d5
Edit catalog.bom
andreaturli Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions catalog.bom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
3 changes: 2 additions & 1 deletion catalog/etcd/catalog.bom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
brooklyn.catalog:
version: "2.6.0-SNAPSHOT" # BROOKLYN_ETCD_VERSION
items:
- classpath://io.brooklyn.etcd.brooklyn-etcd:etcd/etcd.bom

Expand All @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions catalog/etcd/etcd.bom
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.brooklyn.etcd</groupId>
<artifactId>brooklyn-etcd</artifactId>
<version>2.5.0-SNAPSHOT</version> <!-- BROOKLYN_ETCD_VERSION -->
<version>2.6.0-SNAPSHOT</version> <!-- BROOKLYN_ETCD_VERSION -->
<packaging>bundle</packaging>
<name>Brooklyn Etcd Entities</name>
<description>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/io/brooklyn/entity/nosql/etcd/EtcdNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
public interface EtcdNode extends SoftwareProcess {

@SetFromFlag("version")
ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "2.3.1");
ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(SoftwareProcess.SUGGESTED_VERSION, "3.2.7");

@SetFromFlag("startTimeout")
ConfigKey<Duration> START_TIMEOUT = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.START_TIMEOUT, Duration.minutes(10));
Expand Down Expand Up @@ -67,7 +67,7 @@ public interface EtcdNode extends SoftwareProcess {
/** @since 2.1.0 */
@SetFromFlag("etcdSecurePeer")
ConfigKey<Boolean> SECURE_CLIENT = ConfigKeys.newBooleanConfigKey("etcd.client.secure");

/** @since 2.2.1 */
AttributeSensor<String> CLIENT_SCHEME = Sensors.newStringSensor("etcd.client.scheme", "The scheme for the client URL");

Expand All @@ -84,7 +84,7 @@ public interface EtcdNode extends SoftwareProcess {

AttributeSensor<Boolean> ETCD_NODE_HAS_JOINED_CLUSTER = Sensors.newBooleanSensor(
"etcd.node.nodeHasJoinedCluster", "Flag to indicate whether the etcd node has joined a cluster member");

MethodEffector<Void> JOIN_ETCD_CLUSTER = new MethodEffector<Void>(EtcdNode.class, "joinCluster");
MethodEffector<Void> LEAVE_ETCD_CLUSTER = new MethodEffector<Void>(EtcdNode.class, "leaveCluster");

Expand Down
4 changes: 2 additions & 2 deletions tests/etcd/etcd.tests.bom
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -54,7 +54,7 @@ brooklyn.catalog:
matches: "Hello"

- type: test-case
name: "Etc cluster tests"
name: "Etcd cluster tests"
brooklyn.children:

- type: etcd-cluster
Expand Down