From 3ee9d601da18a0bbbafe9f3b962ca76e9d69b04e Mon Sep 17 00:00:00 2001
From: Roy Clarkson <roy.clarkson@broadcom.com>
Date: Wed, 19 Mar 2025 15:29:03 -0400
Subject: [PATCH] Remove out of support versions from CI configuration

---
 .github/workflows/java-11.yml | 41 -----------------------------------
 .github/workflows/java-17.yml |  4 ++--
 .github/workflows/java-21.yml |  4 ++--
 .github/workflows/java-8.yml  | 41 -----------------------------------
 scripts/set-pipelines.sh      |  2 --
 5 files changed, 4 insertions(+), 88 deletions(-)
 delete mode 100644 .github/workflows/java-11.yml
 delete mode 100644 .github/workflows/java-8.yml

diff --git a/.github/workflows/java-11.yml b/.github/workflows/java-11.yml
deleted file mode 100644
index 36a6d41..0000000
--- a/.github/workflows/java-11.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-
-name: Java 11
-
-on:
-  push:
-    branches: [ 2.3.* ]
-  pull_request:
-    branches: [ 2.3.* ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest            
-    name: Java 11 build
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v4
-        with:
-          java-version: 11
-          distribution: liberica          
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v3
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
diff --git a/.github/workflows/java-17.yml b/.github/workflows/java-17.yml
index ef74a35..c9798ae 100644
--- a/.github/workflows/java-17.yml
+++ b/.github/workflows/java-17.yml
@@ -5,9 +5,9 @@ name: Java 17
 
 on:
   push:
-    branches: [ 3.3.*, 3.2.*, 3.1.*, 3.0.*, 2.3.* ]
+    branches: [ 3.3.*, 3.2.* ]
   pull_request:
-    branches: [ 3.3.*, 3.2.*, 3.1.*, 3.0.*, 2.3.* ]
+    branches: [ 3.3.*, 3.2.* ]
 
 jobs:
   build:
diff --git a/.github/workflows/java-21.yml b/.github/workflows/java-21.yml
index 40621b9..39f9dad 100644
--- a/.github/workflows/java-21.yml
+++ b/.github/workflows/java-21.yml
@@ -5,9 +5,9 @@ name: Java 21
 
 on:
   push:
-    branches: [ 3.3.*, 3.2.*, 3.1.*, 3.0.* ]
+    branches: [ 3.3.*, 3.2.* ]
   pull_request:
-    branches: [ 3.3.*, 3.2.*, 3.1.*, 3.0.* ]
+    branches: [ 3.3.*, 3.2.* ]
 
 jobs:
   build:
diff --git a/.github/workflows/java-8.yml b/.github/workflows/java-8.yml
deleted file mode 100644
index 96de72e..0000000
--- a/.github/workflows/java-8.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# This workflow will build a Java project with Gradle
-# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
-
-name: Java 8
-
-on:
-  push:
-    branches: [ 2.3.* ]
-  pull_request:
-    branches: [ 2.3.* ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest            
-    name: Java 8 build
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 8
-        uses: actions/setup-java@v4
-        with:
-          java-version: 8
-          distribution: liberica          
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v3
-      - name: Build with Gradle
-        run: ./gradlew build
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -f ~/.gradle/caches/modules-2/gc.properties
diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh
index 31d6024..727728d 100755
--- a/scripts/set-pipelines.sh
+++ b/scripts/set-pipelines.sh
@@ -41,11 +41,9 @@ set_pipelines() {
 	fly -t "$FLY_TARGET" sync
   set_pipeline spring-credhub pipeline.yml 3.3.x
   set_pipeline spring-credhub pipeline.yml 3.2.x
-  set_pipeline spring-credhub pipeline.yml 2.3.x
 
   set_pipeline spring-credhub-pr pr-pipeline.yml 3.3.x
   set_pipeline spring-credhub-pr pr-pipeline.yml 3.2.x
-  set_pipeline spring-credhub-pr pr-pipeline.yml 2.3.x
 }
 
 main() {