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 2017/01/06 15:25:07 UTC

[1/7] brooklyn-dist git commit: Update release scripts for Apache Brooklyn 0.10.0 release.

Repository: brooklyn-dist
Updated Branches:
  refs/heads/master 34a877bb1 -> c35e5a9bc


Update release scripts for Apache Brooklyn 0.10.0 release.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/2243973e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/2243973e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/2243973e

Branch: refs/heads/master
Commit: 2243973e87538cc3f08b0a8546057a5bd8df679e
Parents: 7080515
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Dec 5 14:17:17 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Dec 5 14:17:17 2016 +0200

----------------------------------------------------------------------
 release/Vagrantfile               | 11 ++++++-----
 release/make-release-artifacts.sh |  2 +-
 release/print-vote-email.sh       | 17 ++++++++++-------
 release/settings.xml              | 14 ++++++++++++++
 4 files changed, 31 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/2243973e/release/Vagrantfile
----------------------------------------------------------------------
diff --git a/release/Vagrantfile b/release/Vagrantfile
index a8b6e71..71a9a24 100644
--- a/release/Vagrantfile
+++ b/release/Vagrantfile
@@ -28,7 +28,7 @@
 # you're doing.
 Vagrant.configure(2) do |config|
 
-  config.vm.box = "ubuntu/wily64"
+  config.vm.box = "ubuntu/xenial64"
 
   # Provider-specific configuration so you can fine-tune various
   # backing providers for Vagrant. These expose provider-specific options.
@@ -73,11 +73,12 @@ Vagrant.configure(2) do |config|
     add-apt-repository -y ppa:ubuntu-lxc/lxd-stable
     apt-get update
     apt-get upgrade -y
-    apt-get install -y default-jdk git subversion xmlstarlet zip unzip language-pack-en vim-nox gnupg2 gnupg-agent pinentry-curses golang rpm mmv
+    apt-get install -y default-jdk git subversion xmlstarlet zip unzip language-pack-en \
+                       vim-nox gnupg2 gnupg-agent pinentry-curses golang rpm mmv haveged
     mkdir -p /opt
-    curl http://archive.apache.org/dist/maven/maven-3/3.1.1/binaries/apache-maven-3.1.1-bin.tar.gz | tar xz -C /opt
-    ln -s /opt/apache-maven-3.1.1/bin/mvn /usr/local/bin
-    echo "MAVEN_OPTS=\"-Xmx512m -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M\"" >> /etc/environment
+    MAVEN_VERSION=3.3.39
+    curl http://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar xz -C /opt
+    ln -s /opt/apache-maven-${MAVEN_VERSION}/bin/mvn /usr/local/bin
     mkdir -p /work
     mount -ttmpfs -osize=3g none /work
     eval chmod -R go= ~${NORMALUSER}/.gnupg

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/2243973e/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 6aa7788..6dba894 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -267,7 +267,7 @@ which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand
 
 if [ -z "${dry_run}" -a ! -z "${APACHE_DIST_SVN_DIR}" ] ; then (
   cd ${APACHE_DIST_SVN_DIR}
-  [ -d ${artifact_name} ] && ( svn revert -R ${artifact_name}; svn rm -R ${artifact_name}; rm -rf ${artifact_name} )
+  [ -d ${artifact_name} ] && ( svn revert -R ${artifact_name}; svn rm --force ${artifact_name}; rm -rf ${artifact_name} )
   cp -r ${artifact_dir} ${artifact_name}
   svn add ${artifact_name}
   )

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/2243973e/release/print-vote-email.sh
----------------------------------------------------------------------
diff --git a/release/print-vote-email.sh b/release/print-vote-email.sh
index 5fd2256..f190b20 100755
--- a/release/print-vote-email.sh
+++ b/release/print-vote-email.sh
@@ -43,7 +43,8 @@ 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
+RELEASE_FOLDER=$(dirname $0)/${base}
+artifact=${RELEASE_FOLDER}/${base}-bin.tar.gz
 if [ ! -f $artifact ] ; then
   fail could not find artifact $artifact
 fi
