Change version to 0.7.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6491c6dc Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6491c6dc Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6491c6dc Branch: refs/heads/0.7.0-incubating Commit: 6491c6dc0143991bdef3dbebb360954f599e3884 Parents: 06bef27 Author: Richard Downer <[email protected]> Authored: Fri Jun 26 14:10:44 2015 +0000 Committer: Richard Downer <[email protected]> Committed: Fri Jun 26 14:10:44 2015 +0000 ---------------------------------------------------------------------- api/pom.xml | 2 +- camp/camp-base/pom.xml | 2 +- camp/camp-server/pom.xml | 2 +- camp/pom.xml | 2 +- core/pom.xml | 2 +- core/src/main/java/brooklyn/BrooklynVersion.java | 2 +- core/src/test/dependencies/osgi/entities/pom.xml | 2 +- core/src/test/dependencies/osgi/more-entities-v1/pom.xml | 2 +- .../test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml | 2 +- core/src/test/dependencies/osgi/more-entities-v2/pom.xml | 2 +- .../test/java/brooklyn/management/osgi/OsgiStandaloneTest.java | 4 ++-- locations/jclouds/pom.xml | 2 +- policy/pom.xml | 2 +- pom.xml | 4 ++-- software/base/pom.xml | 2 +- .../src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java | 2 +- .../base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java | 2 +- .../resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml | 2 +- storage/hazelcast/pom.xml | 2 +- usage/camp/pom.xml | 2 +- usage/cli/pom.xml | 2 +- usage/cli/src/main/resources/brooklyn/default.catalog.bom | 2 +- usage/launcher/pom.xml | 2 +- usage/logback-includes/pom.xml | 2 +- usage/logback-xml/pom.xml | 2 +- usage/rest-api/pom.xml | 2 +- usage/rest-client/pom.xml | 2 +- usage/rest-server/pom.xml | 2 +- usage/test-support/pom.xml | 2 +- utils/common/pom.xml | 2 +- .../src/test/java/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/test-support/pom.xml | 2 +- 36 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index 6ffb988..5065448 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/camp/camp-base/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml index 507831f..9a709be 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index 45c4117..d6dacd0 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/camp/pom.xml ---------------------------------------------------------------------- diff --git a/camp/pom.xml b/camp/pom.xml index afd69eb..41e75e4 100644 --- a/camp/pom.xml +++ b/camp/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index fddcd0a..76c64b6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/src/main/java/brooklyn/BrooklynVersion.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java index aac75e4..04926cf 100644 --- a/core/src/main/java/brooklyn/BrooklynVersion.java +++ b/core/src/main/java/brooklyn/BrooklynVersion.java @@ -69,7 +69,7 @@ public class BrooklynVersion { private static final String OSGI_SHA1_PROPERTY_NAME = "Implementation-SHA-1"; private static final String OSGI_BRANCH_PROPERTY_NAME = "Implementation-Branch"; - private final static String VERSION_FROM_STATIC = "0.7.0-SNAPSHOT"; // BROOKLYN_VERSION + private final static String VERSION_FROM_STATIC = "0.7.0-incubating"; // BROOKLYN_VERSION private static final AtomicReference<Boolean> IS_DEV_ENV = new AtomicReference<Boolean>(); private static final String BROOKLYN_FEATURE_PREFIX = "Brooklyn-Feature-"; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/src/test/dependencies/osgi/entities/pom.xml ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/entities/pom.xml b/core/src/test/dependencies/osgi/entities/pom.xml index 6fa1314..48ede77 100644 --- a/core/src/test/dependencies/osgi/entities/pom.xml +++ b/core/src/test/dependencies/osgi/entities/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/src/test/dependencies/osgi/more-entities-v1/pom.xml ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v1/pom.xml b/core/src/test/dependencies/osgi/more-entities-v1/pom.xml index aab4774..433de6c 100644 --- a/core/src/test/dependencies/osgi/more-entities-v1/pom.xml +++ b/core/src/test/dependencies/osgi/more-entities-v1/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml index 28655c2..1e2c0d6 100644 --- a/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml +++ b/core/src/test/dependencies/osgi/more-entities-v2-evil-twin/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/src/test/dependencies/osgi/more-entities-v2/pom.xml ---------------------------------------------------------------------- diff --git a/core/src/test/dependencies/osgi/more-entities-v2/pom.xml b/core/src/test/dependencies/osgi/more-entities-v2/pom.xml index a29247d..831ce72 100644 --- a/core/src/test/dependencies/osgi/more-entities-v2/pom.xml +++ b/core/src/test/dependencies/osgi/more-entities-v2/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java index 54ecb02..990aa84 100644 --- a/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java +++ b/core/src/test/java/brooklyn/management/osgi/OsgiStandaloneTest.java @@ -126,7 +126,7 @@ public class OsgiStandaloneTest { @Test public void testDuplicateBundle() throws Exception { - MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-SNAPSHOT"); // BROOKLYN_VERSION + MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-incubating"); // BROOKLYN_VERSION String localUrl = MavenRetriever.localUrl(artifact); if ("file".equals(Urls.getProtocol(localUrl))) { helperDuplicateBundle(localUrl); @@ -137,7 +137,7 @@ public class OsgiStandaloneTest { @Test(groups="Integration") public void testRemoteDuplicateBundle() throws Exception { - helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-SNAPSHOT"))); // BROOKLYN_VERSION + helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.7.0-incubating"))); // BROOKLYN_VERSION } public void helperDuplicateBundle(String url) throws Exception { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index 2046ada..fb8ecf6 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/policy/pom.xml ---------------------------------------------------------------------- diff --git a/policy/pom.xml b/policy/pom.xml index 5e6cf85..6c42052 100644 --- a/policy/pom.xml +++ b/policy/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e007484..477817a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <name>Brooklyn Parent Project</name> <description> @@ -121,7 +121,7 @@ <excludedTestGroups>Integration,Acceptance,Live,WIP</excludedTestGroups> <!-- Dependencies --> - <brooklyn.version>0.7.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.7.0-incubating</brooklyn.version> <!-- BROOKLYN_VERSION --> <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- These dependencies also appear in usage/downstream-parent/pom.xml - http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/software/base/pom.xml b/software/base/pom.xml index ba077ce..3315812 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java b/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java index 0a95327..8a6f244 100644 --- a/software/base/src/main/java/brooklyn/entity/brooklynnode/BrooklynNode.java +++ b/software/base/src/main/java/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, "0.7.0-SNAPSHOT"); // BROOKLYN_VERSION + public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.7.0-incubating"); // BROOKLYN_VERSION // Takes precedence over downloadUrl, if non-null @SetFromFlag("distroUploadUrl") http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java index 4a4faf8..b59f232 100644 --- a/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java +++ b/software/base/src/main/java/brooklyn/entity/java/JmxmpSslSupport.java @@ -38,7 +38,7 @@ import com.google.common.base.Preconditions; public class JmxmpSslSupport { - final static String BROOKLYN_VERSION = "0.7.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) + final static String BROOKLYN_VERSION = "0.7.0-incubating"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml ---------------------------------------------------------------------- diff --git a/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml b/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml index 55d09f6..53dee50 100644 --- a/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml +++ b/software/base/src/main/resources/brooklyn/entity/brooklynnode/brooklyn-node.yaml @@ -23,7 +23,7 @@ services: - type: brooklyn.entity.brooklynnode.BrooklynNode ## to use a local file, specify something such as the following: [BROOKLYN_VERSION_BELOW] - # downloadUrl: file:///tmp/brooklyn-dist-0.7.0-SNAPSHOT-dist.tar.gz + # downloadUrl: file:///tmp/brooklyn-dist-0.7.0-incubating-dist.tar.gz ## if deploying to anything other than localhost you must also configure login details, e.g.: # managementUsername: admin http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml index 9fa47b9..d9f2483 100644 --- a/storage/hazelcast/pom.xml +++ b/storage/hazelcast/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/camp/pom.xml ---------------------------------------------------------------------- diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml index 00a46b7..2a25381 100644 --- a/usage/camp/pom.xml +++ b/usage/camp/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/cli/pom.xml ---------------------------------------------------------------------- diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml index 07d65ab..4587dba 100644 --- a/usage/cli/pom.xml +++ b/usage/cli/pom.xml @@ -30,7 +30,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/cli/src/main/resources/brooklyn/default.catalog.bom ---------------------------------------------------------------------- diff --git a/usage/cli/src/main/resources/brooklyn/default.catalog.bom b/usage/cli/src/main/resources/brooklyn/default.catalog.bom index 70c7d57..24e81be 100644 --- a/usage/cli/src/main/resources/brooklyn/default.catalog.bom +++ b/usage/cli/src/main/resources/brooklyn/default.catalog.bom @@ -3,7 +3,7 @@ # and templates to get started using Brooklyn brooklyn.catalog: - version: 0.7.0-SNAPSHOT # BROOKLYN_VERSION + version: 0.7.0-incubating # BROOKLYN_VERSION items: # load everything in the classpath with a @Catalog annotation http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml index 25f5268..0637a75 100644 --- a/usage/launcher/pom.xml +++ b/usage/launcher/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/logback-includes/pom.xml ---------------------------------------------------------------------- diff --git a/usage/logback-includes/pom.xml b/usage/logback-includes/pom.xml index 538ab88..d263398 100644 --- a/usage/logback-includes/pom.xml +++ b/usage/logback-includes/pom.xml @@ -32,7 +32,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/logback-xml/pom.xml ---------------------------------------------------------------------- diff --git a/usage/logback-xml/pom.xml b/usage/logback-xml/pom.xml index 9f84d1f..74cc7a5 100644 --- a/usage/logback-xml/pom.xml +++ b/usage/logback-xml/pom.xml @@ -38,7 +38,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml index c817d53..444c72c 100644 --- a/usage/rest-api/pom.xml +++ b/usage/rest-api/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml index 9149c30..b5b7db2 100644 --- a/usage/rest-client/pom.xml +++ b/usage/rest-client/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml index ae09981..e5db2d0 100644 --- a/usage/rest-server/pom.xml +++ b/usage/rest-server/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/usage/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml index 47dbc60..01d56e7 100644 --- a/usage/test-support/pom.xml +++ b/usage/test-support/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/pom.xml b/utils/common/pom.xml index 746658e..db88880 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java ---------------------------------------------------------------------- diff --git a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java index 09d3a55..3e0bd6d 100644 --- a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java +++ b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java @@ -39,7 +39,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:0.7.0-SNAPSHOT"; // BROOKLYN_VERSION + final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-incubating"; // 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"; @@ -166,7 +166,7 @@ public class MavenArtifactTest { @Test(groups="Integration") public void testRetrievalHostedSnapshotIntegration() throws Exception { MavenArtifact m = MavenArtifact.fromCoordinate( - "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-SNAPSHOT"); // BROOKLYN_VERSION + "org.apache.brooklyn:brooklyn-utils-common:jar:0.7.0-incubating"); // BROOKLYN_VERSION String localPath = new MavenRetriever().getLocalPath(m); File f = new File(localPath); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index ef71f24..501f56d 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/jmx/jmxmp-ssl-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxmp-ssl-agent/pom.xml b/utils/jmx/jmxmp-ssl-agent/pom.xml index 4a74598..dd94ab6 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/jmx/jmxrmi-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml index 3bfd993..62c72b8 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index fbe902d..408c6d6 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>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6491c6dc/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index c57f5fb..2d77431 100644 --- a/utils/test-support/pom.xml +++ b/utils/test-support/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn-parent</artifactId> - <version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.7.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../pom.xml</relativePath> </parent>
