GEODE-7999: make support branches publish snapshots (apache#4996)

*make support branches publish snapshots
* add missing step to update examples version when creating new support branch
* update copyright year (both at branch creation and RC creation)

Author: onichols-pivotal

ci/pipelines/geode-build/jinja.template.yml

@@ -98,7 +98,7 @@ groups:
   - {{ build_test.name }}
   {{- all_gating_jobs() | indent(2) }}
   - UpdatePassingTokens
-  {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
+  {%- if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
   - PublishArtifacts
   {%- endif %}
   {%- for flavor in (benchmarks.flavors) %}
@@ -113,7 +113,7 @@ groups:
     {%- endfor -%}
   {%- endfor %}
   - UpdatePassingTokens
-  {%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
+  {%- if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
   - PublishArtifacts
   {%- endif %}
   {%- for flavor in (benchmarks.flavors) %}
@@ -398,7 +398,7 @@ jobs:
     - get: alpine-tools-image
     - get: geode
       passed: &update-token-passed-anchor
-{%- if repository.upstream_fork != "apache" or repository.branch == "develop" %}
+{%- if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
       - PublishArtifacts
 {% else %}
       {% for flavor in (benchmarks.flavors) %}
@@ -519,7 +519,7 @@ jobs:
             - name: concourse-metadata-resource
             - name: results
 {% endfor %}
-{% if repository.upstream_fork != "apache" or repository.branch == "develop" %}
+{% if repository.upstream_fork != "apache" or repository.branch == "develop" or repository.branch.startswith("support/") %}
 - name: PublishArtifacts
   public: true
   plan:

dev-tools/release/README.md

@@ -10,6 +10,7 @@ These scripts are intended to be run from the parent directory of your geode dev
 Overview of scripts:
 
 create_support_branches.sh: cuts support/x.y from develop for all projects and walks you through creating pipelines and setting version numbers
+  set_copyright.sh updates the copyright year
 set_versions.sh: updates files that need to contain the version number planned for the next release from this support branch
 prepare_rc.sh: Checks out the various geode repos, builds a release candidate, and publishes to nexus staging repo
 commit_rc.sh: Pushes the tags and artifacts staged by prepare_rc.sh and then runs print_rc_email.sh

dev-tools/release/commit_rc.sh

@@ -109,12 +109,21 @@ set +x
 
 echo ""
 echo "============================================================"
-echo "Pushing tags..."
+echo "Re-adding -SNAPSHOT in case this is not the final RC"
 echo "============================================================"
+set -x
+${0%/*}/set_versions.sh -v ${VERSION} -s -n -w "${WORKSPACE}"
+set +x
+
 
+echo ""
+echo "============================================================"
+echo "Pushing copyrights, versions, and tags..."
+echo "============================================================"
 for DIR in ${GEODE} ${GEODE_EXAMPLES} ${GEODE_NATIVE} ${GEODE_BENCHMARKS} ; do
     set -x
     cd ${DIR}
+    git push -u origin
     git push origin rel/v${FULL_VERSION}
     set +x
 done

dev-tools/release/create_support_branches.sh

@@ -67,6 +67,7 @@ WORKSPACE=$PWD/support-${VERSION_MM}-workspace
 GEODE=$WORKSPACE/geode
 GEODE_DEVELOP=$WORKSPACE/geode-develop
 GEODE_EXAMPLES=$WORKSPACE/geode-examples
+GEODE_EXAMPLES_DEVELOP=$WORKSPACE/geode-examples-develop
 GEODE_NATIVE=$WORKSPACE/geode-native
 GEODE_BENCHMARKS=$WORKSPACE/geode-benchmarks
 set +x
@@ -97,6 +98,7 @@ set -x
 git clone --single-branch --branch develop [email protected]:apache/geode.git
 git clone --single-branch --branch develop [email protected]:apache/geode.git geode-develop
 git clone --single-branch --branch develop [email protected]:apache/geode-examples.git
+git clone --single-branch --branch develop [email protected]:apache/geode-examples.git geode-examples-develop
 git clone --single-branch --branch develop [email protected]:apache/geode-native.git
 git clone --single-branch --branch develop [email protected]:apache/geode-benchmarks.git
 set +x
@@ -110,6 +112,27 @@ function failMsg2 {
 trap 'failMsg2 $LINENO' ERR
 
 
+set -x
+${0%/*}/set_copyright.sh ${GEODE} ${GEODE_DEVELOP} ${GEODE_EXAMPLES} ${GEODE_EXAMPLES_DEVELOP} ${GEODE_NATIVE} ${GEODE_BENCHMARKS}
+set +x
+
+
+echo ""
+echo "============================================================"
+echo "Pushing copyright updates (if any) to develop before branching"
+echo "============================================================"
+#get these 2 done before the branch so we don't have to do develop and support separately.
+#the other 2 will be pushed to develop and support versions when version bumps are pushed.
+for DIR in ${GEODE_NATIVE} ${GEODE_BENCHMARKS} ; do
+    set -x
+    cd ${DIR}
+    if ! [ git push --dry-run 2>&1 | grep -q 'Everything up-to-date' ] ; then
+      git push -u origin
+    fi
+    set +x
+done
+
+
 echo ""
 echo "============================================================"
 echo "Creating support/${VERSION_MM} branches"
@@ -118,7 +141,7 @@ for DIR in ${GEODE} ${GEODE_EXAMPLES} ${GEODE_NATIVE} ${GEODE_BENCHMARKS} ; do
     set -x
     cd ${DIR}
     git checkout -b support/${VERSION_MM}
-    git push -u origin HEAD
+    git push -u origin
     set +x
 done
 
@@ -129,16 +152,16 @@ echo "Bumping version on develop to ${NEWVERSION}"
 echo "============================================================"
 set -x
 cd ${GEODE_DEVELOP}
-git pull
+git pull -r
 git remote add myfork [email protected]:${GITHUB_USER}/geode.git || true
 git checkout -b roll-develop-to-${NEWVERSION}
 set +x
 
 #version = 1.13.0-SNAPSHOT
 sed -e "s/^version =.*/version = ${NEWVERSION}-SNAPSHOT/" -i.bak gradle.properties
 
-#  initial_version: 1.12.0
-sed -e "s/^  initial_version:.*/  initial_version: ${NEWVERSION}/" -i.bak ./ci/pipelines/shared/jinja.variables.yml
+#  initial_version: 1.13.0-SNAPSHOT
+sed -e "s/^  initial_version:.*/  initial_version: ${NEWVERSION}-SNAPSHOT/" -i.bak ./ci/pipelines/shared/jinja.variables.yml
 
 VER=geode-serialization/src/main/java/org/apache/geode/internal/serialization/Version.java
 #add the new ordinal and Version constants and set them as current&highest
@@ -181,21 +204,43 @@ set -x
 git add .
 git diff --staged
 
-./gradlew clean
-./gradlew build -Dskip.tests=true
 ./gradlew updateExpectedPom
 
 git commit -a -m "roll develop to ${NEWVERSION} now that support/${VERSION_MM} has been created"
 git push -u myfork
 set +x
 
 
+echo ""
+echo "============================================================"
+echo "Bumping examples version on develop to ${NEWVERSION}"
+echo "============================================================"
+set -x
+cd ${GEODE_EXAMPLES_DEVELOP}
+git pull -r
+set +x
+
+#version = 1.13.0-SNAPSHOT
+#geodeVersion = 1.13.0-SNAPSHOT
+sed \
+  -e "s/^version =.*/version = ${NEWVERSION}-SNAPSHOT/" \
+  -e "s/^geodeVersion =.*/geodeVersion = ${NEWVERSION}-SNAPSHOT/" \
+  -i.bak gradle.properties
+rm gradle.properties.bak
+set -x
+git add gradle.properties
+git diff --staged
+git commit -m "point develop examples to ${NEWVERSION}-SNAPSHOT now that support/${VERSION_MM} has been created"
+git push -u origin
+set +x
+
+
 echo ""
 echo "============================================================"
 echo "Setting version on support/${VERSION_MM}"
 echo "============================================================"
 set -x
-${0%/*}/set_versions.sh -v ${VERSION_MM}.0
+${0%/*}/set_versions.sh -v ${VERSION_MM}.0 -s -w "${WORKSPACE}"
 set +x
 
 
@@ -218,3 +263,4 @@ echo "1. Go to https://github.com/${GITHUB_USER}/geode/pull/new/roll-develop-to-
 echo "2. Plus the BumpMinor job at https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-develop-main?group=Semver%20Management"
 echo "3. Add the new version to Jira at https://issues.apache.org/jira/projects/GEODE?selectedItem=com.atlassian.jira.jira-projects-plugin:release-page"
 echo "4. (cd ${GEODE}/ci/pipelines/meta && ./deploy_meta.sh) #takes about 2 hours. keep re-running until successful."
+echo "5. That's it for now.  Once all needed fixes have been proposed and cherry-picked to support/${VERSION_MM} and https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-support-${VERSION_MM/./-}-main is green, come back and run ${0%/*}/prepare_rc.sh -v ${VERSION}.RC1"

dev-tools/release/prepare_rc.sh

@@ -98,7 +98,6 @@ fi
 set -x
 WORKSPACE=$PWD/release-${VERSION}-workspace
 GEODE=$WORKSPACE/geode
-GEODE_DEVELOP=$WORKSPACE/geode-develop
 GEODE_EXAMPLES=$WORKSPACE/geode-examples
 GEODE_NATIVE=$WORKSPACE/geode-native
 GEODE_BENCHMARKS=$WORKSPACE/geode-benchmarks
@@ -147,6 +146,21 @@ svn update --set-depth infinity --parents dist/dev/geode
 set +x
 
 
+set -x
+${0%/*}/set_copyright.sh ${GEODE} ${GEODE_EXAMPLES} ${GEODE_NATIVE} ${GEODE_BENCHMARKS}
+
+set +x
+
+
+echo ""
+echo "============================================================"
+echo "Removing -SNAPSHOT"
+echo "============================================================"
+set -x
+${0%/*}/set_versions.sh -v ${VERSION} -n -w ${WORKSPACE}
+set +x
+
+
 echo ""
 echo "============================================================"
 echo "Building geode..."

dev-tools/release/promote_rc.sh

@@ -437,5 +437,6 @@ PATCH="${VERSION##*.}"
 [ "${PATCH}" -ne 0 ] || echo "9. Ask on the dev list for a volunteer to begin the chore of updating 3rd-party dependency versions on develop"
 M=$(date --date '+9 months' '+%a, %B %d %Y' 2>/dev/null || date -v +9m "+%a, %B %d %Y" 2>/dev/null || echo "9 months from now")
 [ "${PATCH}" -ne 0 ] || echo "10. Mark your calendar for $M to run ${0%/*}/end_of_support.sh -v ${VERSION_MM}"
-echo "Run ${0%/*}/set_versions.sh -v ${VERSION_MM}.$(( PATCH + 1 ))"
+echo "Bump support pipeline to ${VERSION_MM}.$(( PATCH + 1 )) by plussing BumpPatch in https://concourse.apachegeode-ci.info/teams/main/pipelines/apache-support-${VERSION_MM//./-}-main?group=Semver%20Management"
+echo "Run ${0%/*}/set_versions.sh -v ${VERSION_MM}.$(( PATCH + 1 )) -s"
 echo "Finally, send announce email!"

dev-tools/release/set_copyright.sh

@@ -0,0 +1,57 @@
+#!/usr/bin/env 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
+
+usage() {
+    echo "Usage: set_copyright.sh dirs"
+    exit 1
+}
+
+if [[ "$1" == "" ]] ; then
+    usage
+fi
+
+function failMsg {
+  errln=$1
+  echo "ERROR: set_copyright script did NOT complete successfully"
+  echo "Comment out any steps that already succeeded (approximately lines 37-$(( errln - 1 ))) and try again"
+}
+trap 'failMsg $LINENO' ERR
+
+
+echo ""
+echo "============================================================"
+echo "Checking Copyright NOTICE and updating year if necessary"
+echo "============================================================"
+set -x
+year=$(date +%Y)
+for DIR in $@ ; do
+    cd ${DIR}
+    sed \
+      -e "2s/ \(20[0-9][0-9]\) / \1-${year} /" \
+      -e "2s/-20[0-9][0-9] /-${year} /" \
+      -e "2s/${year}-${year}/${year}/" \
+      -i.bak NOTICE
+    rm -f NOTICE.bak
+    git add NOTICE
+    git diff --staged
+    if [ $(git diff --staged | wc -l) -gt 0 ] ; then
+      git commit -a -m "Bumping copyright year to ${year}"
+    fi
+done
+set +x