Bump to latest Spring Boot version

This commit bumps some of the samples to use Spring Boot 2.7.7 and some to use Spring Boot 3.0.1. This is intentional so that we keep some examples of using both. It is also necessary to keep some examples that use Java 8/11 still, since Spring Boot 3.0 requires Java 17+.

Signed-off-by: Daniel Mikusa <[email protected]>

java/akka/build.sbt

@@ -1,12 +1,12 @@
 lazy val akkaHttpVersion = "10.2.9"
-lazy val akkaVersion    = "2.6.19"
+lazy val akkaVersion    = "2.6.20"
 
 lazy val root = (project in file(".")).
   enablePlugins(JavaAppPackaging).
   settings(
     inThisBuild(List(
       organization    := "com.example",
-      scalaVersion    := "2.13.8"
+      scalaVersion    := "2.13.10"
     )),
     name := "akka-http-quickstart-scala",
     libraryDependencies ++= Seq(
@@ -18,6 +18,6 @@ lazy val root = (project in file(".")).
 
       "com.typesafe.akka" %% "akka-http-testkit"        % akkaHttpVersion % Test,
       "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion     % Test,
-      "org.scalatest"     %% "scalatest"                % "3.2.12"         % Test
+      "org.scalatest"     %% "scalatest"                % "3.2.15"         % Test
     )
   )

java/application-insights/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.5</version>
+		<version>2.7.7</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>

java/aspectj/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.5</version>
+		<version>2.7.7</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>

java/dist-zip/build.gradle

