switch to 6.6.15

apereo · Dec 29, 2023 · 424d263 · 424d263
1 parent fe6f9a5
commit 424d263
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -104,7 +104,7 @@ processResources {
     def gradleDockerPluginVersion = project.providers.gradleProperty("gradleDockerPluginVersion").get()
 
     def springBootLatestVersion = project.providers.gradleProperty("springBootLatestVersion").get()
-    def apacheTomcat9LatestVersion = project.providers.gradleProperty("apacheTomcat9LatestVersion").get()
+
     def apacheTomcat10LatestVersion = project.providers.gradleProperty("apacheTomcat10LatestVersion").get()
     def casLatestVersion = project.providers.gradleProperty("casLatestVersion").get()
     def casManagementLatestVersion = project.providers.gradleProperty("casManagementLatestVersion").get()
@@ -116,7 +116,6 @@ processResources {
     filesMatching("**/application-*.yml") {
         expand (
                 springBootLatestVersion: springBootLatestVersion,
-                apacheTomcat9LatestVersion: apacheTomcat9LatestVersion,
                 apacheTomcat10LatestVersion: apacheTomcat10LatestVersion,
                 casLatestVersion: casLatestVersion,
                 casManagementLatestVersion: casManagementLatestVersion,

diff --git a/app/src/main/resources/application-initializr.yml b/app/src/main/resources/application-initializr.yml
@@ -21,7 +21,7 @@ cas-initializr:
       validate: true
       branch: 6.6
       type: cas-mgmt
-      tomcat-version: ${apacheTomcat9LatestVersion}
+      tomcat-version: 9.0.84
       java-version: 11
       container-base-image: eclipse-temurin:11-jdk
       gradle-version: 7.6
@@ -34,20 +34,20 @@ cas-initializr:
       sync: false
       validate: false
       type: cas
-      tomcat-version: ${apacheTomcat9LatestVersion}
+      tomcat-version: 9.0.84
       java-version: 11
       container-base-image: eclipse-temurin:11-jdk
       gradle-version: 7.4
       plugins:
         jib-version: 3.4.0
-    - version: 6.6.14
+    - version: 6.6.15
       platform-version: 6.6.0
       boot-version: 2.7.3
       sync: true
       validate: true
       branch: 6.6
       type: cas
-      tomcat-version: ${apacheTomcat9LatestVersion}
+      tomcat-version: 9.0.84
       java-version: 11
       container-base-image: eclipse-temurin:11-jdk
       gradle-version: 7.6

diff --git a/gradle.properties b/gradle.properties
@@ -42,5 +42,4 @@ casLatestVersion=7.0.0-SNAPSHOT
 
 casManagementLatestVersion=6.6.4
 
-apacheTomcat10LatestVersion=10.1.17
-apacheTomcat9LatestVersion=9.0.84
+apacheTomcat10LatestVersion=10.1.17