update versions

apereo · Apr 1, 2022 · 73b157e · 73b157e
1 parent d521ddf
commit 73b157e
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 19 deletions.
diff --git a/.github/workflows/initializr-build.yml b/.github/workflows/initializr-build.yml
@@ -2,7 +2,7 @@ name: Initializr Build
 
 env:
   TERM: xterm-256color
-  JDK_CURRENT: 11.0.14
+  JDK_CURRENT: 11
   DOCKER_USER: ${{ secrets.DOCKER_USER }}
   DOCKER_PWD: ${{ secrets.DOCKER_PWD }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -228,6 +228,32 @@ jobs:
       #   uses: mxschmitt/action-tmate@v3
       - name: Validate Overlay
         run: ./ci/validate-cas-configserver-overlay.sh ${{ matrix.versions.version }} ${{ matrix.versions.boot-version }}
+  sync-cas-configserver-overlay:
+    needs: [ supported-versions-cas ]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        versions: ${{fromJSON(needs.supported-versions-cas.outputs.supported-versions)}}
+    name: Sync CAS Config Server Server ${{ matrix.versions.version }} Branch ${{ matrix.versions.branch }}
+    steps:
+      - uses: actions/checkout@v3
+        if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
+      - name: Set up JDK
+        if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ env.JDK_CURRENT }}
+          distribution: 'temurin'
+      - name: Initialize
+        if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
+        run: chmod -R 777 ./ci/*.sh
+      - uses: actions/download-artifact@v3
+        if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
+        with:
+          name: binary-artifacts
+      - name: Sync Overlay
+        if: ${{ matrix.versions.sync == true && github.event_name == 'push' && env.GH_TOKEN != null }}
+        run: ./ci/sync-overlay.sh ${{ matrix.versions.version }} ${{ matrix.versions.boot-version }} ${{ matrix.versions.branch }} cas-config-server-overlay
   validate-cas-discoveryserver-overlay:
     needs: [ supported-versions-cas ]
     runs-on: ubuntu-latest

diff --git a/app/src/main/resources/application.yml b/app/src/main/resources/application.yml
@@ -58,7 +58,7 @@ cas-initializr:
       sync: true
       branch: 6.3
       type: cas-mgmt
-    - version: 6.4.0
+    - version: 6.4.1
       boot-version: 2.5.4
       platform-version: 6.4.6.2
       sync: true

diff --git a/app/src/main/resources/common/gradle/gradle.properties.mustache b/app/src/main/resources/common/gradle/gradle.properties.mustache
@@ -1,24 +1,21 @@
 {{#managementServer}}
-# The version of this overlay project
-version={{casMgmtVersion}}
-
 # CAS Management version
 casmgmt.version={{casMgmtVersion}}
 
-# CAS server version
+# This is the CAS server version that is compatible
+# with the build/version of the CAS management web application.
 cas.version={{casMgmtCasVersion}}
 springBootVersion={{springBootVersion}}
 {{/managementServer}}
 
 {{^managementServer}}
-# The version of this overlay project
-version={{casVersion}}
-
-#CAS server version
+# CAS server version
 cas.version={{casVersion}}
 springBootVersion={{springBootVersion}}
 {{/managementServer}}
 
+# The version of this overlay project
+version=0.0.1
 group={{groupId}}
 artifactId={{buildSystemId}}
 sourceCompatibility={{javaVersion}}

diff --git a/ci/functions.sh b/ci/functions.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEFAULT_CAS_VERSION=6.5.1
+DEFAULT_CAS_VERSION=6.5.2
 DEFAULT_BOOT_VERSION=2.6.3
 
 CI_DIR="`dirname \"$0\"`"

diff --git a/ci/sync-overlay.sh b/ci/sync-overlay.sh
@@ -14,12 +14,15 @@ mkdir tmp
 cd tmp
 
 case "${TYPE}" in
-   cas-overlay)
-     repoName="cas-overlay-template"
-     ;;
+  cas-overlay)
+    repoName="cas-overlay-template"
+    ;;
+  cas-config-server-overlay)
+    repoName="cas-configserver-overlay"
+    ;;
   cas-management-overlay)
-     repoName="cas-management-overlay"
-     ;;
+    repoName="cas-management-overlay"
+    ;;
 esac
 
 echo "Building Overlay ${TYPE}:${CAS_VERSION} with Spring Boot ${BOOT_VERSION} for branch ${BRANCH}"

diff --git a/ci/validate-cas-mgmt-overlay.sh b/ci/validate-cas-mgmt-overlay.sh
@@ -11,7 +11,7 @@ sleep 30
 rm -Rf tmp &> /dev/null
 mkdir tmp
 cd tmp
-curl http://localhost:8080/starter.tgz -d casVersion=${CAS_VERSION} -d bootVersion=${BOOT_VERSION} -d type=cas-management-overlay -d dependencies="jpasvc" | tar -xzvf -
+curl http://localhost:8080/starter.tgz -d casVersion=${CAS_VERSION} \-d bootVersion=${BOOT_VERSION} -d type=cas-management-overlay -d dependencies="jpasvc" | tar -xzvf -
 kill -9 $pid
 
 echo "Building CAS Mgmt Overlay"

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,6 @@ gradleDependencyManagementPluginVersion=1.0.11.RELEASE
 gradleFreeFairPluginVersion=6.4.1
 gradleDownloadTaskPluginVersion=4.1.1
 
-
 ###################################
 # CAS Server Versions
 # We officially support 3 CAS release lines: Current, Latest, Maintenance 

diff --git a/icm.sh b/icm.sh
@@ -2,4 +2,4 @@
 
 rm -Rf ./tmp
 curl -k http://localhost:8080/starter.tgz -d dependencies="$1" \
-  -d type=cas-management-overlay -d baseDir=tmp | tar -xzvf -
+  -d type=cas-management-overlay -d baseDir=tmp | tar./gradlew -xzvf -