GEODE-9478: Merge latest changes from develop

Author: Mario Salazar de Torres

CODEOWNERS

@@ -284,7 +284,7 @@ geode-assembly/**/resources/**                                    @boglesby @kir
 #-----------------------------------------------------------------
 # Redis API
 #-----------------------------------------------------------------
-geode-apis-compatible-with-redis/**                               @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans
+geode-apis-compatible-with-redis/**                               @jdeppe-pivotal @nonbinaryprogrammer @ringles @upthewaterspout @DonalEvans  @dschneider-pivotal
 
 #-----------------------------------------------------------------
 # Build and tooling

boms/geode-all-bom/src/test/resources/expected-pom.xml

@@ -165,7 +165,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.10.0</version>
+        <version>2.11.0</version>
       </dependency>
       <dependency>
         <groupId>commons-logging</groupId>
@@ -185,7 +185,7 @@
       <dependency>
         <groupId>io.github.classgraph</groupId>
         <artifactId>classgraph</artifactId>
-        <version>4.8.109</version>
+        <version>4.8.110</version>
       </dependency>
       <dependency>
         <groupId>io.github.resilience4j</groupId>
@@ -195,12 +195,12 @@
       <dependency>
         <groupId>io.lettuce</groupId>
         <artifactId>lettuce-core</artifactId>
-        <version>6.1.3.RELEASE</version>
+        <version>6.1.4.RELEASE</version>
       </dependency>
       <dependency>
         <groupId>io.micrometer</groupId>
         <artifactId>micrometer-core</artifactId>
-        <version>1.7.1</version>
+        <version>1.7.2</version>
       </dependency>
       <dependency>
         <groupId>io.netty</groupId>
@@ -365,12 +365,12 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>
-        <version>9.4.42.v20210604</version>
+        <version>9.4.43.v20210629</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-webapp</artifactId>
-        <version>9.4.42.v20210604</version>
+        <version>9.4.43.v20210629</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.persistence</groupId>
@@ -430,7 +430,7 @@
       <dependency>
         <groupId>org.springframework.hateoas</groupId>
         <artifactId>spring-hateoas</artifactId>
-        <version>1.3.2</version>
+        <version>1.3.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.ldap</groupId>
@@ -455,7 +455,7 @@
       <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.3</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -645,72 +645,72 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aspects</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-oxm</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
-        <version>5.3.8</version>
+        <version>5.3.9</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jetty</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
-        <version>2.5.2</version>
+        <version>2.5.3</version>
       </dependency>
       <dependency>
         <groupId>org.springframework.session</groupId>

buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy

@@ -34,20 +34,20 @@ class DependencyConstraints implements Plugin<Project> {
     // These version numbers are consumed by :geode-modules-assembly:distAppServer filtering
     // Some of these are referenced below as well
     deps.put("antlr.version", "2.7.7")
-    deps.put("commons-io.version", "2.10.0")
+    deps.put("commons-io.version", "2.11.0")
     deps.put("commons-lang3.version", "3.12.0")
     deps.put("commons-validator.version", "1.7")
     deps.put("fastutil.version", "8.5.4")
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
     deps.put("log4j.version", "2.14.1")
-    deps.put("micrometer.version", "1.7.1")
+    deps.put("micrometer.version", "1.7.2")
     deps.put("shiro.version", "1.7.1")
     deps.put("slf4j-api.version", "1.7.30")
     deps.put("jboss-modules.version", "1.11.0.Final")
     deps.put("jackson.version", "2.12.3")
     deps.put("springshell.version", "1.2.0.RELEASE")
-    deps.put("springframework.version", "5.3.8")
+    deps.put("springframework.version", "5.3.9")
 
     // These version numbers are used in testing various versions of tomcat and are consumed explicitly
     // in will be called explicitly in the relevant extensions module, and respective configurations
@@ -57,11 +57,11 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("tomcat6.version", "6.0.37")
     deps.put("tomcat7.version", "7.0.109")
     deps.put("tomcat8.version", "8.5.66")
-    deps.put("tomcat9.version", "9.0.48")
+    deps.put("tomcat9.version", "9.0.50")
 
     // The jetty version is also hard-coded in geode-assembly:test
     // at o.a.g.sessions.tests.GenericAppServerInstall.java
-    deps.put("jetty.version", "9.4.42.v20210604")
+    deps.put("jetty.version", "9.4.43.v20210629")
 
     // These versions are referenced in test.gradle, which is aggressively injected into all projects.
     deps.put("junit.version", "4.13.2")
@@ -111,9 +111,9 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1')
         api(group: 'commons-validator', name: 'commons-validator', version: get('commons-validator.version'))
         // Careful when upgrading this dependency: see GEODE-7370 and GEODE-8150.
-        api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.109')
+        api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.110')
         api(group: 'io.github.resilience4j', name: 'resilience4j-retry', version: '1.7.1')
-        api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.3.RELEASE')
+        api(group: 'io.lettuce', name: 'lettuce-core', version: '6.1.4.RELEASE')
         api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
         api(group: 'io.netty', name: 'netty-all', version: '4.1.66.Final')
         api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2')
@@ -160,12 +160,12 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
         api(group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0')
         api(group: 'org.slf4j', name: 'slf4j-api', version: get('slf4j-api.version'))
-        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.3.2')
+        api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '1.3.3')
         api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.2.RELEASE')
         api(group: 'org.springframework.shell', name: 'spring-shell', version: get('springshell.version'))
         api(group: 'org.testcontainers', name: 'testcontainers', version: '1.15.3')
         api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
-        api(group: 'redis.clients', name: 'jedis', version: '3.6.1')
+        api(group: 'redis.clients', name: 'jedis', version: '3.6.3')
         api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
       }
     }
@@ -252,7 +252,7 @@ class DependencyConstraints implements Plugin<Project> {
       entry('spring-webmvc')
     }
 
-    dependencySet(group: 'org.springframework.boot', version: '2.5.2') {
+    dependencySet(group: 'org.springframework.boot', version: '2.5.3') {
       entry('spring-boot-starter')
       entry('spring-boot-starter-jetty')
       entry('spring-boot-starter-web')

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

@@ -497,8 +497,8 @@ jobs:
           AWS_REGION: us-west-2
           ARTIFACT_BUCKET: ((artifact-bucket))
           BENCHMARKS_BRANCH: {{benchmarks.benchmark_branch}}
-          BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-          BASELINE_VERSION: {{benchmarks.baseline_version}}
+          BASELINE_BRANCH: {{run_var.baseline_branch if run_var.baseline_branch is defined else benchmarks.baseline_branch_default}}
+          BASELINE_VERSION: {{run_var.baseline_version if run_var.baseline_version is defined else benchmarks.baseline_version_default}}
           FLAGS: {{ run_var.flag }}
           TAG_POSTFIX: -{{ run_var.title }}
           TEST_OPTIONS: {{ run_var.options }}
@@ -525,8 +525,8 @@ jobs:
               AWS_DEFAULT_REGION: us-west-2
               AWS_REGION: us-west-2
               ARTIFACT_BUCKET: ((artifact-bucket))
-              BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-              BASELINE_VERSION: {{benchmarks.baseline_version}}
+              BASELINE_BRANCH: {{run_var.baseline_branch if run_var.baseline_branch is defined else benchmarks.baseline_branch_default}}
+              BASELINE_VERSION: {{run_var.baseline_version if run_var.baseline_version is defined else benchmarks.baseline_version_default}}
               FLAGS: {{ run_var.flag }}
               TAG_POSTFIX: -{{ run_var.title }}
               TEST_OPTIONS: {{ run_var.options }}

ci/pipelines/shared/jinja.variables.yml

@@ -16,8 +16,8 @@
 #
 
 benchmarks:
-  baseline_branch: ''
-  baseline_version: '1.13.4'
+  baseline_branch_default: ''
+  baseline_version_default: '1.13.4'
   benchmark_branch: ((geode-build-branch))
   flavors:
   - title: 'base'
@@ -35,6 +35,15 @@ benchmarks:
     options: '--tests=org.apache.geode.benchmark.tests.Partitioned*'
     max_in_flight: 3
     timeout: 12h
+  - title: 'radish'
+    # The current radish baseline version is taken from the commit:
+    #   GEODE-9169: remove netty context switch (#6725)
+    baseline_branch: 'ed38145379d3da05ecc79a39fa145030bbd4fb1e'
+    baseline_version: ''
+    flag: '-PtestJVM=/usr/lib/jvm/bellsoft-java11-amd64 -Pbenchmark.withRedisCluster=geode -Pbenchmark.withServerCount=2'
+    options: '--tests=org.apache.geode.benchmark.redis.tests.*'
+    max_in_flight: 5
+    timeout: 8h
 
 build_test:
   ARTIFACT_SLUG: build

dev-tools/dependencies/bump.sh

@@ -24,7 +24,7 @@ fi
 
 if [ "$2" = "-l" ] ; then
   ./gradlew dependencyUpdates -Drevision=release ; find . | grep build/dependencyUpdates/report.txt | xargs cat \
-   | grep ' -> ' | egrep -v '(Gradle|antlr|lucene|JUnitParams|docker-compose-rule|javax.servlet-api|springfox|derby|selenium|jgroups|jmh|\[6.0.37|commons-collections|jaxb|testcontainers)' \
+   | grep ' -> ' | egrep -v '(Gradle|antlr|lucene|JUnitParams|docker-compose-rule|javax.servlet-api|springfox|derby|selenium|jgroups|jmh|\[6.0.37|commons-collections|jaxb|testcontainers|gradle-tooling-api|slf4j|archunit)' \
    | sort -u | tr -d '][' | sed -e 's/ -> / /' -e 's#.*:#'"$0 $1"' #'
   exit 0
 fi

dev-tools/release/promote_rc.sh

@@ -218,6 +218,7 @@ sed -e "s/^ENV GEODE_GPG.*/ENV GEODE_GPG ${SIGNING_KEY}/" \
     -e "s/^ENV GEODE_VERSION.*/ENV GEODE_VERSION ${VERSION}/" \
     -e "s/^ENV GEODE_SHA256.*/ENV GEODE_SHA256 ${GEODE_SHA}/" \
     -e "s/ha.pool.sks-keyservers.net/keyserver.ubuntu.com/" \
+    -e '/This is a TEMPLATE/d' \
     -i.bak Dockerfile
 rm Dockerfile.bak
 set -x
@@ -406,7 +407,7 @@ fi
 rm settings.gradle.bak
 if [ -z "$LATER" ] ; then
   #also update benchmark baseline for develop to this new minor
-  sed -e "s/^  baseline_version:.*/  baseline_version: '${VERSION}'/" \
+  sed -e "s/^  baseline_version_default:.*/  baseline_version_default: '${VERSION}'/" \
     -i.bak ci/pipelines/shared/jinja.variables.yml
   rm ci/pipelines/shared/jinja.variables.yml.bak
   BENCHMSG=" and set as Benchmarks baseline"
@@ -423,7 +424,7 @@ set +x
 
 echo ""
 echo "============================================================"
-echo "Updating 'old' versions on support/$VERSION_MM"
+echo "Updating 'old' versions and Benchmarks baseline on support/$VERSION_MM"
 echo "============================================================"
 set -x
 cd ${GEODE}
@@ -435,10 +436,22 @@ sed -e "s/].each/,\\
  '${VERSION}'].each/" \
   -i.bak settings.gradle
 rm settings.gradle.bak
+PATCH=${VERSION##*.}
+if [ $PATCH -eq 0 ] ; then
+  #also update benchmark baseline for support branch to its new minor
+  sed \
+    -e "s/^  baseline_version:.*/  baseline_version: '${VERSION}'/" \
+    -e "s/^  baseline_version_default:.*/  baseline_version_default: '${VERSION}'/" \
+    -i.bak ci/pipelines/shared/jinja.variables.yml
+  rm ci/pipelines/shared/jinja.variables.yml.bak
+  BENCHMSG2=" and set as Benchmarks baseline"
+  set -x
+  git add ci/pipelines/shared/jinja.variables.yml
+fi
 set -x
 git add settings.gradle
 git diff --staged --color | cat
-git commit -m "add ${VERSION} to old versions on support/$VERSION_MM"
+git commit -m "add ${VERSION} to old versions${BENCHMSG2} on support/$VERSION_MM"
 git push
 set +x
 
@@ -492,8 +505,7 @@ MAJOR="${VERSION_MM%.*}"
 MINOR="${VERSION_MM#*.}"
 PATCH="${VERSION##*.}"
 [ "${PATCH}" -ne 0 ] || echo "10. Ask on the dev list for a volunteer to begin the chore of updating 3rd-party dependency versions on develop (see dev-tools/dependencies/README.md)"
-M=$(date --date '+18 months' '+%a, %B %d %Y' 2>/dev/null || date -v +9m "+%a, %B %d %Y" 2>/dev/null || echo "18 months from now")
-[ "${PATCH}" -ne 0 ] || echo "11. Mark your calendar for $M (assuming we release Geode ${MAJOR}.$((MINOR + 3)) on that day) to run ${0%/*}/end_of_support.sh -v ${VERSION_MM}"
+[ "${PATCH}" -ne 0 ] || [ "${MINOR}" -lt 15 ] || echo "11. In accordance with Geode's N-2 support policy, the time has come to ${0%/*}/end_of_support.sh -v ${MAJOR}.$((MINOR - 3))"
 [ "${PATCH}" -ne 0 ] || [ -n "$LATER" ] || echo "12. Log in to https://hub.docker.com/repository/docker/apachegeode/geode and update the latest Dockerfile linktext and url to ${VERSION_MM}"
 echo "If there are any support branches between ${VERSION_MM} and develop, manually cherry-pick '${VERSION}' bumps to those branches of geode and geode-native."
 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"

docker/Dockerfile

@@ -16,26 +16,23 @@
 
 FROM bellsoft/liberica-openjdk-alpine:8
 
+RUN echo "This is a TEMPLATE, DO NOT build from this Dockerfile.  Instead checkout master or any released support/x.y branch." ; exit 1
+
 # runtime dependencies
 RUN apk add --no-cache \
 		bash \
 		ncurses
 
-# pub   4096R/ABF4396F 2018-04-12 [expires: 2022-04-12]
-#       8763 31B4 5A97 E382 D1BD  FB44 4482 0F9C ABF4 396F
-# uid       [  undef ] Mike Stolz <[email protected]>
-# sub   4096R/3871E6AD 2018-04-12 [expires: 2022-04-12]
-ENV GEODE_GPG DB5476815A475574577D442B468A4800EAFB2498
-# TODO does this change per-release like other Apache projects? (and thus needs to be a list of full fingerprints from a KEYS file instead?)
+ENV GEODE_GPG $$PLACEHOLDER$$
 
 ENV GEODE_HOME /geode
 ENV PATH $PATH:$GEODE_HOME/bin
 
 # https://geode.apache.org/releases/
-ENV GEODE_VERSION 1.9.0
+ENV GEODE_VERSION $$PLACEHOLDER$$
 # Binaries TGZ SHA-256
 # https://dist.apache.org/repos/dist/release/geode/VERSION/apache-geode-VERSION.tgz.sha256
-ENV GEODE_SHA256 8794808ebc89bc855f0b989b32e91e890d446cfd058e123f6ccb9e12597c1c4f
+ENV GEODE_SHA256 $$PLACEHOLDER$$
 
 # http://apache.org/dyn/closer.cgi/geode/1.3.0/apache-geode-1.3.0.tgz
 
@@ -50,7 +47,7 @@ RUN set -eux; \
 	; do \
 		target="$(basename "$file")"; \
 		for url in \
-			"https://www.apache.org/dyn/closer.lua/$file?action=download"
+			"https://www.apache.org/dyn/closer.lua/$file?action=download" \
 			"https://downloads.apache.org/$file" \
 			"https://archive.apache.org/dist/$file" \
 		; do \