@@ -70,13 +71,15 @@ 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}
+  https://dist.apache.org/repos/dist/dev/brooklyn/${base}
 
 The artifact SHA-256 checksums are as follows:
 
 EOF
 
-cat release/tmp/${base}/*.sha256 | awk '{print "  "$0}'
+cat ${RELEASE_FOLDER}/*.sha256 | awk '{print "  "$0}'
+COMMIT_IDS_MESSAGE=$(echo -n "brooklyn: " && git rev-parse HEAD && git submodule --quiet foreach 'echo -n "${name}: " && git rev-parse HEAD')
+
 
 cat <<EOF
 
@@ -90,13 +93,13 @@ All release artifacts are signed with the following key:
 
 KEYS file available here:
 
-    https://dist.apache.org/repos/dist/release/incubator/brooklyn/KEYS
-
+    https://dist.apache.org/repos/dist/release/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 )
+The artifacts were built from git commit IDs:
 
+${COMMIT_IDS_MESSAGE}
+All of the above have been tagged as "apache-brooklyn-${VERSION_NAME}-rc${RC_NUMBER}"
 
 Please vote on releasing this package as Apache Brooklyn ${VERSION_NAME}.
 

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/2243973e/release/settings.xml
----------------------------------------------------------------------
diff --git a/release/settings.xml b/release/settings.xml
index 365de49..61a32e8 100644
--- a/release/settings.xml
+++ b/release/settings.xml
@@ -18,4 +18,18 @@
         </server>
     </servers>
 
+    <profiles>
+        <profile>
+            <id>gpg</id>
+            <properties>
+                <gpg.executable>gpg2</gpg.executable>
+                <gpg.useAgent>true</gpg.useAgent>
+                <useAgent>true</useAgent>
+                <gpg.useagent>true</gpg.useagent>
+            </properties>
+        </profile>
+    </profiles>
+    <activeProfiles>
+        <activeProfile>gpg</activeProfile>
+    </activeProfiles>
 </settings>


[2/7] brooklyn-dist git commit: Update make-release-artifacts.sh

Posted by ri...@apache.org.
Update make-release-artifacts.sh

Fix rpm path; Add Karaf distribution


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/dc6247c0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/dc6247c0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/dc6247c0

Branch: refs/heads/master
Commit: dc6247c0345c6e3e5bd45ba23bdc1051b77bd0f9
Parents: 2243973
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Sun Dec 4 17:30:12 2016 +0000
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Dec 15 16:20:29 2016 +0200

----------------------------------------------------------------------
 release/make-release-artifacts.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/dc6247c0/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 6dba894..011691c 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -205,12 +205,20 @@ else
 fi
 
 # Re-pack the archive with the correct names
+# Classic release
 tar xzf ${src_staging_dir}/brooklyn-dist/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_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 )
 
+# Karaf release
+tar xzf ${src_staging_dir}/brooklyn-dist/karaf/apache-brooklyn/target/apache-brooklyn-${current_version}.tar.gz -C ${bin_staging_dir}
+mv ${bin_staging_dir}/apache-brooklyn-${current_version} ${bin_staging_dir}/${release_name}-karaf
+
+( cd ${bin_staging_dir} && tar czf ${artifact_dir}/${artifact_name}-karaf.tar.gz ${release_name}-karaf )
+( cd ${bin_staging_dir} && zip -qr ${artifact_dir}/${artifact_name}-karaf.zip ${release_name}-karaf )
+
 ###############################################################################
 # CLI release
 set +x
@@ -245,7 +253,7 @@ mv ${bin_staging_dir}/brooklyn-vagrant-${current_version} ${bin_staging_dir}/${r
 ###############################################################################
 # RPM artifacts
 
-cp ${src_staging_dir}/brooklyn-dist/packaging/target/rpm/apache-brooklyn/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${release_name}-1.noarch.rpm
+cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${release_name}-1.noarch.rpm
 
 ###############################################################################
 # Signatures and checksums


[7/7] brooklyn-dist git commit: Closes #65

Posted by ri...@apache.org.
Closes #65

Update release scripts for Apache Brooklyn 0.10.0 release


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c35e5a9b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c35e5a9b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c35e5a9b

Branch: refs/heads/master
Commit: c35e5a9bc5a685aae7bd85b243ab56910d3c9a2b
Parents: 34a877b 878079f
Author: Richard Downer <ri...@apache.org>
Authored: Fri Jan 6 15:24:30 2017 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Jan 6 15:24:30 2017 +0000

----------------------------------------------------------------------
 release/Vagrantfile                  |  11 +-
 release/clone-and-configure-repos.sh |   4 +-
 release/make-release-artifacts.sh    |  17 ++-
 release/print-vote-email.sh          |  17 +--
 release/settings.xml                 |  14 +++
 release/verify_brooklyn_rc.sh        | 200 ++++++++++++++++++++++++++++++
 6 files changed, 245 insertions(+), 18 deletions(-)
----------------------------------------------------------------------



[6/7] brooklyn-dist git commit: Add release verification script

Posted by ri...@apache.org.
Add release verification script

Based on jclouds script.


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/878079f2
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/878079f2
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/878079f2

Branch: refs/heads/master
Commit: 878079f2ae1e29ccfdbe8665eca5948ef09f874c
Parents: de39576
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Dec 19 12:59:43 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Dec 19 13:56:31 2016 +0200

----------------------------------------------------------------------
 release/verify_brooklyn_rc.sh | 200 +++++++++++++++++++++++++++++++++++++
 1 file changed, 200 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/878079f2/release/verify_brooklyn_rc.sh
----------------------------------------------------------------------
diff --git a/release/verify_brooklyn_rc.sh b/release/verify_brooklyn_rc.sh
new file mode 100755
index 0000000..fad2a31
--- /dev/null
+++ b/release/verify_brooklyn_rc.sh
@@ -0,0 +1,200 @@
+#!/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.
+#
+
+set -e
+
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 0.10.0-rc3"
+  exit 1
+fi
+
+command -v svn >/dev/null 2>&1 || { echo >&2 "svn required but is not installed.  Aborting."; exit 1; }
+command -v md5sum >/dev/null 2>&1 || { echo >&2 "md5sum required but is not installed. On macOS install with 'brew install md5sha1sum'. Aborting."; exit 1; }
+command -v shasum >/dev/null 2>&1 || { echo >&2 "shasum required but is not installed. On macOS install with 'brew install md5sha1sum'. Aborting."; exit 1; }
+command -v gpg2 >/dev/null 2>&1 || { echo >&2 "gpg2 required but is not installed. On macOS install with 'brew install gnupg2'. Aborting."; exit 1; }
+
+RELEASE=$1
+DOWNLOAD_ROOT=https://dist.apache.org/repos/dist/dev/brooklyn/apache-brooklyn-$RELEASE/
+DOWNLOADS_FOLDER=apache-brooklyn-$RELEASE
+
+mkdir ${DOWNLOADS_FOLDER}
+cd ${DOWNLOADS_FOLDER}
+
+echo
+echo "======================"
+echo "= Importing PGP keys ="
+echo "======================"
+echo
+echo "Downloading KEYS from https://dist.apache.org/repos/dist/release/brooklyn/KEYS"
+curl -s https://dist.apache.org/repos/dist/release/brooklyn/KEYS | gpg --import
+
+echo
+echo "============================="
+echo "= Downloading release files ="
+echo "============================="
+echo
+echo "Downloading from staging URL $DOWNLOAD_ROOT"
+curl -s $DOWNLOAD_ROOT | \
+  grep href | grep -v '\.\.' | \
+  sed -e 's@.*href="@'$DOWNLOAD_ROOT'@' | \
+  sed -e 's@">.*@@' | \
+  xargs -n 1 curl -O
+
+echo
+echo "========================================================"
+echo "= Compare downloaded files listing to SVN staging repo ="
+echo "========================================================"
+echo
+# TODO --trust-server-cert because fails on OS X due to untrusted issuer Issuer: Symantec Class 3 Secure Server CA - G4, Symantec Trust Network, Symantec Corporation, US
+diff <(svn --non-interactive --trust-server-cert ls https://dist.apache.org/repos/dist/dev/brooklyn/apache-brooklyn-$RELEASE | sort) \
+  <(ls -1 * | sort)
+echo "OK"
+
+echo
+echo "==================================================="
+echo "= Check signatures and hashes of downloaded files ="
+echo "==================================================="
+echo
+for artifact in $(find * -type f ! \( -name '*.asc' -o -name '*.md5' -o -name '*.sha1' -o -name '*.sha256' \) ); do
+  md5sum -c ${artifact}.md5 && \
+  shasum -a1 -c ${artifact}.sha1 && \
+  shasum -a256 -c ${artifact}.sha256 && \
+  gpg2 --verify ${artifact}.asc ${artifact} \
+    || { echo "Invalid signature for $artifact. Aborting!"; exit 1; }
+done
+
+echo
+echo "=================================================="
+echo "= Check for LICENSE and NOTICE files in archives ="
+echo "=================================================="
+echo
+for ARCHIVE in $(find * -type f ! \( -name '*.asc' -o -name '*.md5' -o -name '*.sha1' -o -name '*.sha256' \) ); do
+  REL_ARCHIVE=${ARCHIVE/-rc?}
+  case $ARCHIVE in
+    *.tar.gz)
+      LIST="tar -tvf"
+      PREFIX=${REL_ARCHIVE%.tar.gz}
+      ;;
+    *.zip)
+      LIST="unzip -Zl"
+      PREFIX=${REL_ARCHIVE%.zip}
+      ;;
+    *.rpm)
+      LIST="rpm -qlp"
+      PREFIX="/opt/brooklyn"
+      ;;
+    *)
+      echo "Unrecognized file type $ARCHIVE. Aborting!"
+      exit 1
+      ;;
+  esac
+  $LIST $ARCHIVE | grep "$PREFIX/NOTICE" && \
+  $LIST $ARCHIVE | grep "$PREFIX/LICENSE" \
+    || { echo "Missing LICENSE or NOTICE in $ARCHIVE. Aborting!"; exit 1; } 
+done
+
+echo
+echo "========================="
+echo "= Extract source folder ="
+echo "========================="
+echo
+tar -zxf apache-brooklyn-$RELEASE-src.tar.gz
+GA_RELEASE=${RELEASE%%-rc?}
+SOURCE_RELEASE_FOLDER=apache-brooklyn-${GA_RELEASE}-src
+echo "OK"
+
+echo
+echo "======================================="
+echo "= Checkout repository at release tags ="
+echo "======================================="
+echo
+git clone git://git.apache.org/brooklyn.git repository
+cd repository
+git submodule init
+git submodule update --remote --merge --recursive
+git checkout rel/apache-brooklyn-$RELEASE 
+git submodule foreach git checkout rel/apache-brooklyn-$RELEASE
+cd ..
+
+echo
+echo "========================================"
+echo "= Compare repository to source release ="
+echo "========================================"
+echo
+diff -qr ${SOURCE_RELEASE_FOLDER} repository/ || true
+SOURCE_DIFF_CNT=$(
+  diff -qr ${SOURCE_RELEASE_FOLDER} repository/ \
+    -x '*.git' -x '*.gitattributes' -x '*.gitignore' \
+    -x '*.gitmodules' -x 'release' -x 'brooklyn-docs' \
+    -x 'sandbox' | \
+  grep -v 'src/test/.*\.jar' | \
+  grep -v 'hello-world.*\.war' | \
+  wc -c)
+
+[ ${SOURCE_DIFF_CNT} -eq 0 ] || { echo "Unexpected differences between source distribution and repository. Aborting!"; exit 1; }
+echo
+echo "Didn't find unexpected differences."
+
+echo
+echo "======================"
+echo "= Build from sources ="
+echo "======================"
+echo
+cd ${SOURCE_RELEASE_FOLDER};
+mvn -Dmaven.repo.local=../maven-sandbox-repo clean install
+cd ..;
+
+echo
+echo "Do a clean extract of source repo for next steps."
+rm -rf ${SOURCE_RELEASE_FOLDER};
+tar -zxf apache-brooklyn-$RELEASE-src.tar.gz
+echo
+echo "-------------------------------------------"
+echo
+echo "Additional steps requiring manual intervention (execute in source distribution folder ${SOURCE_RELEASE_FOLDER}:"
+echo " * Check for files with invalid headers in source distribution. There are already files excluded from RAT checks, do a sanity check."
+echo "   $ grep -rL \"Licensed to the Apache Software Foundation\" ${DOWNLOADS_FOLDER}/${SOURCE_RELEASE_FOLDER}* | less"
+echo
+echo " * Check for binary files in source distribution. Look for files which are created/compiled based on other source files in the distribution. \
+\"Primary\" binary files like images are acceptable."
+echo "   Example less filter:  '&!ASCII|Unicode|directory|PNG|JPEG|GIF|KeyStore|EOT|SVG|icon|font|woff|public key|private key|certificate'"
+echo "   $ find ${DOWNLOADS_FOLDER}/${SOURCE_RELEASE_FOLDER} | xargs -n1 file | awk -F $':' ' { t = \$1; \$1 = \$2; \$2 = t; print; } ' | sort | less"
+echo
+echo "Checks successfully completed:"
+echo "[\u2713] Download links work."
+echo "[\u2713] Checksums and PGP signatures are valid."
+echo "[\u2713] Expanded source archive matches contents of RC tag."
+echo "[\u2713] Expanded source archive builds and passes tests."
+echo "[\u2713] LICENSE is present and correct."
+echo "[\u2713] NOTICE is present and correct, including copyright date."
+echo "[\u2713] No compiled archives bundled in source archive."
+echo
+echo "Checks left to do manually with the help of above instructions:"
+echo "[ ] All files have license headers where appropriate."
+echo "[ ] All dependencies have compatible licenses."
+echo
+echo "Remaning items from checklist:"
+echo "[ ] Binaries work."
+echo "[ ] I follow this project\u2019s commits list."
+
+## TODO
+# * Automate above manual steps
+# * Add maven repository checks (generate archetype project and build it?; should happen in a container not to pollute local repo)
+# * Run binary distribution and do basic sanity checks (using br; using maven plugin?)
+# * --trust-server-cert is against the spirit of the "verify" step - can we fix it another way?


[3/7] brooklyn-dist git commit: Skip brooklyn-client/cli/vendor folder for source release

Posted by ri...@apache.org.
Skip brooklyn-client/cli/vendor folder for source release


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/c0b03958
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/c0b03958
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/c0b03958

Branch: refs/heads/master
Commit: c0b03958311f9eae3b8ca85fb8bd051815878cf6
Parents: dc6247c
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Thu Dec 15 16:39:13 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Thu Dec 15 16:39:13 2016 +0200

----------------------------------------------------------------------
 release/make-release-artifacts.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/c0b03958/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 011691c..3789839 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -175,8 +175,9 @@ 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-dist/release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src
+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
 
 rm -rf ${artifact_dir}
 mkdir -p ${artifact_dir}


[5/7] brooklyn-dist git commit: Add --non-interactive SVN option - should fail instead of ask for input in script

Posted by ri...@apache.org.
Add --non-interactive SVN option - should fail instead of ask for input in script


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/de395760
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/de395760
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/de395760

Branch: refs/heads/master
Commit: de39576021ec57f1818f9ec63b969aba9674c4d2
Parents: ce0d5e5
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Mon Dec 19 12:58:59 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Mon Dec 19 12:58:59 2016 +0200

----------------------------------------------------------------------
 release/clone-and-configure-repos.sh | 4 ++--
 release/make-release-artifacts.sh    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/de395760/release/clone-and-configure-repos.sh
----------------------------------------------------------------------
diff --git a/release/clone-and-configure-repos.sh b/release/clone-and-configure-repos.sh
index 7a074fc..02b648c 100755
--- a/release/clone-and-configure-repos.sh
+++ b/release/clone-and-configure-repos.sh
@@ -40,6 +40,6 @@ git pull
 git submodule update --remote --merge --recursive
 
 # And also the location for publishing RC artifacts
-svn co --depth=immediates https://dist.apache.org/repos/dist/release/brooklyn ~/apache-dist-release-brooklyn
-svn co --depth=immediates https://dist.apache.org/repos/dist/dev/brooklyn ~/apache-dist-dev-brooklyn
+svn --non-interactive co --depth=immediates https://dist.apache.org/repos/dist/release/brooklyn ~/apache-dist-release-brooklyn
+svn --non-interactive co --depth=immediates https://dist.apache.org/repos/dist/dev/brooklyn ~/apache-dist-dev-brooklyn
 echo "export APACHE_DIST_SVN_DIR=$HOME/apache-dist-dev-brooklyn" >> ~/.profile

http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/de395760/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 99366cb..6dc7ffd 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -276,9 +276,9 @@ which sha256sum >/dev/null || alias sha256sum='shasum -a 256' && shopt -s expand
 
 if [ -z "${dry_run}" -a ! -z "${APACHE_DIST_SVN_DIR}" ] ; then (
   cd ${APACHE_DIST_SVN_DIR}
-  [ -d ${artifact_name} ] && ( svn revert -R ${artifact_name}; svn rm --force ${artifact_name}; rm -rf ${artifact_name} )
+  [ -d ${artifact_name} ] && ( svn --non-interactive revert -R ${artifact_name}; svn --non-interactive rm --force ${artifact_name}; rm -rf ${artifact_name} )
   cp -r ${artifact_dir} ${artifact_name}
-  svn add ${artifact_name}
+  svn --non-interactive add ${artifact_name}
   )
   artifact_dir=${APACHE_DIST_SVN_DIR}/${artifact_name}
 fi


[4/7] brooklyn-dist git commit: Include rc tag in the rpm file name

Posted by ri...@apache.org.
Include rc tag in the rpm file name


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/ce0d5e5f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/ce0d5e5f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/ce0d5e5f

Branch: refs/heads/master
Commit: ce0d5e5fb723aa01465e16af0f99c35f2f99b032
Parents: c0b0395
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Fri Dec 16 18:25:36 2016 +0200
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Fri Dec 16 18:25:36 2016 +0200

----------------------------------------------------------------------
 release/make-release-artifacts.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/ce0d5e5f/release/make-release-artifacts.sh
----------------------------------------------------------------------
diff --git a/release/make-release-artifacts.sh b/release/make-release-artifacts.sh
index 3789839..99366cb 100755
--- a/release/make-release-artifacts.sh
+++ b/release/make-release-artifacts.sh
@@ -254,7 +254,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/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${release_name}-1.noarch.rpm
+cp ${src_staging_dir}/brooklyn-dist/rpm-packaging/target/rpm/apache-brooklyn/RPMS/noarch/apache-brooklyn-${current_version}-1.noarch.rpm ${artifact_dir}/${artifact_name}-1.noarch.rpm
 
 ###############################################################################
 # Signatures and checksums