Change version to 0.8.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/aa66c2b2 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/aa66c2b2 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/aa66c2b2 Branch: refs/heads/0.8.0-incubating Commit: aa66c2b2310e40f199e1e42dcea6480b4b0dc15f Parents: f54ab75 Author: Alex Heneveld <[email protected]> Authored: Tue Sep 1 17:08:16 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Sep 1 17:08:16 2015 +0100 ---------------------------------------------------------------------- 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/org/apache/brooklyn/core/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 +- .../org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java | 4 ++-- locations/jclouds/pom.xml | 2 +- parent/pom.xml | 4 ++-- policy/pom.xml | 2 +- pom.xml | 4 ++-- 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 +- storage/hazelcast/pom.xml | 2 +- usage/camp/pom.xml | 2 +- usage/cli/README.md | 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 +- .../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/test-support/pom.xml | 2 +- 38 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/api/pom.xml ---------------------------------------------------------------------- diff --git a/api/pom.xml b/api/pom.xml index 1794a1f..1ab01bc 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/camp/camp-base/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-base/pom.xml b/camp/camp-base/pom.xml index b6e4aff..e818d09 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/camp/camp-server/pom.xml ---------------------------------------------------------------------- diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml index ac0d769..6134fa4 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/camp/pom.xml ---------------------------------------------------------------------- diff --git a/camp/pom.xml b/camp/pom.xml index d32061a..dc773c7 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index f38b995..794cd33 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java ---------------------------------------------------------------------- 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 d8454ce..5319316 100644 --- a/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java +++ b/core/src/main/java/org/apache/brooklyn/core/BrooklynVersion.java @@ -71,7 +71,7 @@ public class BrooklynVersion { // may be useful: // private static final String OSGI_BRANCH_PROPERTY_NAME = "Implementation-Branch"; - private final static String VERSION_FROM_STATIC = "0.8.0-SNAPSHOT"; // BROOKLYN_VERSION + private final static String VERSION_FROM_STATIC = "0.8.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/aa66c2b2/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 1bab253..165c560 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/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 75fb76a..9f15a22 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/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 0b01b53..c2b24a3 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/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 0b01b53..c2b24a3 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../../../../../parent/pom.xml</relativePath> </parent> <dependencies> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/core/src/test/java/org/apache/brooklyn/core/mgmt/osgi/OsgiStandaloneTest.java ---------------------------------------------------------------------- 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 cffb432..6a9a85c 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 @@ -125,7 +125,7 @@ public class OsgiStandaloneTest { @Test public void testDuplicateBundle() throws Exception { - MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.8.0-SNAPSHOT"); // BROOKLYN_VERSION + MavenArtifact artifact = new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.8.0-incubating"); // BROOKLYN_VERSION String localUrl = MavenRetriever.localUrl(artifact); if ("file".equals(Urls.getProtocol(localUrl))) { helperDuplicateBundle(localUrl); @@ -136,7 +136,7 @@ public class OsgiStandaloneTest { @Test(groups="Integration") public void testRemoteDuplicateBundle() throws Exception { - helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.8.0-SNAPSHOT"))); // BROOKLYN_VERSION + helperDuplicateBundle(MavenRetriever.hostedUrl(new MavenArtifact("org.apache.brooklyn", "brooklyn-api", "jar", "0.8.0-incubating"))); // BROOKLYN_VERSION } public void helperDuplicateBundle(String url) throws Exception { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/locations/jclouds/pom.xml ---------------------------------------------------------------------- diff --git a/locations/jclouds/pom.xml b/locations/jclouds/pom.xml index db6ff97..a0297e8 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 89aebb1..81358dd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn</artifactId> - <version>0.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> </parent> <artifactId>brooklyn-parent</artifactId> @@ -67,7 +67,7 @@ <surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests> <!-- Dependencies --> - <brooklyn.version>0.8.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.8.0-incubating</brooklyn.version> <!-- BROOKLYN_VERSION --> <jclouds.groupId>org.apache.jclouds</jclouds.groupId> <!-- JCLOUDS_GROUPID_VERSION --> <!-- These dependencies also appear in usage/downstream-parent/pom.xml - http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/policy/pom.xml ---------------------------------------------------------------------- diff --git a/policy/pom.xml b/policy/pom.xml index 96c51da..201421d 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0f1ba1c..7dce068 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <groupId>org.apache.brooklyn</groupId> <artifactId>brooklyn</artifactId> - <version>0.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <packaging>pom</packaging> <name>Brooklyn Root</name> @@ -76,7 +76,7 @@ <java.version>1.7</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - <brooklyn.version>0.8.0-SNAPSHOT</brooklyn.version> <!-- BROOKLYN_VERSION --> + <brooklyn.version>0.8.0-incubating</brooklyn.version> <!-- BROOKLYN_VERSION --> </properties> <modules> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/software/base/pom.xml ---------------------------------------------------------------------- diff --git a/software/base/pom.xml b/software/base/pom.xml index d7d52f2..369b9be 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNode.java ---------------------------------------------------------------------- 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 b668e1b..9dc92e5 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, "0.8.0-SNAPSHOT"); // BROOKLYN_VERSION + public static final ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(BrooklynConfigKeys.SUGGESTED_VERSION, "0.8.0-incubating"); // BROOKLYN_VERSION @SetFromFlag("distroUploadUrl") public static final ConfigKey<String> DISTRO_UPLOAD_URL = ConfigKeys.newStringConfigKey( http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/software/base/src/main/java/org/apache/brooklyn/entity/brooklynnode/BrooklynNodeSshDriver.java ---------------------------------------------------------------------- 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 e862df8..34c74d9 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 @@ -128,7 +128,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/0.8.0-SNAPSHOT/brooklynnode-0.8.0-snapshot.tar.gz + // file://$HOME/.brooklyn/repository/BrooklynNode/0.8.0-incubating/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(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/software/base/src/main/java/org/apache/brooklyn/entity/java/JmxmpSslSupport.java ---------------------------------------------------------------------- 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 36d1773..53b16db 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 = "0.8.0-SNAPSHOT"; // BROOKLYN_VERSION (updated by script) + final static String BROOKLYN_VERSION = "0.8.0-incubating"; // BROOKLYN_VERSION (updated by script) private final JmxSupport jmxSupport; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/storage/hazelcast/pom.xml ---------------------------------------------------------------------- diff --git a/storage/hazelcast/pom.xml b/storage/hazelcast/pom.xml index 2264d5a..1bfaa76 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/camp/pom.xml ---------------------------------------------------------------------- diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml index 34da33c..f06014e 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/cli/README.md ---------------------------------------------------------------------- diff --git a/usage/cli/README.md b/usage/cli/README.md index f7a07ec..a9480ec 100644 --- a/usage/cli/README.md +++ b/usage/cli/README.md @@ -86,4 +86,4 @@ software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations -under the License. \ No newline at end of file +under the License. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/cli/pom.xml ---------------------------------------------------------------------- diff --git a/usage/cli/pom.xml b/usage/cli/pom.xml index 48fd1ea..230232f 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/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 54e46fd..857e857 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.8.0-SNAPSHOT # BROOKLYN_VERSION + version: 0.8.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/aa66c2b2/usage/launcher/pom.xml ---------------------------------------------------------------------- diff --git a/usage/launcher/pom.xml b/usage/launcher/pom.xml index cfd51c7..8443ea7 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/logback-includes/pom.xml ---------------------------------------------------------------------- diff --git a/usage/logback-includes/pom.xml b/usage/logback-includes/pom.xml index 00f7bd9..7dc9b85 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/logback-xml/pom.xml ---------------------------------------------------------------------- diff --git a/usage/logback-xml/pom.xml b/usage/logback-xml/pom.xml index b2090de..876bed2 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/rest-api/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-api/pom.xml b/usage/rest-api/pom.xml index 30afed9..9f892fe 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/rest-client/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-client/pom.xml b/usage/rest-client/pom.xml index 51d70be..ba091cb 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/rest-server/pom.xml ---------------------------------------------------------------------- diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml index d3a7e2d..5e83c13 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.8.0-SNAPSHOT</version><!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version><!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/usage/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/usage/test-support/pom.xml b/usage/test-support/pom.xml index ff9227d..3e19d3e 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/utils/common/pom.xml ---------------------------------------------------------------------- diff --git a/utils/common/pom.xml b/utils/common/pom.xml index c252fb0..10c5bd3 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java ---------------------------------------------------------------------- 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 dae6d9d..942f575 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:0.8.0-SNAPSHOT"; // BROOKLYN_VERSION + final static String THIS_PROJECT_COORDINATE = "org.apache.brooklyn:brooklyn-utils-common:jar:0.8.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"; @@ -168,7 +168,7 @@ public class MavenArtifactTest { @Test(groups="Integration") public void testRetrievalHostedSnapshotIntegration() throws Exception { MavenArtifact m = MavenArtifact.fromCoordinate( - "org.apache.brooklyn:brooklyn-utils-common:jar:0.8.0-SNAPSHOT"); // BROOKLYN_VERSION + "org.apache.brooklyn:brooklyn-utils-common:jar:0.8.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/aa66c2b2/utils/groovy/pom.xml ---------------------------------------------------------------------- diff --git a/utils/groovy/pom.xml b/utils/groovy/pom.xml index dc99f54..5fac3f6 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/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 77b5e41..511e578 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/utils/jmx/jmxrmi-agent/pom.xml ---------------------------------------------------------------------- diff --git a/utils/jmx/jmxrmi-agent/pom.xml b/utils/jmx/jmxrmi-agent/pom.xml index d725405..6cd7510 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/utils/rest-swagger/pom.xml ---------------------------------------------------------------------- diff --git a/utils/rest-swagger/pom.xml b/utils/rest-swagger/pom.xml index 64326e2..a9acf40 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.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/aa66c2b2/utils/test-support/pom.xml ---------------------------------------------------------------------- diff --git a/utils/test-support/pom.xml b/utils/test-support/pom.xml index 1fa064e..6f17b12 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>0.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION --> + <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION --> <relativePath>../../parent/pom.xml</relativePath> </parent>
