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 2016/02/01 18:43:00 UTC
[1/4] brooklyn-dist git commit: fix change-version to be simpler,
more powerful, and more portable (multiline sed)
Repository: brooklyn-dist
Updated Branches:
refs/heads/0.4.0 [created] 824ad6505
fix change-version to be simpler, more powerful, and more portable (multiline sed)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c2babcdb
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c2babcdb
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c2babcdb
Branch: refs/heads/0.4.0
Commit: c2babcdb6444473c85c103863a9430f3f16dbfec
Parents: 1fdaf1f
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jan 4 15:42:14 2013 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jan 4 17:30:41 2013 +0000
----------------------------------------------------------------------
usage/scripts/change-version.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/c2babcdb/usage/scripts/change-version.sh
----------------------------------------------------------------------
diff --git a/usage/scripts/change-version.sh b/usage/scripts/change-version.sh
index ec0706f..b56f811 100755
--- a/usage/scripts/change-version.sh
+++ b/usage/scripts/change-version.sh
@@ -36,16 +36,19 @@ done
echo "One-line pattern changed these files: $FILES1"
-# or two-lines (where we only have entire-line comments, used on the line before the version) matching
+# or two-lines for situations where comments must be entire-line (e.g. scripts)
+# put the comment on the line before the version
+# using sed as per http://blog.ergatides.com/2012/01/24/using-sed-to-search-and-replace-contents-of-next-line-in-a-file/
+# to match:
# ... BROOKLYN_VERSION_BELOW ...
# ... ${CURRENT_VERSION} ...
FILES2=`pcregrep $GREP_ARGS -M "${LABEL2}.*\n.*${CURRENT_VERSION}" .`
for x in $FILES2 ; do
- sed -n -i .bak '1h; 1!H; ${ g; s/'"${LABEL2}"'\([^\n]*\n[^\n]*\)'"${CURRENT_VERSION}"'/'"${LABEL2}"'\1'"${NEW_VERSION}"'/g p }' $x
+ sed -i .bak -e '/'"${LABEL2}"'/{n;s/'"${CURRENT_VERSION}"'/'"${NEW_VERSION}"'/g;}' $x
done
echo "Two-line pattern changed these files: $FILES2"
echo "Changed ${CURRENT_VERSION} to ${NEW_VERSION} for "`echo $FILES1 $FILES2 | wc | awk '{print $2}'`" files"
-
+echo "(Do a \`find . -name \"*.bak\" -delete\` to delete the backup files.)"
[3/4] brooklyn-dist git commit: brooklyn-dist should be in a
directory named for the current version,
not hanging off the root (backport cherry-pick from master)
Posted by he...@apache.org.
brooklyn-dist should be in a directory named for the current version, not hanging off the root
(backport cherry-pick from master)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/44a5392a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/44a5392a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/44a5392a
Branch: refs/heads/0.4.0
Commit: 44a5392a1dc6301ceb6b3d8d9225e42cdf6d4a7f
Parents: 988a8d8
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jan 8 13:49:55 2013 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Jan 14 16:50:52 2013 +0000
----------------------------------------------------------------------
usage/dist/src/main/config/build-distribution-archive.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/44a5392a/usage/dist/src/main/config/build-distribution-archive.xml
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/config/build-distribution-archive.xml b/usage/dist/src/main/config/build-distribution-archive.xml
index 32334de..e77f036 100644
--- a/usage/dist/src/main/config/build-distribution-archive.xml
+++ b/usage/dist/src/main/config/build-distribution-archive.xml
@@ -3,7 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>dist</id>
- <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>tar.gz</format>
<format>zip</format>
[4/4] brooklyn-dist git commit: version changed to 0.4.0 for release
(final)
Posted by he...@apache.org.
version changed to 0.4.0 for release (final)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/824ad650
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/824ad650
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/824ad650
Branch: refs/heads/0.4.0
Commit: 824ad6505799c63ca0b56f6dbb730569983e7794
Parents: 44a5392
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jan 16 11:31:00 2013 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jan 16 11:31:00 2013 +0000
----------------------------------------------------------------------
usage/all/pom.xml | 2 +-
usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java | 2 +-
usage/dist/pom.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/824ad650/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 3fb6027..46ca45b 100644
--- a/usage/all/pom.xml
+++ b/usage/all/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.4.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.4.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/824ad650/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java b/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
index 99ea563..c1e2a89 100644
--- a/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
+++ b/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
@@ -13,7 +13,7 @@ import brooklyn.entity.basic.AbstractApplication;
public class CliIntegrationTest {
// FIXME: this should not be hardcoded
- String brooklynBinPath = "../dist/target/brooklyn-0.4.0-SNAPSHOT-dist/brooklyn/bin/"; // BROOKLYN_VERSION
+ String brooklynBinPath = "../dist/target/brooklyn-0.4.0-dist/brooklyn/bin/"; // BROOKLYN_VERSION
// Helper function used in testing
private String convertStreamToString(InputStream is) {
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/824ad650/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index 5ad5c20..2c0b921 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>io.brooklyn</groupId>
<artifactId>brooklyn-parent</artifactId>
- <version>0.4.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.4.0</version> <!-- BROOKLYN_VERSION -->
<relativePath>../../pom.xml</relativePath>
</parent>
[2/4] brooklyn-dist git commit: various files which required
additional annotations or manual changes for version updates
Posted by he...@apache.org.
various files which required additional annotations or manual changes for version updates
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/988a8d81
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/988a8d81
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/988a8d81
Branch: refs/heads/0.4.0
Commit: 988a8d81f75a3d1d0a3207dd0b04a2a83b829c91
Parents: c2babcd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jan 4 15:56:46 2013 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jan 4 22:50:52 2013 +0000
----------------------------------------------------------------------
usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/988a8d81/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
----------------------------------------------------------------------
diff --git a/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java b/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
index 04939da..99ea563 100644
--- a/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
+++ b/usage/cli/src/test/java/brooklyn/cli/CliIntegrationTest.java
@@ -13,7 +13,7 @@ import brooklyn.entity.basic.AbstractApplication;
public class CliIntegrationTest {
// FIXME: this should not be hardcoded
- String brooklynBinPath = "../dist/target/brooklyn-0.4.0-SNAPSHOT-dist/brooklyn/bin/";
+ String brooklynBinPath = "../dist/target/brooklyn-0.4.0-SNAPSHOT-dist/brooklyn/bin/"; // BROOKLYN_VERSION
// Helper function used in testing
private String convertStreamToString(InputStream is) {