This is an automated email from the ASF dual-hosted git repository.
nnag pushed a commit to branch support/1.14
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.14 by this push:
new 2f317dd Fix 1.14.0 rc1 (#6822)
2f317dd is described below
commit 2f317ddfcd383a6b3374a5d33feb0b14920323f8
Author: Owen Nichols <[email protected]>
AuthorDate: Tue Aug 31 13:51:39 2021 -0700
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
---
ci/docker/cache_dependencies.sh | 2 +-
ci/images/google-geode-builder/scripts/cache_dependencies.sh | 2 +-
geode-assembly/src/main/dist/LICENSE | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ci/docker/cache_dependencies.sh b/ci/docker/cache_dependencies.sh
index 0b72de8..214846e 100644
--- 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
index ef56172..0d2090c 100644
--- 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
index a25297f..65c6b6f 100644
--- 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
