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:17 UTC
[1/8] brooklyn-dist git commit: Change version to 0.8.0-incubating
Repository: brooklyn-dist
Updated Branches:
refs/heads/0.8.0-incubating [created] c31eee613
Change version to 0.8.0-incubating
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/4a9bf171
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/4a9bf171
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/4a9bf171
Branch: refs/heads/0.8.0-incubating
Commit: 4a9bf171c455097165c37207af4485e94af68b8c
Parents: bde8c86
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 1 17:08:16 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Sep 1 17:08:16 2015 +0100
----------------------------------------------------------------------
usage/all/pom.xml | 2 +-
usage/archetypes/quickstart/NOTES.txt | 2 +-
usage/archetypes/quickstart/pom.xml | 2 +-
usage/archetypes/quickstart/src/brooklyn-sample/pom.xml | 2 +-
usage/dist/pom.xml | 2 +-
usage/downstream-parent/pom.xml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4a9bf171/usage/all/pom.xml
----------------------------------------------------------------------
diff --git a/usage/all/pom.xml b/usage/all/pom.xml
index 6544b2a..e47e74d 100644
--- a/usage/all/pom.xml
+++ b/usage/all/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-dist/blob/4a9bf171/usage/archetypes/quickstart/NOTES.txt
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/NOTES.txt b/usage/archetypes/quickstart/NOTES.txt
index 780e8ed..82baffe 100644
--- a/usage/archetypes/quickstart/NOTES.txt
+++ b/usage/archetypes/quickstart/NOTES.txt
@@ -32,7 +32,7 @@ To test a build:
pushd /tmp
rm -rf brooklyn-sample
- export BV=0.8.0-SNAPSHOT # BROOKLYN_VERSION
+ export BV=0.8.0-incubating # BROOKLYN_VERSION
mvn archetype:generate \
\
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4a9bf171/usage/archetypes/quickstart/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/pom.xml b/usage/archetypes/quickstart/pom.xml
index 3f20411..f67b72c 100644
--- a/usage/archetypes/quickstart/pom.xml
+++ b/usage/archetypes/quickstart/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-dist/blob/4a9bf171/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
----------------------------------------------------------------------
diff --git a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
index 8e2b651..8adf40d 100644
--- a/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
+++ b/usage/archetypes/quickstart/src/brooklyn-sample/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-downstream-parent</artifactId>
- <version>0.8.0-SNAPSHOT</version> <!-- BROOKLYN_VERSION -->
+ <version>0.8.0-incubating</version> <!-- BROOKLYN_VERSION -->
</parent>
<groupId>com.acme.sample</groupId>
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4a9bf171/usage/dist/pom.xml
----------------------------------------------------------------------
diff --git a/usage/dist/pom.xml b/usage/dist/pom.xml
index a0e0806..74bd409 100644
--- a/usage/dist/pom.xml
+++ b/usage/dist/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-dist/blob/4a9bf171/usage/downstream-parent/pom.xml
----------------------------------------------------------------------
diff --git a/usage/downstream-parent/pom.xml b/usage/downstream-parent/pom.xml
index 67fdb16..4fa18a2 100644
--- a/usage/downstream-parent/pom.xml
+++ b/usage/downstream-parent/pom.xml
@@ -23,7 +23,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 -->
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -48,7 +48,7 @@
<excludedTestGroups>Integration,Acceptance,Live,Live-sanity,WIP</excludedTestGroups>
<!-- 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 -->
<!-- versions should match those used by Brooklyn, to avoid conflicts -->
[4/8] brooklyn-dist git commit: make release script takes -y and
checks for existing gpg-agent
Posted by he...@apache.org.
make release script takes -y and checks for existing gpg-agent
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/a9e57ef7
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/a9e57ef7
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/a9e57ef7
Branch: refs/heads/0.8.0-incubating
Commit: a9e57ef766c23daf8db5e5ae96d7aff8f7349dbc
Parents: 66a7821
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 02:06:47 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Thu Sep 3 02:06:47 2015 +0100
----------------------------------------------------------------------
release/make-release-artifacts.sh | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a9e57ef7/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index b372560..8cefc77 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -43,6 +43,8 @@ release.
include the suffix. Therefore, turning a release
candidate into a release requires only renaming
the artifacts.
+ -y answers "y" to all questions automatically, to
+ use defaults and make this suitable for batch mode
Specifying the RC number is required. Specifying the version number is
discouraged; if auto detection is not working, then this script is buggy.
@@ -53,15 +55,19 @@ END
###############################################################################
confirm() {
# call with a prompt string or use a default
- read -r -p "${1:-Are you sure? [y/N]} " response
- case $response in
+ if [ "${batch_confirm_y}" == "true" ] ; then
+ true
+ else
+ read -r -p "${1:-Are you sure? [y/N]} " response
+ case $response in
[yY][eE][sS]|[yY])
true
;;
*)
false
;;
- esac
+ esac
+ fi
}
###############################################################################
@@ -83,7 +89,7 @@ detect_version() {
# Argument parsing
rc_suffix=
OPTIND=1
-while getopts "h?v:r:" opt; do
+while getopts "h?v:r:y?" opt; do
case "$opt" in
h|\?)
show_help
@@ -95,6 +101,9 @@ while getopts "h?v:r:" opt; do
r)
rc_suffix=$OPTARG
;;
+ y)
+ batch_confirm_y=true
+ ;;
*)
show_help
exit 1
@@ -169,9 +178,13 @@ echo "Proceeding to build binary release"
set -x
# Set up GPG agent
-eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info)
-GPG_TTY=$(tty)
-export GPG_TTY GPG_AGENT_INFO
+if ps x | grep [g]pg-agent ; then
+ echo "gpg-agent already running; assuming it is set up and exported correctly."
+else
+ eval $(gpg-agent --daemon --no-grab --write-env-file $HOME/.gpg-agent-info)
+ GPG_TTY=$(tty)
+ export GPG_TTY GPG_AGENT_INFO
+fi
# Workaround for bug BROOKLYN-1
( cd ${staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )
[3/8] brooklyn-dist git commit: license files updated for r.js
inclusion
Posted by he...@apache.org.
license files updated for r.js inclusion
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/66a78217
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/66a78217
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/66a78217
Branch: refs/heads/0.8.0-incubating
Commit: 66a782172a6a901a1feacdf4170e17f6d081c63d
Parents: 8a53ba1
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Wed Sep 2 13:34:44 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Wed Sep 2 13:37:10 2015 +0100
----------------------------------------------------------------------
LICENSE | 6 ++++++
usage/dist/src/main/license/files/LICENSE | 12 +++++++-----
usage/jsgui/src/main/license/files/LICENSE | 6 ++++++
3 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/66a78217/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 047405c..2741d5d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -265,6 +265,12 @@ This project includes the software: require.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) The Dojo Foundation (2010-2012)
+This project includes the software: require.js/r.js
+ Available at: http://github.com/jrburke/requirejs for details
+ Developed by: The Dojo Foundation (http://dojofoundation.org/)
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) The Dojo Foundation (2010-2012)
+
This project includes the software: sizzle.js
Available at: http://sizzlejs.com/
Developed by: The jQuery Foundation (http://jquery.org/)
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/66a78217/usage/dist/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/dist/src/main/license/files/LICENSE b/usage/dist/src/main/license/files/LICENSE
index a00784b..e66f276 100644
--- a/usage/dist/src/main/license/files/LICENSE
+++ b/usage/dist/src/main/license/files/LICENSE
@@ -225,10 +225,6 @@ This project includes the software: ch.qos.logback
Developed by: QOS.ch (http://www.qos.ch)
Used under the following license: Eclipse Public License, version 1.0 (http://www.eclipse.org/legal/epl-v10.html)
-This project includes the software: com.beust
- Available at: http://beust.com/jcommander
- Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
This project includes the software: com.fasterxml.jackson
Available at: http://wiki.fasterxml.com/JacksonHome http://wiki.fasterxml.com/JacksonJAXBAnnotations
Developed by: FasterXML (http://fasterxml.com/)
@@ -446,7 +442,7 @@ This project includes the software: org.99soft.guice
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
This project includes the software: org.apache.brooklyn
- Available at: https://brooklyn.incubator.apache.org/brooklyn-parent/
+ Available at: https://brooklyn.incubator.apache.org/
Developed by: The Apache Software Foundation (http://www.apache.org/)
Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -553,6 +549,12 @@ This project includes the software: require.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) The Dojo Foundation (2010-2012)
+This project includes the software: require.js/r.js
+ Available at: http://github.com/jrburke/requirejs for details
+ Developed by: The Dojo Foundation (http://dojofoundation.org/)
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) The Dojo Foundation (2010-2012)
+
This project includes the software: sizzle.js
Available at: http://sizzlejs.com/
Developed by: The jQuery Foundation (http://jquery.org/)
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/66a78217/usage/jsgui/src/main/license/files/LICENSE
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/license/files/LICENSE b/usage/jsgui/src/main/license/files/LICENSE
index 68dcfe5..fa518b1 100644
--- a/usage/jsgui/src/main/license/files/LICENSE
+++ b/usage/jsgui/src/main/license/files/LICENSE
@@ -265,6 +265,12 @@ This project includes the software: require.js
Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
Copyright (c) The Dojo Foundation (2010-2012)
+This project includes the software: require.js/r.js
+ Available at: http://github.com/jrburke/requirejs for details
+ Developed by: The Dojo Foundation (http://dojofoundation.org/)
+ Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
+ Copyright (c) The Dojo Foundation (2010-2012)
+
This project includes the software: sizzle.js
Available at: http://sizzlejs.com/
Developed by: The jQuery Foundation (http://jquery.org/)
[7/8] brooklyn-dist git commit: more tweaks to release script--
Posted by he...@apache.org.
more tweaks to release script--
use release/tmp/ and shopt expand_aliases,
and option to automatically upload to svn
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/4ab45626
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/4ab45626
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/4ab45626
Branch: refs/heads/0.8.0-incubating
Commit: 4ab456261ec8aebf0a8cca9a0b10000a23837da2
Parents: a3f5b59
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 23:48:21 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:52 2015 +0100
----------------------------------------------------------------------
release/.gitignore | 1 +
release/make-release-artifacts.sh | 57 ++++++++++++++++++++++++----------
2 files changed, 42 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4ab45626/release/.gitignore
----------------------------------------------------------------------
diff --git a/release/.gitignore b/release/.gitignore
index 8000dd9..16d63d3 100644
--- a/release/.gitignore
+++ b/release/.gitignore
@@ -1 +1,2 @@
.vagrant
+tmp
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/4ab45626/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index ad0bd06..a9184f3 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -48,6 +48,9 @@ release.
Specifying the RC number is required. Specifying the version number is
discouraged; if auto detection is not working, then this script is buggy.
+
+Additionally if APACHE_DIST_SVN_DIR is set, this will transfer artifacts to
+that directory and svn commit them.
END
# ruler --------------------------------------------------
}
@@ -131,15 +134,22 @@ fi
release_script_dir=$( cd $( dirname $0 ) && pwd )
brooklyn_dir=$( pwd )
-staging_dir="${release_script_dir}/tmp/working-src/${release_name}-src"
-bin_staging_dir="${release_script_dir}/tmp/working-bin/${release_name}-bin"
-artifact_dir="${release_script_dir}/${artifact_name}"
+rm -rf ${release_script_dir}/tmp
+staging_dir="${release_script_dir}/tmp/source/"
+src_staging_dir="${release_script_dir}/tmp/source/${release_name}-src"
+bin_staging_dir="${release_script_dir}/tmp/bin/"
+artifact_dir="${release_script_dir}/tmp/${artifact_name}"
echo "The version is ${current_version}"
echo "The rc suffix is rc${rc_suffix}"
echo "The release name is ${release_name}"
echo "The artifact name is ${artifact_name}"
echo "The artifact directory is ${artifact_dir}"
+if [ ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
+ echo "The artifacts will be copied and uploaded via ${APACHE_DIST_SVN_DIR}"
+else
+ echo "The artifacts will not be copied and uploaded to the svn repo"
+fi
echo ""
confirm "Is this information correct? [y/N]" || exit
echo ""
@@ -161,15 +171,17 @@ git clean -dxf
# Source release
echo "Creating source release folder ${release_name}"
set -x
-mkdir -p ${staging_dir}
-rsync -rtp --exclude src-release-tmp --exclude bin-release-tmp --exclude .git\* --exclude '**/*.[ejw]ar' --exclude docs/ sandbox/ release/ . ${staging_dir}
+mkdir -p ${src_staging_dir}
+mkdir -p ${bin_staging_dir}
+rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ . ${staging_dir}/${release_name}-src
+rm -rf ${artifact_dir}
mkdir -p ${artifact_dir}
set +x
-echo "Creating artifact ${artifact_dir}/${artifact_name}.tar.gz and .zip"
+echo "Creating artifact ${artifact_dir}/${artifact_name}-src.tar.gz and .zip"
set -x
-( cd src-release-tmp && tar czf ${artifact_dir}/${artifact_name}-src.tar.gz apache-brooklyn-${current_version}-src )
-( cd src-release-tmp && zip -qr ${artifact_dir}/${artifact_name}-src.zip apache-brooklyn-${current_version}-src )
+( cd ${staging_dir} && tar czf ${artifact_dir}/${artifact_name}-src.tar.gz ${release_name}-src )
+( cd ${staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-src.zip ${release_name}-src )
###############################################################################
# Binary release
@@ -187,25 +199,26 @@ else
fi
# Workaround for bug BROOKLYN-1
-( cd ${staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )
+( cd ${src_staging_dir} && mvn clean --projects :brooklyn-archetype-quickstart )
# Perform the build and deploy to Nexus staging repository
-( cd ${staging_dir} && mvn deploy -Papache-release )
+( cd ${src_staging_dir} && mvn deploy -Papache-release )
+## To test the script without a big deploy, use the line below instead of above
+#( cd ${src_staging_dir} && cd usage/dist && mvn clean install )
# Re-pack the archive with the correct names
-mkdir -p bin-release-tmp
-tar xzf ${staging_dir}/usage/dist/target/brooklyn-dist-${current_version}-dist.tar.gz -C bin-release-tmp
-mv bin-release-tmp/brooklyn-dist-${current_version} bin-release-tmp/apache-brooklyn-${current_version}-bin
+tar xzf ${src_staging_dir}/usage/dist/target/brooklyn-dist-${current_version}-dist.tar.gz -C ${bin_staging_dir}
+mv ${bin_staging_dir}/brooklyn-dist-${current_version} ${bin_staging_dir}/${release_name}-bin
-( cd bin-release-tmp && tar czf ${artifact_dir}/${artifact_name}-bin.tar.gz apache-brooklyn-${current_version}-bin )
-( cd bin-release-tmp && zip -qr ${artifact_dir}/${artifact_name}-bin.zip apache-brooklyn-${current_version}-bin )
+( cd ${bin_staging_dir} && tar czf ${artifact_dir}/${artifact_name}-bin.tar.gz ${release_name}-bin )
+( cd ${bin_staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-bin.zip ${release_name}-bin )
###############################################################################
# Signatures and checksums
# OSX doesn't have sha256sum, even if MacPorts md5sha1sum package is installed.
# Easy to fake it though.
-which sha256sum >/dev/null || alias sha256sum='shasum -a 256'
+which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand_aliases
( cd ${artifact_dir} &&
for a in *.tar.gz *.zip; do
@@ -217,6 +230,18 @@ which sha256sum >/dev/null || alias sha256sum='shasum -a 256'
)
###############################################################################
+
+if [ ! -z "${APACHE_DIST_SVN_DIR}" ] ; then
+ pushd ${APACHE_DIST_SVN_DIR}
+ rm -rf ${artifact_name}
+ cp -r ${artifact_dir} ${artifact_name}
+ svn add ${artifact_name}
+ svn commit --message "Add ${artifact_name} artifacts for incubator/brooklyn"
+ artifact_dir=${APACHE_DIST_SVN_DIR}/${artifact_name}
+ popd
+fi
+
+###############################################################################
# Conclusion
set +x
[8/8] brooklyn-dist git commit: reinstate jar exclusion, with comments
Posted by he...@apache.org.
reinstate jar exclusion, with comments
these mustn't be included (and tests which want them are skipped if they aren't present)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c31eee61
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c31eee61
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c31eee61
Branch: refs/heads/0.8.0-incubating
Commit: c31eee613566550156339fcfb56e6aa416ad9ba7
Parents: 4ab4562
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Sep 4 14:27:42 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:52 2015 +0100
----------------------------------------------------------------------
release/make-release-artifacts.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/c31eee61/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index a9184f3..476a6e3 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -173,7 +173,13 @@ echo "Creating source release folder ${release_name}"
set -x
mkdir -p ${src_staging_dir}
mkdir -p ${bin_staging_dir}
-rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ . ${staging_dir}/${release_name}-src
+# exclude:
+# * docs (which isn't part of the release, and adding license headers to js files is cumbersome)
+# * 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,
+# and apache convention does not allow them in source builds; see PR #365
+rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
rm -rf ${artifact_dir}
mkdir -p ${artifact_dir}
[6/8] brooklyn-dist git commit: remove the sandbox/ and release/ dirs
from the build
Posted by he...@apache.org.
remove the sandbox/ and release/ dirs from the build
and update the README in the root
and delete the old brooklyn-install.sh in the root.
(it is not maintained; it doesn't even refer to the apache downloads.)
basically make the source build look nice when it's unpacked
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/a3f5b598
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/a3f5b598
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/a3f5b598
Branch: refs/heads/0.8.0-incubating
Commit: a3f5b598c9d26726a98c29cd9387e5eb164ab8aa
Parents: 06db67b
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 22:56:39 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
release/make-release-artifacts.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/a3f5b598/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index b0b48d4..ad0bd06 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -162,7 +162,7 @@ git clean -dxf
echo "Creating source release folder ${release_name}"
set -x
mkdir -p ${staging_dir}
-rsync -rtp --exclude src-release-tmp --exclude bin-release-tmp --exclude .git\* --exclude '**/*.[ejw]ar' --exclude docs/ . ${staging_dir}
+rsync -rtp --exclude src-release-tmp --exclude bin-release-tmp --exclude .git\* --exclude '**/*.[ejw]ar' --exclude docs/ sandbox/ release/ . ${staging_dir}
mkdir -p ${artifact_dir}
set +x
[2/8] brooklyn-dist git commit: add r.js to list of dependencies
Posted by he...@apache.org.
add r.js to list of dependencies
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/8a53ba18
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/8a53ba18
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/8a53ba18
Branch: refs/heads/0.8.0-incubating
Commit: 8a53ba1832e2cfb9156a7cb4eb839201d872e777
Parents: 4a9bf17
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 2 09:54:06 2015 +0100
Committer: Alex Heneveld <al...@cloudsoft.io>
Committed: Wed Sep 2 13:36:33 2015 +0100
----------------------------------------------------------------------
usage/dist/licensing/overrides.yaml | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/8a53ba18/usage/dist/licensing/overrides.yaml
----------------------------------------------------------------------
diff --git a/usage/dist/licensing/overrides.yaml b/usage/dist/licensing/overrides.yaml
index e1952ba..6d2cf14 100644
--- a/usage/dist/licensing/overrides.yaml
+++ b/usage/dist/licensing/overrides.yaml
@@ -114,6 +114,16 @@
notice: Copyright (c) The Dojo Foundation (2010-2012)
license: MIT
+- id: require.js/r.js
+ # new ID because this is a different version to the above
+ name: RequireJS (r.js maven plugin)
+ files: r.js
+ version: 2.1.6
+ url: http://github.com/jrburke/requirejs for details
+ organization: { name: "The Dojo Foundation", url: "http://dojofoundation.org/" }
+ notice: Copyright (c) The Dojo Foundation (2010-2012)
+ license: MIT
+
- id: backbone.js
version: 1.0.0
url: http://backbonejs.org
[5/8] brooklyn-dist git commit: more info on verifying the builds
(whether downloaded or not) and vote (a script)
Posted by he...@apache.org.
more info on verifying the builds (whether downloaded or not) and vote (a script)
also tidy the release/dir moving pr_report to a subdir
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/06db67b4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/06db67b4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/06db67b4
Branch: refs/heads/0.8.0-incubating
Commit: 06db67b487a443bdba70044f17cecad6a8493585
Parents: a9e57ef
Author: Alex Heneveld <al...@cloudsoft.io>
Authored: Thu Sep 3 14:48:08 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Sep 4 14:33:51 2015 +0100
----------------------------------------------------------------------
release/Gemfile | 5 -
release/Gemfile.lock | 38 --------
release/README.md | 3 +-
release/make-release-artifacts.sh | 4 +-
release/pr_report.rb | 12 ---
release/print-vote-email.sh | 129 +++++++++++++++++++++++++
release/pull-request-reports/Gemfile | 5 +
release/pull-request-reports/Gemfile.lock | 38 ++++++++
release/pull-request-reports/pr_report.rb | 12 +++
9 files changed, 188 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/Gemfile
----------------------------------------------------------------------
diff --git a/release/Gemfile b/release/Gemfile
deleted file mode 100644
index 8ab84b5..0000000
--- a/release/Gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-#ruby=ruby-2.1.2
-#ruby-gemset=brooklyn-release-helpers
-
-source 'https://rubygems.org'
-gem 'github_api'
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/Gemfile.lock
----------------------------------------------------------------------
diff --git a/release/Gemfile.lock b/release/Gemfile.lock
deleted file mode 100644
index 859202a..0000000
--- a/release/Gemfile.lock
+++ /dev/null
@@ -1,38 +0,0 @@
-GEM
- remote: https://rubygems.org/
- specs:
- addressable (2.3.8)
- descendants_tracker (0.0.4)
- thread_safe (~> 0.3, >= 0.3.1)
- faraday (0.9.1)
- multipart-post (>= 1.2, < 3)
- github_api (0.12.3)
- addressable (~> 2.3)
- descendants_tracker (~> 0.0.4)
- faraday (~> 0.8, < 0.10)
- hashie (>= 3.3)
- multi_json (>= 1.7.5, < 2.0)
- nokogiri (~> 1.6.3)
- oauth2
- hashie (3.4.2)
- jwt (1.5.1)
- mini_portile (0.6.2)
- multi_json (1.11.1)
- multi_xml (0.5.5)
- multipart-post (2.0.0)
- nokogiri (1.6.6.2)
- mini_portile (~> 0.6.0)
- oauth2 (1.0.0)
- faraday (>= 0.8, < 0.10)
- jwt (~> 1.0)
- multi_json (~> 1.3)
- multi_xml (~> 0.5)
- rack (~> 1.2)
- rack (1.6.4)
- thread_safe (0.3.5)
-
-PLATFORMS
- ruby
-
-DEPENDENCIES
- github_api
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/README.md
----------------------------------------------------------------------
diff --git a/release/README.md b/release/README.md
index f1976f6..325b165 100644
--- a/release/README.md
+++ b/release/README.md
@@ -44,6 +44,7 @@ run for example `/vagrant/make-release/artifacts.sh`.
Pull request reporting
----------------------
-`pr_report.rb` (and associated files `Gemfile` and `Gemfile.lock`) uses the GitHub API to extract a list of open pull
+The files in `pull-request-reports`, mainly `pr_report.rb`
+(and associated files `Gemfile` and `Gemfile.lock`) uses the GitHub API to extract a list of open pull
requests, and writes a summary into `pr_report.tsv`. This could then be imported into Google Sheets to provide a handy
way of classifying and managing outstanding PRs ahead of making a release.
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 8cefc77..b0b48d4 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -131,8 +131,8 @@ fi
release_script_dir=$( cd $( dirname $0 ) && pwd )
brooklyn_dir=$( pwd )
-staging_dir="${brooklyn_dir}/src-release-tmp/${release_name}-src"
-bin_staging_dir="${brooklyn_dir}/bin-release-tmp/${release_name}-bin"
+staging_dir="${release_script_dir}/tmp/working-src/${release_name}-src"
+bin_staging_dir="${release_script_dir}/tmp/working-bin/${release_name}-bin"
artifact_dir="${release_script_dir}/${artifact_name}"
echo "The version is ${current_version}"
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/pr_report.rb
----------------------------------------------------------------------
diff --git a/release/pr_report.rb b/release/pr_report.rb
deleted file mode 100644
index 95b6317..0000000
--- a/release/pr_report.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-#ruby
-
-require 'CSV'
-require 'github_api'
-
-gh = Github.new
-
-CSV.open("pr_report.tsv", "wb", { :col_sep => "\t" }) do |csv|
- gh.pull_requests.list('apache', 'incubator-brooklyn').
- select { |pr| pr.state == "open" }.
- each { |pr| csv << [ pr.number, pr.title, pr.created_at, pr.user.login ] }
-end
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/print-vote-email.sh
----------------------------------------------------------------------
diff --git a/release/print-vote-email.sh b/release/print-vote-email.sh
new file mode 100755
index 0000000..ac62241
--- /dev/null
+++ b/release/print-vote-email.sh
@@ -0,0 +1,129 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# 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.
+#
+
+# prints a sample email with all the correct information
+
+set +x
+
+fail() {
+ echo >&2 "$@"
+ exit 1
+}
+
+if [ -z "${VERSION_NAME}" ] ; then fail VERSION_NAME must be set ; fi
+if [ -z "${RC_NUMBER}" ] ; then fail RC_NUMBER must be set ; fi
+
+base=apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}
+
+if [ -z "$1" ] ; then fail "A single argument being the staging repo ID must be supplied, e.g. orgapachebrooklyn-1234" ; fi
+
+archetype_check=`curl https://repository.apache.org/content/repositories/${staging_repo_id}/archetype-catalog.xml 2> /dev/null`
+if ! echo $archetype_check | grep brooklyn-archetype-quickstart > /dev/null ; then
+ fail staging repo looks wrong at https://repository.apache.org/content/repositories/${staging_repo_id}
+fi
+if ! echo $archetype_check | grep ${VERSION_NAME} > /dev/null ; then
+ fail wrong version at https://repository.apache.org/content/repositories/${staging_repo_id}
+fi
+
+artifact=release/tmp/${base}/${base}-bin.tar.gz
+if [ ! -f $artifact ] ; then
+ fail could not find artifact $artifact
+fi
+if [ -z "$APACHE_ID" ] ; then
+ APACHE_ID=`gpg2 --verify ${artifact}.asc ${artifact} 2>&1 | egrep -o '[^<]*...@apache.org>' | cut -d @ -f 1`
+fi
+if [ -z "$APACHE_ID" ] ; then
+ fail "could not deduce APACHE_ID (your apache username); are files signed correctly?"
+fi
+if ! ( gpg2 --verify ${artifact}.asc ${artifact} 2>&1 | grep ${APACHE_ID}@apache.org > /dev/null ) ; then
+ fail "could not verify signature; are files signed correctly and ID ${APACHE_ID} correct?"
+fi
+
+cat <<EOF
+
+Subject: [VOTE] Release Apache Brooklyn ${VERSION_NAME} [rc${RC_NUMBER}]
+
+
+This is to call for a vote for the release of Apache Brooklyn ${VERSION_NAME}.
+
+This release comprises of a source code distribution, and a corresponding
+binary distribution, and Maven artifacts.
+
+The source and binary distributions, including signatures, digests, etc. can
+be found at:
+
+ https://dist.apache.org/repos/dist/dev/incubator/brooklyn/${base}
+
+The artifact SHA-256 checksums are as follows:
+
+EOF
+
+cat release/tmp/${base}/*.sha256 | awk '{print " "$0}'
+
+cat <<EOF
+
+The Nexus staging repository for the Maven artifacts is located at:
+
+ https://repository.apache.org/content/repositories/${staging_repo_id}
+
+All release artifacts are signed with the following key:
+
+ https://people.apache.org/keys/committer/${APACHE_ID}.asc
+
+KEYS file available here:
+
+ https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
+
+
+The artifacts were built from git commit ID $( git rev-parse HEAD ):
+
+ https://git-wip-us.apache.org/repos/asf?p=incubator-brooklyn.git;a=commit;h=$( git rev-parse HEAD )
+
+
+Please vote on releasing this package as Apache Brooklyn ${VERSION_NAME}.
+
+The vote will be open for at least 72 hours.
+[ ] +1 Release this package as Apache Brooklyn ${VERSION_NAME}
+[ ] +0 no opinion
+[ ] -1 Do not release this package because ...
+
+
+Thanks!
+EOF
+
+cat <<EOF
+
+
+
+CHECKLIST for reference
+
+[ ] Download links work.
+[ ] Binaries work.
+[ ] Checksums and PGP signatures are valid.
+[ ] Expanded source archive matches contents of RC tag.
+[ ] Expanded source archive builds and passes tests.
+[ ] LICENSE is present and correct.
+[ ] NOTICE is present and correct, including copyright date.
+[ ] All files have license headers where appropriate.
+[ ] All dependencies have compatible licenses.
+[ ] No compiled archives bundled in source archive.
+[ ] I follow this project’s commits list.
+
+EOF
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/pull-request-reports/Gemfile
----------------------------------------------------------------------
diff --git a/release/pull-request-reports/Gemfile b/release/pull-request-reports/Gemfile
new file mode 100644
index 0000000..8ab84b5
--- /dev/null
+++ b/release/pull-request-reports/Gemfile
@@ -0,0 +1,5 @@
+#ruby=ruby-2.1.2
+#ruby-gemset=brooklyn-release-helpers
+
+source 'https://rubygems.org'
+gem 'github_api'
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/pull-request-reports/Gemfile.lock
----------------------------------------------------------------------
diff --git a/release/pull-request-reports/Gemfile.lock b/release/pull-request-reports/Gemfile.lock
new file mode 100644
index 0000000..859202a
--- /dev/null
+++ b/release/pull-request-reports/Gemfile.lock
@@ -0,0 +1,38 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ addressable (2.3.8)
+ descendants_tracker (0.0.4)
+ thread_safe (~> 0.3, >= 0.3.1)
+ faraday (0.9.1)
+ multipart-post (>= 1.2, < 3)
+ github_api (0.12.3)
+ addressable (~> 2.3)
+ descendants_tracker (~> 0.0.4)
+ faraday (~> 0.8, < 0.10)
+ hashie (>= 3.3)
+ multi_json (>= 1.7.5, < 2.0)
+ nokogiri (~> 1.6.3)
+ oauth2
+ hashie (3.4.2)
+ jwt (1.5.1)
+ mini_portile (0.6.2)
+ multi_json (1.11.1)
+ multi_xml (0.5.5)
+ multipart-post (2.0.0)
+ nokogiri (1.6.6.2)
+ mini_portile (~> 0.6.0)
+ oauth2 (1.0.0)
+ faraday (>= 0.8, < 0.10)
+ jwt (~> 1.0)
+ multi_json (~> 1.3)
+ multi_xml (~> 0.5)
+ rack (~> 1.2)
+ rack (1.6.4)
+ thread_safe (0.3.5)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ github_api
http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/06db67b4/release/pull-request-reports/pr_report.rb
----------------------------------------------------------------------
diff --git a/release/pull-request-reports/pr_report.rb b/release/pull-request-reports/pr_report.rb
new file mode 100644
index 0000000..95b6317
--- /dev/null
+++ b/release/pull-request-reports/pr_report.rb
@@ -0,0 +1,12 @@
+#ruby
+
+require 'CSV'
+require 'github_api'
+
+gh = Github.new
+
+CSV.open("pr_report.tsv", "wb", { :col_sep => "\t" }) do |csv|
+ gh.pull_requests.list('apache', 'incubator-brooklyn').
+ select { |pr| pr.state == "open" }.
+ each { |pr| csv << [ pr.number, pr.title, pr.created_at, pr.user.login ] }
+end