From 75e9f52114dbf64843b5c9bfa09255f03984000b Mon Sep 17 00:00:00 2001
From: Ben Manes <ben.manes@gmail.com>
Date: Tue, 8 Nov 2022 08:42:02 -0800
Subject: [PATCH] further trim ci matrix for network stability

---
 .github/workflows/analysis.yml              |  8 ++------
 .github/workflows/codeql.yml                |  2 +-
 .github/workflows/dependency-submission.yml |  2 +-
 .github/workflows/examples.yml              | 14 ++++----------
 gradle/dependencies.gradle                  |  3 ++-
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 6 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 2a87a02eee..e7479668d7 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -5,15 +5,11 @@ on: [ push, pull_request ]
 env:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
+  JAVA_VERSION: 19
 
 jobs:
   analyze:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ 11, 19 ]
-    env:
-      JAVA_VERSION: ${{ matrix.java }}
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@2e205a28d0e1da00c5f53b161f4067b052c61f34
@@ -23,8 +19,8 @@ jobs:
       - name: Run analyzers
         uses: ./.github/actions/run-gradle
         with:
+          java: ${{ env.JAVA_VERSION }}
           early-access: false
-          java: ${{ matrix.java }}
           arguments: >
             forbiddenApis -DforbiddenApis
             pmdJavaPoet pmdMain pmdCodeGen pmdJmh -Dpmd
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a12c7f6ffb..5b4d4da000 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -23,7 +23,7 @@ permissions:
 env:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 18
+  JAVA_VERSION: 19
 
 jobs:
   analyze:
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 8c9b2f6069..a22359e67d 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -7,7 +7,7 @@ permissions: read-all
 env:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  JAVA_VERSION: 18
+  JAVA_VERSION: 19
 
 jobs:
   dependency-submission:
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 9f7af267be..494eac929e 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -5,30 +5,25 @@ on: [ push, pull_request ]
 env:
   GRADLE_ENTERPRISE_CACHE_PASSWORD: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
-  MAX_JVM: 18
+  JAVA_VERSION: 19
 
 jobs:
   examples:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ 11, 18 ]
-    env:
-      JAVA_VERSION: ${{ matrix.java }}
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@2e205a28d0e1da00c5f53b161f4067b052c61f34
         with:
           egress-policy: audit
       - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.java }}
+      - name: Set up JDK ${{ env.JAVA_VERSION }}
         uses: Wandalen/wretry.action@v1.0.36
         timeout-minutes: 5
         with:
           action: actions/setup-java@v3
           with: |
             distribution: temurin
-            java-version: ${{ matrix.java }}
+            java-version: ${{ env.JAVA_VERSION }}
           attempt_limit: 3
           attempt_delay: 2000
       - name: Setup Gradle
@@ -47,7 +42,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
+          key: ${{ runner.os }}-maven-${{ env.JAVA_VERSION }}-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Simulator
@@ -58,7 +53,6 @@ jobs:
           -Dcaffeine.simulator.files.paths.1="lirs:loop.trace.gz"
           -Dcaffeine.simulator.files.paths.2="corda:trace_vaultservice.gz"
       - name: Publish Simulator Results
-        if: matrix.java == env.MAX_JVM
         run: |
           {
             echo '### Adaptivity'
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index d84d8085df..ec10117a58 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -114,7 +114,7 @@ ext {
   ]
   platformVerrsions = [
     asm: '9.4',
-    kotlin: '1.7.20',
+    kotlin: '1.7.21',
   ]
 
   libraries = [
@@ -262,6 +262,7 @@ ext {
     'com.fasterxml.jackson:jackson-bom': '2.13.4.20221013',
     'com.google.protobuf:protobuf-java': '3.21.8',
     'com.thoughtworks.xstream:xstream': '1.4.19',
+    'org.apache.bcel:bcel': '6.6.1',
     'org.apache.commons:commons-text': '1.10.0',
     'org.apache.httpcomponents:httpclient': '4.5.13',
     'org.bouncycastle:bcprov-jdk15on': '1.70',
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9549229a40..b6b4c2aa05 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-rc-2-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME