You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/12/23 12:07:23 UTC
[60/71] [abbrv] incubator-brooklyn git commit: [SPLITPREP] apply
version reversion in missed places,
and add BROOKLY_VERSION label for script to work in future
[SPLITPREP] apply version reversion in missed places, and add BROOKLY_VERSION label for script to work in future
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/22642206
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/22642206
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/22642206
Branch: refs/heads/master
Commit: 226422063afcf18eea89f4424e0989d74e8592d5
Parents: 2ee1781
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 21 12:29:32 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Dec 21 16:43:40 2015 +0000
----------------------------------------------------------------------
brooklyn-docs/website/meta/versions.md | 4 +--
brooklyn-library/software/webapp/pom.xml | 2 +-
.../features/src/main/history/dependencies.xml | 32 ++++++++++----------
.../brooklyn/util/maven/MavenArtifactTest.java | 2 +-
4 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22642206/brooklyn-docs/website/meta/versions.md
----------------------------------------------------------------------
diff --git a/brooklyn-docs/website/meta/versions.md b/brooklyn-docs/website/meta/versions.md
index 2c0eaa5..4e704f4 100644
--- a/brooklyn-docs/website/meta/versions.md
+++ b/brooklyn-docs/website/meta/versions.md
@@ -41,11 +41,11 @@ This code has not been voted on and are not endorsed by The Apache Software Foun
Documentation for these versions are uploaded from time to time,
and are provided here for reference:
-* **[0.9.SPLITWIP-SNAPSHOT](/v/0.9.SPLITWIP-SNAPSHOT/)**: latest unreleased version
+* **[0.9.0-SNAPSHOT](/v/0.9.0-SNAPSHOT/)**: latest unreleased version
(although docs may not be up-to-date with the latest code)
* **[0.8.0-SNAPSHOT](/v/0.8.0-SNAPSHOT/)**: any changes since 0.8.0-incubating which would go into 0.8.1
-(mainly things from 0.9.SPLITWIP-SNAPSHOT which warranted being backported)
+(mainly things from 0.9.0-SNAPSHOT which warranted being backported)
* **[0.7.0-SNAPSHOT](/v/0.7.0-SNAPSHOT/)**: any changes since 0.7.0-incubating which would go into 0.7.1
(mainly things from 0.8.0-SNAPSHOT which warranted being backported)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22642206/brooklyn-library/software/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/brooklyn-library/software/webapp/pom.xml b/brooklyn-library/software/webapp/pom.xml
index b6cbe14..434e808 100644
--- a/brooklyn-library/software/webapp/pom.xml
+++ b/brooklyn-library/software/webapp/pom.xml
@@ -164,7 +164,7 @@
<dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-camp</artifactId>
- <version>0.9.SPLITWIP-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22642206/brooklyn-server/karaf/features/src/main/history/dependencies.xml
----------------------------------------------------------------------
diff --git a/brooklyn-server/karaf/features/src/main/history/dependencies.xml b/brooklyn-server/karaf/features/src/main/history/dependencies.xml
index a24aa5b..2bcbdca 100644
--- a/brooklyn-server/karaf/features/src/main/history/dependencies.xml
+++ b/brooklyn-server/karaf/features/src/main/history/dependencies.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="org.apache.brooklyn-0.9.SPLITWIP-SNAPSHOT">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" name="org.apache.brooklyn-0.9.0-SNAPSHOT"> <!-- BROOKLYN_VERSION -->
<feature version="0.0.0">
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
<feature prerequisite="false" dependency="false">brooklyn-api</feature>
@@ -57,21 +57,21 @@
<bundle>mvn:net.minidev/asm/1.0.2</bundle>
<bundle>mvn:net.minidev/json-smart/2.1.1</bundle>
<bundle>mvn:net.schmizz/sshj/0.8.1</bundle>
- <bundle>mvn:org.apache.brooklyn.camp/camp-base/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn.camp/camp-server/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-api/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-camp/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/0.9.SPLITWIP-SNAPSHOT/war</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.SPLITWIP-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.SPLITWIP-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.brooklyn.camp/camp-base/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn.camp/camp-server/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-api/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-camp/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-commands/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-core/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-jsgui/0.9.0-SNAPSHOT/war</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-logback-includes/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-api/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rest-server/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-rt-osgi/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-common/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-groovy/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
+ <bundle>mvn:org.apache.brooklyn/brooklyn-utils-rest-swagger/0.9.0-SNAPSHOT</bundle> <!-- BROOKLYN_VERSION -->
<bundle>mvn:org.apache.commons/commons-compress/1.4</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/3.1</bundle>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/22642206/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java b/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
index ae9d5bd..a713bb3 100644
--- a/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
+++ b/brooklyn-server/utils/common/src/test/java/org/apache/brooklyn/util/maven/MavenArtifactTest.java
@@ -210,7 +210,7 @@ public class MavenArtifactTest {
/*
Exception java.lang.AssertionError
- Message: Could not load /home/ubuntu/.m2/repository/org/apache/brooklyn/brooklyn-utils-common/0.9.SPLITWIP-SNAPSHOT/brooklyn-utils-common-0.9.SPLITWIP-SNAPSHOT.jar when testing MavenRetriever: do a maven build with no integration tests first to ensure this is installed, then rerun
+ Message: Could not load /home/ubuntu/.m2/repository/org/apache/brooklyn/brooklyn-utils-common/(version)/brooklyn-utils-common-(version)-SNAPSHOT.jar when testing MavenRetriever: do a maven build with no integration tests first to ensure this is installed, then rerun
Stacktrace: