Merge branch 'develop' into feature/GEODE-7049

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

@@ -562,31 +562,31 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>2.11.1</version>
+        <version>2.12.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.11.1</version>
+        <version>2.12.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jcl</artifactId>
-        <version>2.11.1</version>
+        <version>2.12.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jul</artifactId>
-        <version>2.11.1</version>
+        <version>2.12.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
-        <version>2.11.1</version>
+        <version>2.12.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
@@ -871,6 +871,18 @@
         <version>1.11.0-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-serialization</artifactId>
+        <version>1.11.0-SNAPSHOT</version>
+        <scope>compile</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-unsafe</artifactId>
+        <version>1.11.0-SNAPSHOT</version>
+        <scope>compile</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
         <artifactId>geode-wan</artifactId>

build.gradle

@@ -95,7 +95,7 @@ ext.readScmInfo = { proj ->
     } finally {
       git.close()
     }
-  } catch (IllegalArgumentException ignoredDistributionBuild) {
+  } catch (IllegalStateException ignoredDistributionBuild) {
     // If we're building from the source distribution, we don't have git.
     // Instead, we use the .buildinfo copied to the root directory during the distribution build
     // from the writeBuildInfo task below (from build/.buildinfo)

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

@@ -40,7 +40,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("fastutil.version", "8.2.2")
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
-    deps.put("log4j.version", "2.11.1")
+    deps.put("log4j.version", "2.12.0")
     deps.put("micrometer.version", "1.2.0")
     deps.put("shiro.version", "1.4.0")
     deps.put("slf4j-api.version", "1.7.25")

buildSrc/src/main/java/com/pedjak/gradle/plugins/dockerizedtest/DockerizedExecHandle.java

@@ -26,7 +26,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -160,13 +159,13 @@ public DockerizedExecHandle(DockerizedTestExtension testExtension, String displa
     this.timeoutMillis = timeoutMillis;
     this.daemon = daemon;
     this.executor = executor;
-    this.lock = new ReentrantLock();
-    this.stateChanged = lock.newCondition();
-    this.state = ExecHandleState.INIT;
     this.buildCancellationToken = buildCancellationToken;
     this.testExtension = testExtension;
+    lock = new ReentrantLock();
+    stateChanged = lock.newCondition();
+    state = ExecHandleState.INIT;
     shutdownHookAction = new ExecHandleShutdownHookAction(this);
-    broadcast = new ListenerBroadcast<ExecHandleListener>(ExecHandleListener.class);
+    broadcast = new ListenerBroadcast<>(ExecHandleListener.class);
     broadcast.addAll(listeners);
   }
 
@@ -214,7 +213,7 @@ private void setState(ExecHandleState state) {
     try {
       LOGGER.debug("Changing state to: {}", state);
       this.state = state;
-      this.stateChanged.signalAll();
+      stateChanged.signalAll();
     } finally {
       lock.unlock();
     }
@@ -223,7 +222,7 @@ private void setState(ExecHandleState state) {
   private boolean stateIn(ExecHandleState... states) {
     lock.lock();
     try {
-      return Arrays.asList(states).contains(this.state);
+      return Arrays.asList(states).contains(state);
     } finally {
       lock.unlock();
     }
@@ -235,7 +234,7 @@ private void setEndStateInfo(ExecHandleState newState, int exitValue, Throwable
     ExecHandleState currentState;
     lock.lock();
     try {
-      currentState = this.state;
+      currentState = state;
     } finally {
       lock.unlock();
     }
@@ -254,7 +253,7 @@ private void setEndStateInfo(ExecHandleState newState, int exitValue, Throwable
     lock.lock();
     try {
       setState(newState);
-      this.execResult = newResult;
+      execResult = newResult;
     } finally {
       lock.unlock();
     }
@@ -330,8 +329,8 @@ public void abort() {
             format("Cannot abort process '%s' because it is not in started or detached state",
                 displayName));
       }
-      this.execHandleRunner.abortProcess();
-      this.waitForFinish();
+      execHandleRunner.abortProcess();
+      waitForFinish();
     } finally {
       lock.unlock();
     }
@@ -427,7 +426,7 @@ public int getTimeout() {
   public Process runContainer() {
     try {
       DockerClient client = testExtension.getClient();
-      CreateContainerCmd createCmd = client.createContainerCmd(testExtension.getImage().toString())
+      CreateContainerCmd createCmd = client.createContainerCmd(testExtension.getImage())
           .withTty(false)
           .withStdinOpen(true)
           .withWorkingDir(directory.getAbsolutePath());
@@ -439,7 +438,7 @@ public Process runContainer() {
         createCmd.withUser(user);
       }
       bindVolumes(createCmd);
-      List<String> cmdLine = new ArrayList<String>();
+      List<String> cmdLine = new ArrayList<>();
       cmdLine.add(command);
       cmdLine.addAll(arguments);
       createCmd.withCmd(cmdLine);
@@ -482,18 +481,19 @@ private void invokeIfNotNull(Closure closure, Object... args) {
   }
 
   private List<String> getEnv() {
-    List<String> env = new ArrayList<String>();
+    List<String> env = new ArrayList<>();
     for (Map.Entry<String, String> e : environment.entrySet()) {
       env.add(e.getKey() + "=" + e.getValue());
     }
     return env;
   }
 
   private void bindVolumes(CreateContainerCmd cmd) {
-    List<Volume> volumes = new ArrayList<Volume>();
-    List<Bind> binds = new ArrayList<Bind>();
-    for (Iterator it = testExtension.getVolumes().entrySet().iterator(); it.hasNext(); ) {
-      Map.Entry<Object, Object> e = (Map.Entry<Object, Object>) it.next();
+    List<Volume> volumes = new ArrayList<>();
+    List<Bind> binds = new ArrayList<>();
+    for (Object o : testExtension.getVolumes().entrySet()) {
+      @SuppressWarnings("unchecked")
+      Map.Entry<Object, Object> e = (Map.Entry<Object, Object>) o;
       Volume volume = new Volume(e.getValue().toString());
       Bind bind = new Bind(e.getKey().toString(), volume);
       binds.add(bind);

ci/images/google-windows-geode-builder/build_image.sh

@@ -15,7 +15,6 @@
 # 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 -x
 
 PACKER=${PACKER:-packer135}
 PACKER_ARGS="${*}"

ci/pipelines/examples/jinja.template.yml

@@ -54,7 +54,7 @@ resources:
   type: git
   source:
     uri: https://github.com/apache/geode-examples.git
-    branch: develop
+    branch: {{ repository.branch }}
     depth: 10
 - name: geode-ci
   type: git

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

@@ -156,6 +156,8 @@ resources:
     branch: ((geode-build-branch))
     ignore_paths:
     - ci/*
+    - dev-tools/release/*
+    - "*.md"
     {{ github_access() | indent(4) }}
 - name: geode-ci
   type: git
@@ -169,7 +171,7 @@ resources:
 - name: geode-benchmarks
   type: git
   source:
-    branch: {{benchmarks.branch}}
+    branch: {{benchmarks.benchmark_branch}}
     depth: 1
     uri: https://github.com/apache/geode-benchmarks.git
 - name: geode-build-version
@@ -272,7 +274,7 @@ jobs:
         - name: geode-ci
         - name: geode
         - name: instance-data
-    timeout: 5m
+    timeout: 10m
     on_failure:
       do:
       - task: delete_instance
@@ -299,6 +301,7 @@ jobs:
       outputs:
       - name: built-geode
       - name: results
+    timeout: {{build_test.EXECUTE_TEST_TIMEOUT}}
     ensure:
       do:
       - task: rsync_code_down
@@ -411,47 +414,52 @@ jobs:
       passed:
       {{ all_gating_jobs() | indent(6) }}
     - put: concourse-metadata-resource
-  - task: run_benchmarks
-    {{- alpine_tools_config()|indent(4) }}
-      params:
-        AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
-        AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
-        AWS_DEFAULT_REGION: us-west-2
-        AWS_REGION: us-west-2
-        ARTIFACT_BUCKET: ((artifact-bucket))
-        BENCHMARKS_BRANCH: {{benchmarks.branch}}
-        BASELINE_BRANCH: {{benchmarks.baseline_branch}}
-        BASELINE_VERSION: {{benchmarks.baseline_version}}
-      run:
-        path: geode-ci/ci/scripts/run_benchmarks.sh
-      inputs:
-      - name: geode
-      - name: geode-ci
-      - name: geode-benchmarks
-      - name: concourse-metadata-resource
-      outputs:
-      - name: results
-    timeout: 4h
-    ensure:
-      do:
-      - task: cleanup_benchmarks
-        {{- alpine_tools_config()|indent(8) }}
-          params:
-            AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
-            AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
-            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}}
-          run:
-            path: geode-ci/ci/scripts/cleanup_benchmarks.sh
-          inputs:
-          - name: geode
-          - name: geode-ci
-          - name: geode-benchmarks
-          - name: concourse-metadata-resource
-          - name: results
+  - aggregate:
+    {% for ssl_var in [{'title': '_without_ssl', 'flag':''}, {'title': '_with_ssl', 'flag': '-PwithSsl'}] %}
+    - task: run_benchmarks{{ ssl_var.title }}
+      {{- alpine_tools_config()|indent(6) }}
+        params:
+          AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
+          AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
+          AWS_DEFAULT_REGION: us-west-2
+          AWS_REGION: us-west-2
+          ARTIFACT_BUCKET: ((artifact-bucket))
+          BENCHMARKS_BRANCH: {{benchmarks.benchmark_branch}}
+          BASELINE_BRANCH: {{benchmarks.baseline_branch}}
+          BASELINE_VERSION: {{benchmarks.baseline_version}}
+          WITH_SSL: {{ ssl_var.flag }}
+        run:
+          path: geode-ci/ci/scripts/run_benchmarks.sh
+        inputs:
+        - name: geode
+        - name: geode-ci
+        - name: geode-benchmarks
+        - name: concourse-metadata-resource
+        outputs:
+        - name: results
+      timeout: 4h
+      ensure:
+        do:
+        - task: cleanup_benchmarks
+          {{- alpine_tools_config()|indent(10) }}
+            params:
+              AWS_ACCESS_KEY_ID: ((benchmarks-access-key-id))
+              AWS_SECRET_ACCESS_KEY: ((benchmarks-secret-access-key))
+              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}}
+              WITH_SSL: {{ ssl_var.flag }}
+            run:
+              path: geode-ci/ci/scripts/cleanup_benchmarks.sh
+            inputs:
+            - name: geode
+            - name: geode-ci
+            - name: geode-benchmarks
+            - name: concourse-metadata-resource
+            - name: results
+    {% endfor %}
 {% if repository.upstream_fork != "apache" or repository.branch == "develop" %}
 - name: PublishArtifacts
   public: true

ci/pipelines/shared/jinja.variables.yml

@@ -18,14 +18,14 @@
 benchmarks:
   baseline_branch: develop/highwater
   baseline_version: ''
-  branch: develop
+  benchmark_branch: develop
 
 build_test:
   ARTIFACT_SLUG: build
-  CALL_STACK_TIMEOUT: '1800'
+  CALL_STACK_TIMEOUT: '600'
   CPUS: '8'
   DUNIT_PARALLEL_FORKS: '4'
-  EXECUTE_TEST_TIMEOUT: 10m
+  EXECUTE_TEST_TIMEOUT: 20m
   GRADLE_TASK: build
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'false'
@@ -67,10 +67,10 @@ repository:
 
 tests:
 - ARTIFACT_SLUG: unittestfiles
-  CALL_STACK_TIMEOUT: '1800'
+  CALL_STACK_TIMEOUT: '1200'
   CPUS: '8'
   DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 10m
+  EXECUTE_TEST_TIMEOUT: 30m
   GRADLE_TASK: test
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'true'
@@ -81,7 +81,7 @@ tests:
   CALL_STACK_TIMEOUT: '1800'
   CPUS: '8'
   DUNIT_PARALLEL_FORKS: '0'
-  EXECUTE_TEST_TIMEOUT: 45m
+  EXECUTE_TEST_TIMEOUT: 1h
   GRADLE_TASK: acceptanceTest
   PARALLEL_DUNIT: 'false'
   PARALLEL_GRADLE: 'false'
@@ -96,7 +96,7 @@ tests:
   GRADLE_TASK: distributedTest
   PARALLEL_DUNIT: 'true'
   PLATFORM: linux
-  RAM: '180'
+  RAM: '250'
   name: Distributed
 - ARTIFACT_SLUG: integrationtestfiles
   CALL_STACK_TIMEOUT: '1500'