@@ -1,13 +1,12 @@
 plugins {
-	id 'org.springframework.boot' version '2.7.5'
+	id 'org.springframework.boot' version '3.0.1'
 	id 'io.spring.dependency-management' version '1.1.0'
 	id 'java'
 	id 'application'
 }
 
 group = 'io.paketo'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '1.8'
 
 repositories {
 	mavenCentral()

java/gradle/build.gradle

@@ -1,12 +1,11 @@
 plugins {
-	id 'org.springframework.boot' version '2.7.5'
+	id 'org.springframework.boot' version '3.0.1'
 	id 'io.spring.dependency-management' version '1.1.0'
 	id 'java'
 }
 
 group = 'io.paketo'
 version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '1.8'
 
 jar {
     enabled = false

java/jar/BOOT-INF/classpath.idx

@@ -1,51 +1,53 @@
-- "BOOT-INF/lib/spring-boot-2.7.4.jar"
-- "BOOT-INF/lib/spring-context-5.3.23.jar"
-- "BOOT-INF/lib/spring-aop-5.3.23.jar"
-- "BOOT-INF/lib/spring-expression-5.3.23.jar"
-- "BOOT-INF/lib/spring-boot-autoconfigure-2.7.4.jar"
-- "BOOT-INF/lib/logback-classic-1.2.11.jar"
-- "BOOT-INF/lib/logback-core-1.2.11.jar"
-- "BOOT-INF/lib/log4j-to-slf4j-2.17.2.jar"
-- "BOOT-INF/lib/log4j-api-2.17.2.jar"
-- "BOOT-INF/lib/jul-to-slf4j-1.7.36.jar"
-- "BOOT-INF/lib/jakarta.annotation-api-1.3.5.jar"
-- "BOOT-INF/lib/snakeyaml-1.30.jar"
-- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-2.7.4.jar"
-- "BOOT-INF/lib/spring-boot-actuator-2.7.4.jar"
-- "BOOT-INF/lib/jackson-databind-2.13.4.jar"
-- "BOOT-INF/lib/jackson-annotations-2.13.4.jar"
-- "BOOT-INF/lib/jackson-core-2.13.4.jar"
-- "BOOT-INF/lib/jackson-datatype-jsr310-2.13.4.jar"
-- "BOOT-INF/lib/micrometer-core-1.9.4.jar"
+- "BOOT-INF/lib/spring-boot-3.0.1.jar"
+- "BOOT-INF/lib/spring-context-6.0.3.jar"
+- "BOOT-INF/lib/spring-aop-6.0.3.jar"
+- "BOOT-INF/lib/spring-expression-6.0.3.jar"
+- "BOOT-INF/lib/spring-boot-autoconfigure-3.0.1.jar"
+- "BOOT-INF/lib/logback-classic-1.4.5.jar"
+- "BOOT-INF/lib/logback-core-1.4.5.jar"
+- "BOOT-INF/lib/log4j-to-slf4j-2.19.0.jar"
+- "BOOT-INF/lib/log4j-api-2.19.0.jar"
+- "BOOT-INF/lib/jul-to-slf4j-2.0.6.jar"
+- "BOOT-INF/lib/jakarta.annotation-api-2.1.1.jar"
+- "BOOT-INF/lib/snakeyaml-1.33.jar"
+- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.0.1.jar"
+- "BOOT-INF/lib/spring-boot-actuator-3.0.1.jar"
+- "BOOT-INF/lib/jackson-databind-2.14.1.jar"
+- "BOOT-INF/lib/jackson-annotations-2.14.1.jar"
+- "BOOT-INF/lib/jackson-core-2.14.1.jar"
+- "BOOT-INF/lib/jackson-datatype-jsr310-2.14.1.jar"
+- "BOOT-INF/lib/micrometer-observation-1.10.2.jar"
+- "BOOT-INF/lib/micrometer-commons-1.10.2.jar"
+- "BOOT-INF/lib/micrometer-core-1.10.2.jar"
 - "BOOT-INF/lib/HdrHistogram-2.1.12.jar"
 - "BOOT-INF/lib/LatencyUtils-2.0.3.jar"
-- "BOOT-INF/lib/jackson-datatype-jdk8-2.13.4.jar"
-- "BOOT-INF/lib/jackson-module-parameter-names-2.13.4.jar"
-- "BOOT-INF/lib/reactor-netty-http-1.0.23.jar"
-- "BOOT-INF/lib/netty-codec-http-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-common-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-buffer-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-transport-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-codec-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-handler-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-codec-http2-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-resolver-dns-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-resolver-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-codec-dns-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.82.Final-osx-x86_64.jar"
-- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-transport-native-epoll-4.1.82.Final-linux-x86_64.jar"
-- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.82.Final.jar"
-- "BOOT-INF/lib/reactor-netty-core-1.0.23.jar"
-- "BOOT-INF/lib/netty-handler-proxy-4.1.82.Final.jar"
-- "BOOT-INF/lib/netty-codec-socks-4.1.82.Final.jar"
-- "BOOT-INF/lib/spring-web-5.3.23.jar"
-- "BOOT-INF/lib/spring-beans-5.3.23.jar"
-- "BOOT-INF/lib/spring-webflux-5.3.23.jar"
-- "BOOT-INF/lib/slf4j-api-1.7.36.jar"
-- "BOOT-INF/lib/spring-core-5.3.23.jar"
-- "BOOT-INF/lib/spring-jcl-5.3.23.jar"
-- "BOOT-INF/lib/reactor-core-3.4.23.jar"
+- "BOOT-INF/lib/jackson-datatype-jdk8-2.14.1.jar"
+- "BOOT-INF/lib/jackson-module-parameter-names-2.14.1.jar"
+- "BOOT-INF/lib/reactor-netty-http-1.1.1.jar"
+- "BOOT-INF/lib/netty-codec-http-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-common-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-buffer-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-transport-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-codec-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-handler-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-codec-http2-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-resolver-dns-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-resolver-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-codec-dns-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar"
+- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar"
+- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.86.Final.jar"
+- "BOOT-INF/lib/reactor-netty-core-1.1.1.jar"
+- "BOOT-INF/lib/netty-handler-proxy-4.1.86.Final.jar"
+- "BOOT-INF/lib/netty-codec-socks-4.1.86.Final.jar"
+- "BOOT-INF/lib/spring-web-6.0.3.jar"
+- "BOOT-INF/lib/spring-beans-6.0.3.jar"
+- "BOOT-INF/lib/spring-webflux-6.0.3.jar"
+- "BOOT-INF/lib/slf4j-api-2.0.6.jar"
+- "BOOT-INF/lib/spring-core-6.0.3.jar"
+- "BOOT-INF/lib/spring-jcl-6.0.3.jar"
+- "BOOT-INF/lib/reactor-core-3.5.1.jar"
 - "BOOT-INF/lib/reactive-streams-1.0.4.jar"
-- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.7.4.jar"
+- "BOOT-INF/lib/spring-boot-jarmode-layertools-3.0.1.jar"

java/jar/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Created-By: Maven JAR Plugin 3.2.2
+Created-By: Maven JAR Plugin 3.3.0
 Build-Jdk-Spec: 17
 Implementation-Title: demo
 Implementation-Version: 0.0.1-SNAPSHOT
 Main-Class: org.springframework.boot.loader.JarLauncher
 Start-Class: io.paketo.demo.DemoApplication
-Spring-Boot-Version: 2.7.4
+Spring-Boot-Version: 3.0.1
 Spring-Boot-Classes: BOOT-INF/classes/
 Spring-Boot-Lib: BOOT-INF/lib/
 Spring-Boot-Classpath-Index: BOOT-INF/classpath.idx

java/jar/META-INF/maven/io.paketo/demo/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.4</version>
+		<version>3.0.1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
@@ -13,10 +13,6 @@
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 
-	<properties>
-		<java.version>11</java.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

java/kotlin/build.gradle.kts

@@ -1,8 +1,8 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("org.springframework.boot") version "2.7.3"
-	id("io.spring.dependency-management") version "1.0.13.RELEASE"
+	id("org.springframework.boot") version "2.7.7"
+	id("io.spring.dependency-management") version "1.1.0"
 	kotlin("jvm") version "1.6.21"
   	kotlin("plugin.spring") version "1.6.21"
 }

java/maven/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.5</version>
+		<version>3.0.1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
@@ -13,10 +13,6 @@
 	<name>demo</name>
 	<description>Demo project for Spring Boot</description>
 
-	<properties>
-		<java.version>11</java.version>
-	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

java/native-image/java-native-image-sample/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.4</version>
+		<version>3.0.1</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
@@ -14,9 +14,7 @@
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
-		<java.version>11</java.version>
-		<repackage.classifier />
-		<spring-native.version>0.12.1</spring-native.version>
+		<java.version>17</java.version>
 	</properties>
 
 	<dependencies>
@@ -28,11 +26,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.experimental</groupId>
-			<artifactId>spring-native</artifactId>
-			<version>${spring-native.version}</version>
-		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -48,6 +41,10 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.graalvm.buildtools</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+			</plugin>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
@@ -62,90 +59,7 @@
 					</image>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.springframework.experimental</groupId>
-				<artifactId>spring-aot-maven-plugin</artifactId>
-				<version>${spring-native.version}</version>
-				<executions>
-					<execution>
-						<id>test-generate</id>
-						<goals>
-							<goal>test-generate</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>generate</id>
-						<goals>
-							<goal>generate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>https://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>https://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<profiles>
-		<profile>
-			<id>native</id>
-			<properties>
-				<repackage.classifier>exec</repackage.classifier>
-				<native-buildtools.version>0.9.13</native-buildtools.version>
-			</properties>
-			<dependencies>
-				<dependency>
-					<groupId>org.junit.platform</groupId>
-					<artifactId>junit-platform-launcher</artifactId>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.graalvm.buildtools</groupId>
-						<artifactId>native-maven-plugin</artifactId>
-						<version>${native-buildtools.version}</version>
-						<extensions>true</extensions>
-						<executions>
-							<execution>
-								<id>test-native</id>
-								<phase>test</phase>
-								<goals>
-									<goal>test</goal>
-								</goals>
-							</execution>
-							<execution>
-								<id>build-native</id>
-								<phase>package</phase>
-								<goals>
-									<goal>build</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-
 </project>

java/war/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.5</version>
+		<version>2.7.7</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>