Merge branch 'master' into renovate/gradle-8.x

apereo · Nov 29, 2023 · f727240 · f727240
2 parents 28c831d + b9a8149
commit f727240
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/initializr-build.yml b/.github/workflows/initializr-build.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -56,7 +56,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -78,7 +78,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -101,7 +101,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -130,7 +130,7 @@ jobs:
         if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
         run: ls ./ci && find ./ci -type f -name "*.sh" -exec chmod +x "{}" \;
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -146,7 +146,7 @@ jobs:
             --apache-tomcat ${{ matrix.versions.tomcat-version }}
       - name: Set up JDK
         if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ matrix.versions.java-version }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -169,7 +169,7 @@ jobs:
         if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
         run: ls ./ci && find ./ci -type f -name "*.sh" -exec chmod +x "{}" \;
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -186,7 +186,7 @@ jobs:
               --apache-tomcat ${{ matrix.versions.tomcat-version }}
       - name: Set up JDK
         if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ matrix.versions.java-version }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -208,7 +208,7 @@ jobs:
         if: ${{ matrix.versions.validate == true }}
         run: ls ./ci && find ./ci -type f -name "*.sh" -exec chmod +x "{}" \;
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -224,7 +224,7 @@ jobs:
             --spring-boot ${{ matrix.versions.boot-version }} \
             --apache-tomcat ${{ matrix.versions.tomcat-version }}
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ matrix.versions.java-version }}
@@ -257,7 +257,7 @@ jobs:
         if: ${{ matrix.versions.validate == true }}
         run: ls ./ci && find ./ci -type f -name "*.sh" -exec chmod +x "{}" \;
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -272,7 +272,7 @@ jobs:
           ./ci/validate-cas-mgmt-overlay.sh --fetch-only --cas ${{ matrix.versions.version }} \
             --apache-tomcat ${{ matrix.versions.tomcat-version }}
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -298,7 +298,7 @@ jobs:
         if: ${{ matrix.versions.validate == true }}
         run: ls ./ci && find ./ci -type f -name "*.sh" -exec chmod +x "{}" \;
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -313,7 +313,7 @@ jobs:
           ./ci/validate-cas-configserver-overlay.sh --fetch-only --cas ${{ matrix.versions.version }} \
             --apache-tomcat ${{ matrix.versions.tomcat-version }}
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ matrix.versions.java-version }}
@@ -339,7 +339,7 @@ jobs:
         if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
         run: ls ./ci && find ./ci -type f -name "*.sh" -exec chmod +x "{}" \;
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         if: ${{ matrix.versions.validate == true }}
         with:
           java-version: ${{ env.JDK_CURRENT }}
@@ -355,7 +355,7 @@ jobs:
             --apache-tomcat ${{ matrix.versions.tomcat-version }}
       - name: Set up JDK
         if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ matrix.versions.java-version }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -370,7 +370,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}

diff --git a/.github/workflows/initializr-helm.yml b/.github/workflows/initializr-helm.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -50,7 +50,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}
@@ -77,7 +77,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: ${{ env.JDK_DISTRO }}

diff --git a/.github/workflows/initializr-native.yml b/.github/workflows/initializr-native.yml
@@ -33,7 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: 'temurin'
@@ -55,7 +55,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: 'zulu'

diff --git a/app/src/main/resources/common/.github/workflows/build.yml.mustache b/app/src/main/resources/common/.github/workflows/build.yml.mustache
@@ -30,7 +30,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4.0.0
         with:
           java-version: ${{ env.JDK_CURRENT }}
           distribution: 'corretto'