Fix 1.14.0 rc1 (#6822)

* run steps that were missed at branch creation, so src archive will match src tag * fix checker-qual version in license
apache · Aug 31, 2021 · 2f317dd · 2f317dd
1 parent cc7dc90
commit 2f317dd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ci/docker/cache_dependencies.sh b/ci/docker/cache_dependencies.sh
@@ -20,7 +20,7 @@ set -e
 WORK_DIR=$(mktemp -d)
 
 pushd ${WORK_DIR}
-  git clone -b develop --depth 1 https://github.com/apache/geode.git geode
+  git clone -b support/1.14 --depth 1 https://github.com/apache/geode.git geode
 
   pushd geode
     ./gradlew --no-daemon --console=plain --info resolveDependencies

diff --git a/ci/images/google-geode-builder/scripts/cache_dependencies.sh b/ci/images/google-geode-builder/scripts/cache_dependencies.sh
@@ -28,7 +28,7 @@ if [ -z ${JAVA_HOME} ]; then
 fi
 
 pushd ${WORK_DIR}
-  git clone -b develop --depth 1 https://github.com/apache/geode.git geode
+  git clone -b support/1.14 --depth 1 https://github.com/apache/geode.git geode
 
   pushd geode
     ./gradlew --no-daemon --console=plain --info resolveDependencies

diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
@@ -1064,7 +1064,7 @@ The MIT License (http://opensource.org/licenses/mit-license.html)
 
 Apache Geode bundles the following files under the MIT License:
 
-  - Checker Qual v2.10.0 (https://checkerframework.org), Copyright (c)
+  - Checker Qual v3.5.0 (https://checkerframework.org), Copyright (c)
     2004-present by the Checker Framework developers
   - ClassGraph v4.8.52 (https://github.com/classgraph/classgraph), Copyright
     (c) 2019 Luke Hutchison