You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2020/01/17 15:48:08 UTC
[brooklyn-server] 01/01: Change version to 1.0.0
This is an automated email from the ASF dual-hosted git repository.
aledsage pushed a commit to branch 1.0.0
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 02d41583f070df8f1d4a04c939136c8ef9a80ff0
Author: Aled Sage <al...@gmail.com>
AuthorDate: Fri Jan 17 15:46:13 2020 +0000
Change version to 1.0.0
---
api/pom.xml | 2 +-
camp/camp-base/pom.xml | 2 +-
camp/camp-brooklyn/pom.xml | 2 +-
camp/camp-server/pom.xml | 2 +-
camp/pom.xml | 2 +-
core/pom.xml | 2 +-
.../main/java/org/apache/brooklyn/core/BrooklynVersion.java | 2 +-
core/src/main/resources/catalog.bom | 4 ++--
.../org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 4 ++--
core/src/test/resources/catalog.bom | 2 +-
karaf/commands/pom.xml | 2 +-
karaf/features/pom.xml | 2 +-
karaf/httpcomponent-extension/pom.xml | 2 +-
karaf/init/pom.xml | 2 +-
karaf/init/src/main/resources/catalog.bom | 10 +++++-----
karaf/jetty-config/pom.xml | 2 +-
karaf/pom.xml | 2 +-
karaf/start/pom.xml | 2 +-
launcher-common/pom.xml | 2 +-
launcher/pom.xml | 2 +-
locations/container/pom.xml | 2 +-
.../container/src/test/resources/generic-application.tests.bom | 2 +-
locations/container/src/test/resources/generic.tests.bom | 4 ++--
locations/jclouds/pom.xml | 2 +-
logging/logback-includes/pom.xml | 2 +-
logging/logback-xml/pom.xml | 2 +-
parent/pom.xml | 2 +-
policy/pom.xml | 2 +-
policy/src/main/resources/catalog.bom | 2 +-
pom.xml | 4 ++--
rest/rest-api/pom.xml | 2 +-
rest/rest-resources/pom.xml | 2 +-
rest/rest-server/pom.xml | 2 +-
server-cli/pom.xml | 2 +-
software/base/pom.xml | 2 +-
.../org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java | 2 +-
.../brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java | 2 +-
.../java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java | 2 +-
software/base/src/main/resources/catalog.bom | 2 +-
software/winrm/pom.xml | 2 +-
test-framework/pom.xml | 2 +-
test-framework/src/main/resources/catalog.bom | 2 +-
test-support/pom.xml | 2 +-
utils/common/dependencies/osgi/com-example-entities/pom.xml | 2 +-
utils/common/dependencies/osgi/entities/pom.xml | 2 +-
utils/common/dependencies/osgi/more-entities-v1/pom.xml | 2 +-
.../dependencies/osgi/more-entities-v2-evil-twin/pom.xml | 2 +-
utils/common/dependencies/osgi/more-entities-v2/pom.xml | 2 +-
utils/common/pom.xml | 2 +-
.../java/org/apache/brooklyn/util/maven/MavenArtifactTest.java | 4 ++--
utils/groovy/pom.xml | 2 +-
utils/jmx/jmxmp-ssl-agent/pom.xml | 2 +-
utils/jmx/jmxrmi-agent/pom.xml | 2 +-
utils/rest-swagger/pom.xml | 2 +-
utils/rt-felix/pom.xml | 2 +-
utils/test-support/pom.xml | 2 +-
56 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 63bd7ec..e7935c2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml
index 4a2aa59..82eff19 100644
--- a/camp/camp-base/pom.xml
+++ b/camp/camp-base/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn.camp</groupId>
<artifactId>camp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/camp/camp-brooklyn/pom.xml b/camp/camp-brooklyn/pom.xml
index f0a5cd2..b39e1ae 100644
--- a/camp/camp-brooklyn/pom.xml
+++ b/camp/camp-brooklyn/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 2a1c32d..2519a61 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn.camp</groupId>
<artifactId>camp-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/camp/pom.xml b/camp/pom.xml
index a0533f6..7ae1f63 100644
--- a/camp/pom.xml
+++ b/camp/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/core/pom.xml b/core/pom.xml
index 69f8772..bec5e40 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
index ed48c98..26e7835 100644
--- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
+++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java
@@ -85,7 +85,7 @@ public class BrooklynVersion implements BrooklynVersionService {
// may be useful:
// private static final String OSGI_BRANCH_PROPERTY_NAME = "Implementation-Branch";
- private final static String VERSION_FROM_STATIC = "1.0.0-SNAPSHOT"; // BROOKLYN_VERSION
+ private final static String VERSION_FROM_STATIC = "1.0.0"; // BROOKLYN_VERSION
private static final AtomicReference<Boolean> IS_DEV_ENV = new AtomicReference<Boolean>();
private static final String BROOKLYN_FEATURE_PREFIX = "Brooklyn-Feature-";
diff --git a/core/src/main/resources/catalog.bom b/core/src/main/resources/catalog.bom
index c617714..48d3ff2 100644
--- a/core/src/main/resources/catalog.bom
+++ b/core/src/main/resources/catalog.bom
@@ -16,7 +16,7 @@
# under the License.
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
items:
- itemType: entity
items:
@@ -166,4 +166,4 @@ brooklyn.catalog:
type: org.apache.brooklyn.enricher.stock.reducer.Reducer
name: Reducer
description: Applies a transformation to a sensor
-
\ No newline at end of file
+
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
index 9c78509..4954024 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java
@@ -69,7 +69,7 @@ public class OsgiStandaloneTest extends OsgiTestBase {
@Test
public void testDuplicateBundle() throws Exception {
- MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.0.0-SNAPSHOT"); // BROOKLYN_VERSION
+ MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.0.0"); // BROOKLYN_VERSION
String localUrl = MavenRetriever.localUrl(artifact);
if ("file".equals(Urls.getProtocol(localUrl))) {
helperDuplicateBundle(localUrl);
@@ -80,7 +80,7 @@ public class OsgiStandaloneTest extends OsgiTestBase {
@Test(groups="Integration")
public void testRemoteDuplicateBundle() throws Exception {
- helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.0.0-SNAPSHOT"))); // BROOKLYN_VERSION
+ helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "1.0.0"))); // BROOKLYN_VERSION
}
public void helperDuplicateBundle(String url) throws Exception {
diff --git a/core/src/test/resources/catalog.bom b/core/src/test/resources/catalog.bom
index 82fd1ec..a38cd20 100644
--- a/core/src/test/resources/catalog.bom
+++ b/core/src/test/resources/catalog.bom
@@ -17,4 +17,4 @@
brooklyn.catalog:
bundle: org.apache.brooklyn.core-tests
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
diff --git a/karaf/commands/pom.xml b/karaf/commands/pom.xml
index 28291d6..8515f14 100644
--- a/karaf/commands/pom.xml
+++ b/karaf/commands/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-karaf</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/features/pom.xml b/karaf/features/pom.xml
index e072a4f..c333ac4 100755
--- a/karaf/features/pom.xml
+++ b/karaf/features/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-karaf</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
</parent>
<artifactId>brooklyn-features</artifactId>
diff --git a/karaf/httpcomponent-extension/pom.xml b/karaf/httpcomponent-extension/pom.xml
index e6cba10..edd38ad 100644
--- a/karaf/httpcomponent-extension/pom.xml
+++ b/karaf/httpcomponent-extension/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-karaf</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/init/pom.xml b/karaf/init/pom.xml
index fca57a8..3833d9f 100644
--- a/karaf/init/pom.xml
+++ b/karaf/init/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/karaf/init/src/main/resources/catalog.bom b/karaf/init/src/main/resources/catalog.bom
index 9652ef0..cfaad39 100644
--- a/karaf/init/src/main/resources/catalog.bom
+++ b/karaf/init/src/main/resources/catalog.bom
@@ -16,10 +16,10 @@
# under the License.
#
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
brooklyn.libraries:
- - mvn:org.apache.brooklyn/brooklyn-core/1.0.0-SNAPSHOT # BROOKLYN_VERSION
- - mvn:org.apache.brooklyn/brooklyn-policy/1.0.0-SNAPSHOT # BROOKLYN_VERSION
- - mvn:org.apache.brooklyn/brooklyn-software-base/1.0.0-SNAPSHOT # BROOKLYN_VERSION
- - mvn:org.apache.brooklyn/brooklyn-test-framework/1.0.0-SNAPSHOT # BROOKLYN_VERSION
+ - mvn:org.apache.brooklyn/brooklyn-core/1.0.0 # BROOKLYN_VERSION
+ - mvn:org.apache.brooklyn/brooklyn-policy/1.0.0 # BROOKLYN_VERSION
+ - mvn:org.apache.brooklyn/brooklyn-software-base/1.0.0 # BROOKLYN_VERSION
+ - mvn:org.apache.brooklyn/brooklyn-test-framework/1.0.0 # BROOKLYN_VERSION
diff --git a/karaf/jetty-config/pom.xml b/karaf/jetty-config/pom.xml
index 382a76a..0842801 100644
--- a/karaf/jetty-config/pom.xml
+++ b/karaf/jetty-config/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-karaf</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index cd26a10..a4a9d90 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.brooklyn</groupId>
<!-- if this depends on brooklyn-server/parent, the usual parent point, then karaf-itest has failures -->
<artifactId>brooklyn-server</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/karaf/start/pom.xml b/karaf/start/pom.xml
index c6bf8bd..c944897 100644
--- a/karaf/start/pom.xml
+++ b/karaf/start/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/launcher-common/pom.xml b/launcher-common/pom.xml
index 34ca534..d2049b9 100644
--- a/launcher-common/pom.xml
+++ b/launcher-common/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/launcher/pom.xml b/launcher/pom.xml
index 7231ea6..06a6bb9 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 7761880..10c6424 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/locations/container/src/test/resources/generic-application.tests.bom b/locations/container/src/test/resources/generic-application.tests.bom
index 699369b..3f657b9 100644
--- a/locations/container/src/test/resources/generic-application.tests.bom
+++ b/locations/container/src/test/resources/generic-application.tests.bom
@@ -47,7 +47,7 @@
##
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
items:
diff --git a/locations/container/src/test/resources/generic.tests.bom b/locations/container/src/test/resources/generic.tests.bom
index 5451075..2e52efd 100644
--- a/locations/container/src/test/resources/generic.tests.bom
+++ b/locations/container/src/test/resources/generic.tests.bom
@@ -16,7 +16,7 @@
# under the License.
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
iconUrl: https://raw.githubusercontent.com/docker-library/docs/471fa6e4cb58062ccbf91afc111980f9c7004981/swarm/logo.png
items:
@@ -57,4 +57,4 @@ brooklyn.catalog:
name: "2.3 Hybrid Multi-Node Application"
brooklyn.children:
- type: deploy-multi-node-app-cluster-to-cloud
- - type: deploy-multi-node-app-cloud-to-cluster
\ No newline at end of file
+ - type: deploy-multi-node-app-cloud-to-cluster
diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml
index 2502285..62142da 100644
--- a/locations/jclouds/pom.xml
+++ b/locations/jclouds/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/logging/logback-includes/pom.xml b/logging/logback-includes/pom.xml
index 41f5dfa..ddf8030 100644
--- a/logging/logback-includes/pom.xml
+++ b/logging/logback-includes/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/logging/logback-xml/pom.xml b/logging/logback-xml/pom.xml
index e5e0f84..38755f7 100644
--- a/logging/logback-xml/pom.xml
+++ b/logging/logback-xml/pom.xml
@@ -38,7 +38,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/parent/pom.xml b/parent/pom.xml
index e1ee753..2faeeeb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/policy/pom.xml b/policy/pom.xml
index 082dbe0..b6111fa 100644
--- a/policy/pom.xml
+++ b/policy/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/policy/src/main/resources/catalog.bom b/policy/src/main/resources/catalog.bom
index 5ff4bbb..53af457 100644
--- a/policy/src/main/resources/catalog.bom
+++ b/policy/src/main/resources/catalog.bom
@@ -16,7 +16,7 @@
# under the License.
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
items:
- itemType: policy
diff --git a/pom.xml b/pom.xml
index d1e77b0..19670a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-server</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<packaging>pom</packaging>
<name>Brooklyn Server Root</name>
@@ -83,7 +83,7 @@
</repositories>
<properties>
- <brooklyn.version>1.0.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION -->
+ <brooklyn.version>1.0.0</brooklyn.version> <!-- BROOKLYN_VERSION -->
<org.osgi.core.version>6.0.0</org.osgi.core.version>
diff --git a/rest/rest-api/pom.xml b/rest/rest-api/pom.xml
index 32b6e89..d4c0550 100644
--- a/rest/rest-api/pom.xml
+++ b/rest/rest-api/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/rest/rest-resources/pom.xml b/rest/rest-resources/pom.xml
index de08210..d3fd94e 100644
--- a/rest/rest-resources/pom.xml
+++ b/rest/rest-resources/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/rest/rest-server/pom.xml b/rest/rest-server/pom.xml
index 3c9442a..ae1c40e 100644
--- a/rest/rest-server/pom.xml
+++ b/rest/rest-server/pom.xml
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/server-cli/pom.xml b/server-cli/pom.xml
index 489401c..9225c35 100644
--- a/server-cli/pom.xml
+++ b/server-cli/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/software/base/pom.xml b/software/base/pom.xml
index 1e66329..b9cb4f7 100644
--- a/software/base/pom.xml
+++ b/software/base/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
index 8ce03d9..a6a8697 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java
@@ -65,7 +65,7 @@ public interface BrooklynNode extends SoftwareProcess, UsesJava {
new TypeToken<Map<String,String>>() {}, "brooklynnode.copytorundir", "URLs of resources to be copied across to the server, giving the path they are to be copied to", MutableMap.<String,String>of());
@SetFromFlag("version")
- public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "1.0.0-SNAPSHOT"); // BROOKLYN_VERSION
+ public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "1.0.0"); // BROOKLYN_VERSION
@SetFromFlag("distroUploadUrl")
public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey(
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
index d41ef8f..522e23c 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java
@@ -130,7 +130,7 @@ public class BrooklynNodeSshDriver extends JavaSoftwareProcessSshDriver implemen
// Need to explicitly give file, because for snapshot URLs you don't get a clean filename from the URL.
// This filename is used to generate the first URL to try: [BROOKLYN_VERSION_BELOW]
- // file://$HOME/.brooklyn/repository/BrooklynNode/1.0.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz
+ // file://$HOME/.brooklyn/repository/BrooklynNode/1.0.0/brooklynnode-0.8.0-snapshot.tar.gz
// (DOWNLOAD_URL overrides this and has a default which comes from maven)
List<String> urls = resolver.getTargets();
String saveAs = resolver.getFilename();
diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java
index 642a2ce..3e2335f 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java
@@ -38,7 +38,7 @@ import com.google.common.base.Preconditions;
public class JmxmpSslSupport {
- final static String BROOKLYN_VERSION = "1.0.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script)
+ final static String BROOKLYN_VERSION = "1.0.0"; // BROOKLYN_VERSION (updated by script)
private final JmxSupport jmxSupport;
diff --git a/software/base/src/main/resources/catalog.bom b/software/base/src/main/resources/catalog.bom
index 620707f..3886002 100644
--- a/software/base/src/main/resources/catalog.bom
+++ b/software/base/src/main/resources/catalog.bom
@@ -16,7 +16,7 @@
# under the License.
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: entity
items:
- id: org.apache.brooklyn.entity.machine.MachineEntity
diff --git a/software/winrm/pom.xml b/software/winrm/pom.xml
index 63f3418..99d9d8c 100644
--- a/software/winrm/pom.xml
+++ b/software/winrm/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
index 240005d..0be84bd 100644
--- a/test-framework/pom.xml
+++ b/test-framework/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>brooklyn-parent</artifactId>
<groupId>org.apache.brooklyn</groupId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/test-framework/src/main/resources/catalog.bom b/test-framework/src/main/resources/catalog.bom
index d2c57ca..8e6efb5 100644
--- a/test-framework/src/main/resources/catalog.bom
+++ b/test-framework/src/main/resources/catalog.bom
@@ -16,7 +16,7 @@
# under the License.
brooklyn.catalog:
- version: "1.0.0-SNAPSHOT" # BROOKLYN_VERSION
+ version: "1.0.0" # BROOKLYN_VERSION
itemType: entity
items:
- id: org.apache.brooklyn.test.framework.TestSshCommand
diff --git a/test-support/pom.xml b/test-support/pom.xml
index 66b6d93..0a8ef9a 100644
--- a/test-support/pom.xml
+++ b/test-support/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/common/dependencies/osgi/com-example-entities/pom.xml b/utils/common/dependencies/osgi/com-example-entities/pom.xml
index 2e19bc7..8251169 100644
--- a/utils/common/dependencies/osgi/com-example-entities/pom.xml
+++ b/utils/common/dependencies/osgi/com-example-entities/pom.xml
@@ -40,7 +40,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/utils/common/dependencies/osgi/entities/pom.xml b/utils/common/dependencies/osgi/entities/pom.xml
index 4bff589..53abf37 100644
--- a/utils/common/dependencies/osgi/entities/pom.xml
+++ b/utils/common/dependencies/osgi/entities/pom.xml
@@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/utils/common/dependencies/osgi/more-entities-v1/pom.xml b/utils/common/dependencies/osgi/more-entities-v1/pom.xml
index 58865fc..ba4460c 100644
--- a/utils/common/dependencies/osgi/more-entities-v1/pom.xml
+++ b/utils/common/dependencies/osgi/more-entities-v1/pom.xml
@@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
index ac743ff..a5afe92 100644
--- a/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
+++ b/utils/common/dependencies/osgi/more-entities-v2-evil-twin/pom.xml
@@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/utils/common/dependencies/osgi/more-entities-v2/pom.xml b/utils/common/dependencies/osgi/more-entities-v2/pom.xml
index 45ca15f..4b2ed4f 100644
--- a/utils/common/dependencies/osgi/more-entities-v2/pom.xml
+++ b/utils/common/dependencies/osgi/more-entities-v2/pom.xml
@@ -35,7 +35,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version><!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version><!-- BROOKLYN_VERSION -->
<relativePath>../../../../../../../parent/pom.xml</relativePath>
</parent>
<dependencies>
diff --git a/utils/common/pom.xml b/utils/common/pom.xml
index ba4865b..6d781e5 100644
--- a/utils/common/pom.xml
+++ b/utils/common/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
index 6f7ccda..df0f922 100644
--- a/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
+++ b/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
@@ -41,7 +41,7 @@ public class MavenArtifactTest {
// only *integration* tests require these to be *installed*;
// note this may vary from machine to machine so version should be aligned with that in parent pom
final static String MAVEN_JAR_PLUGIN_COORDINATE = "org.apache.maven.plugins:maven-jar-plugin:jar:2.6";
- final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:1.0.0-SNAPSHOT"; // BROOKLYN_VERSION
+ final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:1.0.0"; // BROOKLYN_VERSION
// Don't need to be installed, only used as examples
final static String RELEASED_SOURCES_COORDINATE = "io.brooklyn:brooklyn-core:jar:sources:0.6.0";
@@ -248,7 +248,7 @@ public class MavenArtifactTest {
@Test(groups={"Integration","Broken"})
public void testRetrievalHostedSnapshotIntegration() throws Exception {
MavenArtifact m = MavenArtifact.fromCoordinate(
- "org.apache.brooklyn:brooklyn-utils-common:jar:1.0.0-SNAPSHOT"); // BROOKLYN_VERSION
+ "org.apache.brooklyn:brooklyn-utils-common:jar:1.0.0"); // BROOKLYN_VERSION
String localPath = new MavenRetriever().getLocalPath(m);
File f = new File(localPath);
diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml
index 2bda32c..e47f8c8 100644
--- a/utils/groovy/pom.xml
+++ b/utils/groovy/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml
index 958f449..d26fabd 100644
--- a/utils/jmx/jmxmp-ssl-agent/pom.xml
+++ b/utils/jmx/jmxmp-ssl-agent/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml
index 8a96e01..aab4eb0 100644
--- a/utils/jmx/jmxrmi-agent/pom.xml
+++ b/utils/jmx/jmxrmi-agent/pom.xml
@@ -32,7 +32,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml
index 414073c..f22c27f 100644
--- a/utils/rest-swagger/pom.xml
+++ b/utils/rest-swagger/pom.xml
@@ -31,7 +31,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/rt-felix/pom.xml b/utils/rt-felix/pom.xml
index f47f50b..5b8a375 100644
--- a/utils/rt-felix/pom.xml
+++ b/utils/rt-felix/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>
diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml
index 8d4daee..c0d7aca 100644
--- a/utils/test-support/pom.xml
+++ b/utils/test-support/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>1.0.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../parent/pom.xml</relativePath>
</parent>