You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2018/09/11 23:00:52 UTC
[1/6] brooklyn-dist git commit: Bug fix in release/environment.sh -
error in argument parsing
Repository: brooklyn-dist
Updated Branches:
refs/heads/1.0.0-M1 5213b6b2a -> 644ff07f0
Bug fix in release/environment.sh - error in argument parsing
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/a175e4dd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/a175e4dd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/a175e4dd
Branch: refs/heads/1.0.0-M1
Commit: a175e4dd81828857f0afef821ac58acea1d70e5f
Parents: 5213b6b
Author: Richard Downer <ri...@apache.org>
Authored: Fri Sep 7 11:14:15 2018 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Sep 7 11:14:15 2018 +0000
----------------------------------------------------------------------
release/environment.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a175e4dd/release/environment.sh
----------------------------------------------------------------------
diff --git a/release/environment.sh b/release/environment.sh
index 47f3280..5609839 100755
--- a/release/environment.sh
+++ b/release/environment.sh
@@ -53,7 +53,7 @@ END
# Argument parsing
rc_suffix=
OPTIND=1
-while getopts "h?v:r:c:" opt; do
+while getopts "h?v:r:c:d:" opt; do
case "$opt" in
h|\?)
show_help
[4/6] brooklyn-dist git commit: Release build with maven needs
scmBranch and buildNumber constants
Posted by ri...@apache.org.
Release build with maven needs scmBranch and buildNumber constants
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/0bdb6af3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/0bdb6af3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/0bdb6af3
Branch: refs/heads/1.0.0-M1
Commit: 0bdb6af302a4a8065f10818290cc9abfb3d3ccd5
Parents: 0f7dbef
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 11 22:57:46 2018 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 11 22:57:46 2018 +0000
----------------------------------------------------------------------
release/make-release-artifacts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/0bdb6af3/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 753f37c..9a86225 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -199,9 +199,9 @@ mkdir -p ${bin_staging_dir}
# Perform the build
if [ -z "${dry_run}" ]; then
- ( cd ${src_staging_dir} && mvn deploy -Papache-release -DskipTests )
+ ( cd ${src_staging_dir} && mvn deploy -Papache-release -DskipTests -DscmBranch="${current_version}" -DbuildNumber=release )
else
- ( cd ${src_staging_dir} && mvn install -Papache-release -DskipTests )
+ ( cd ${src_staging_dir} && mvn install -Papache-release -DskipTests -DscmBranch="${current_version}" -DbuildNumber=release )
fi
# Re-pack the archive with the correct names
[2/6] brooklyn-dist git commit: Run main release build with
-DskipTests
Posted by ri...@apache.org.
Run main release build with -DskipTests
Assumes that a build with tests has already been done elsewhere.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/fc374c08
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/fc374c08
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/fc374c08
Branch: refs/heads/1.0.0-M1
Commit: fc374c08eb9245b9e8e015974850b22e078da0b1
Parents: a175e4d
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 11 12:07:14 2018 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 11 12:07:14 2018 +0000
----------------------------------------------------------------------
release/make-release-artifacts.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/fc374c08/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 9f804ee..1f8f06d 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -200,9 +200,9 @@ mkdir -p ${bin_staging_dir}
# Perform the build
if [ -z "${dry_run}" ]; then
- ( cd ${src_staging_dir} && mvn deploy -Papache-release )
+ ( cd ${src_staging_dir} && mvn deploy -Papache-release -DskipTests )
else
- ( cd ${src_staging_dir} && mvn install -Papache-release )
+ ( cd ${src_staging_dir} && mvn install -Papache-release -DskipTests )
fi
# Re-pack the archive with the correct names
[5/6] brooklyn-dist git commit: Fix name of RPM package
Posted by ri...@apache.org.
Fix name of RPM package
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/5f942563
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/5f942563
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/5f942563
Branch: refs/heads/1.0.0-M1
Commit: 5f9425636826c97865225eab1b61e8e9599c01a9
Parents: 0bdb6af
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 11 22:58:04 2018 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 11 22:58:04 2018 +0000
----------------------------------------------------------------------
release/make-release-artifacts.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/5f942563/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 9a86225..298ea81 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -259,7 +259,7 @@ mv ${bin_staging_dir}/brooklyn-vagrant-${current_version} ${bin_staging_dir}/${r
###############################################################################
# RPM artifacts
-cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn-noarch/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${artifact_name}-1.noarch.rpm
+cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn-noarch/RPMS/noarch/apache-brooklyn-${current_version}_1.noarch.rpm ${artifact_dir}/${artifact_name}_1.noarch.rpm
###############################################################################
# deb artifacts
[6/6] brooklyn-dist git commit: Do not generate MD5 and SHA1
checksums (only SHA256 + PGP signature) - see BROOKLYN-597
Posted by ri...@apache.org.
Do not generate MD5 and SHA1 checksums (only SHA256 + PGP signature) - see BROOKLYN-597
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/644ff07f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/644ff07f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/644ff07f
Branch: refs/heads/1.0.0-M1
Commit: 644ff07f04e4613e60facd7673a8436cb8c6d64c
Parents: 5f94256
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 11 22:58:42 2018 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 11 22:58:42 2018 +0000
----------------------------------------------------------------------
release/make-release-artifacts.sh | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/644ff07f/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 298ea81..7003e63 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -275,8 +275,6 @@ which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand
( cd ${artifact_dir} &&
for a in *.tar.gz *.zip *.rpm *.deb; do
- md5sum -b ${a} > ${a}.md5
- sha1sum -b ${a} > ${a}.sha1
sha256sum -b ${a} > ${a}.sha256
gpg2 --armor --output ${a}.asc --detach-sig ${a}
done
[3/6] brooklyn-dist git commit: brooklyn-client/cli/vendor is now
checked in and should not be cleaned out of the source archive
Posted by ri...@apache.org.
brooklyn-client/cli/vendor is now checked in and should not be cleaned out of the source archive
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/0f7dbef2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/0f7dbef2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/0f7dbef2
Branch: refs/heads/1.0.0-M1
Commit: 0f7dbef2c00559e877b01d20f39835e73cdb562e
Parents: fc374c0
Author: Richard Downer <ri...@apache.org>
Authored: Tue Sep 11 22:56:54 2018 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Tue Sep 11 22:56:54 2018 +0000
----------------------------------------------------------------------
release/make-release-artifacts.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/0f7dbef2/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 1f8f06d..753f37c 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -175,9 +175,8 @@ mkdir -p ${src_staging_dir}
# * sandbox (which hasn't been vetted so thoroughly)
# * release (where this is running, and people who *have* the release don't need to make it)
# * jars and friends (these are sometimes included for tests, but those are marked as skippable,
-# * cli/vendor - that's not source controlled and not removed by mvn clean so ignore it in case it's already there
# and apache convention does not allow them in source builds; see PR #365
-rsync -rtp --exclude .git\* --exclude brooklyn-docs/ --exclude brooklyn-library/sandbox/ --exclude brooklyn-client/cli/vendor/ --exclude brooklyn-dist/release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
+rsync -rtp --exclude .git\* --exclude brooklyn-docs/ --exclude brooklyn-library/sandbox/ --exclude brooklyn-dist/release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
rm -rf ${artifact_dir}
mkdir -p ${artifact_dir}