Springboot bumps (#2126)

* Making updates to Spring boot templates, as suggested by @trisberg Signed-off-by: Matthias Wessendorf <[email protected]> * 🤖 We touched the samples, so adding the generated thing Signed-off-by: Matthias Wessendorf <[email protected]> * Bump JDK Builder to 21 Signed-off-by: Matthias Wessendorf <[email protected]> * Some more java 21 setters Signed-off-by: Matthias Wessendorf <[email protected]> --------- Signed-off-by: Matthias Wessendorf <[email protected]>
knative · Jan 22, 2024 · c252c4f · c252c4f
1 parent 8e56c52
commit c252c4f
Show file tree

Hide file tree

Showing 9 changed files with 6,837 additions and 6,837 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -20,7 +20,7 @@ jobs:
   test-unit:
     strategy:
       matrix:
-        java: [ 17 ]
+        java: [ 21 ]
         os: [ "ubuntu-latest", "windows-latest", "macos-latest" ]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/test-unit.yaml b/.github/workflows/test-unit.yaml
@@ -7,7 +7,7 @@ jobs:
     name: Unit Test
     strategy:
       matrix:
-        java: [17]
+        java: [21]
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/.github/workflows/update-quarkus-platform.yaml b/.github/workflows/update-quarkus-platform.yaml
@@ -20,7 +20,7 @@ jobs:
           node-version: 18
       - uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Install NPM deps.
         run: npm install axios xml2js octokit
       - name: Create PR

diff --git a/.github/workflows/update-springboot-platform.yaml b/.github/workflows/update-springboot-platform.yaml
@@ -20,7 +20,7 @@ jobs:
           node-version: 18
       - uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Install NPM deps.
         run: npm install axios xml2js octokit yaml semver
       - name: Create PR

diff --git a/generate/zz_filesystem_generated.go b/generate/zz_filesystem_generated.go
diff --git a/pkg/builders/s2i/builder.go b/pkg/builders/s2i/builder.go
@@ -39,7 +39,7 @@ import (
 const DefaultName = builders.S2I
 
 var DefaultNodeBuilder = "registry.access.redhat.com/ubi8/nodejs-16-minimal"
-var DefaultQuarkusBuilder = "registry.access.redhat.com/ubi8/openjdk-17"
+var DefaultQuarkusBuilder = "registry.access.redhat.com/ubi8/openjdk-21"
 var DefaultPythonBuilder = "registry.access.redhat.com/ubi8/python-39"
 
 // DefaultBuilderImages for s2i builders indexed by Runtime Language

diff --git a/templates/springboot/cloudevents/pom.xml b/templates/springboot/cloudevents/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.5</version>
+    <version>3.2.1</version>
     <relativePath/>
   </parent>
   <groupId>com.example.events</groupId>
@@ -13,13 +13,13 @@
   <name>Spring Cloud Function::Events Example</name>
   <description>A Spring Cloud Function, using Cloud Events</description>
   <properties>
-    <java.version>17</java.version>
-    <spring-cloud.version>2022.0.4</spring-cloud.version>
+    <java.version>21</java.version>
+    <spring-cloud.version>2023.0.0</spring-cloud.version>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
     <surefire-plugin.version>3.0.0</surefire-plugin.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>

diff --git a/templates/springboot/http/pom.xml b/templates/springboot/http/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.1.5</version>
+    <version>3.2.1</version>
     <relativePath/>
   </parent>
   <groupId>com.example.events</groupId>
@@ -13,13 +13,13 @@
   <name>Spring Cloud Function::Http Example</name>
   <description>A Spring Cloud Function, Http Example</description>
   <properties>
-    <java.version>17</java.version>
-    <spring-cloud.version>2022.0.4</spring-cloud.version>
+    <java.version>21</java.version>
+    <spring-cloud.version>2023.0.0</spring-cloud.version>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
     <surefire-plugin.version>3.0.0</surefire-plugin.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>

diff --git a/templates/springboot/manifest.yaml b/templates/springboot/manifest.yaml
@@ -2,7 +2,7 @@ buildEnvs:
   - name: BP_NATIVE_IMAGE
     value: "false"
   - name: BP_JVM_VERSION
-    value: "17"
+    value: "21"
   - name: BP_MAVEN_ACTIVE_PROFILES
     value: "native"
 healthEndpoints: