Bump more versions (#775)

* Bump more versions

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

* Update kotlin project

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

* Update JAR example

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

* Update READMEs

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

* Switch to java 17,21 for Kotlin sample

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

* Bump to Tomcat 10

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

* Remove unused deps & skip Spring Boot repackaging

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

---------

Signed-off-by: Daniel Mikusa <[email protected]>
Co-authored-by: Anthony Dahanne <[email protected]>

.github/workflows/java-kotlin.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [17, 21]
 
     steps:
       - uses: actions/checkout@v4

java/application-insights/README.md

@@ -21,7 +21,7 @@ echo "<Instrumentation Key>" > binding/InstrumentationKey
 ## Building
 
 ```bash
-pack build applications/application-insights --env BP_JVM_VERSION=11 --volume "$(pwd)/binding:/platform/bindings/application-insights"
+pack build applications/application-insights --env BP_JVM_VERSION=17 --volume "$(pwd)/binding:/platform/bindings/application-insights"
 ```
 
 ## Running

java/application-insights/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.18</version>
+		<version>3.3.2</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
@@ -14,7 +14,6 @@
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
-		<java.version>11</java.version>
 		<applicationinsights.version>2.6.4</applicationinsights.version>
 	</properties>
 

java/aspectj/README.md

@@ -5,7 +5,7 @@ See [prerequisites](https://paketo.io/docs/howto/java/#prerequisites) of this sa
 ## Building
 
 ```bash
-pack build applications/aspectj --env BP_JVM_VERSION=11
+pack build applications/aspectj --env BP_JVM_VERSION=17
 ```
 
 ## Running

java/aspectj/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.18</version>
+		<version>3.3.2</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/jar/BOOT-INF/classpath.idx

@@ -1,53 +1,54 @@
-- "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/spring-boot-3.3.2.jar"
+- "BOOT-INF/lib/spring-context-6.1.11.jar"
+- "BOOT-INF/lib/spring-aop-6.1.11.jar"
+- "BOOT-INF/lib/spring-expression-6.1.11.jar"
+- "BOOT-INF/lib/spring-boot-autoconfigure-3.3.2.jar"
+- "BOOT-INF/lib/logback-classic-1.5.6.jar"
+- "BOOT-INF/lib/logback-core-1.5.6.jar"
+- "BOOT-INF/lib/log4j-to-slf4j-2.23.1.jar"
+- "BOOT-INF/lib/log4j-api-2.23.1.jar"
+- "BOOT-INF/lib/jul-to-slf4j-2.0.13.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/snakeyaml-2.2.jar"
+- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.3.2.jar"
+- "BOOT-INF/lib/spring-boot-actuator-3.3.2.jar"
+- "BOOT-INF/lib/jackson-databind-2.17.2.jar"
+- "BOOT-INF/lib/jackson-annotations-2.17.2.jar"
+- "BOOT-INF/lib/jackson-core-2.17.2.jar"
+- "BOOT-INF/lib/jackson-datatype-jsr310-2.17.2.jar"
+- "BOOT-INF/lib/micrometer-observation-1.13.2.jar"
+- "BOOT-INF/lib/micrometer-commons-1.13.2.jar"
+- "BOOT-INF/lib/micrometer-jakarta9-1.13.2.jar"
+- "BOOT-INF/lib/micrometer-core-1.13.2.jar"
+- "BOOT-INF/lib/HdrHistogram-2.2.2.jar"
 - "BOOT-INF/lib/LatencyUtils-2.0.3.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/jackson-datatype-jdk8-2.17.2.jar"
+- "BOOT-INF/lib/jackson-module-parameter-names-2.17.2.jar"
+- "BOOT-INF/lib/reactor-netty-http-1.1.21.jar"
+- "BOOT-INF/lib/netty-codec-http-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-common-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-buffer-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-transport-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-codec-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-handler-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-codec-http2-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-resolver-dns-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-resolver-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-codec-dns-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar"
+- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar"
+- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.111.Final.jar"
+- "BOOT-INF/lib/reactor-netty-core-1.1.21.jar"
+- "BOOT-INF/lib/netty-handler-proxy-4.1.111.Final.jar"
+- "BOOT-INF/lib/netty-codec-socks-4.1.111.Final.jar"
+- "BOOT-INF/lib/spring-web-6.1.11.jar"
+- "BOOT-INF/lib/spring-beans-6.1.11.jar"
+- "BOOT-INF/lib/spring-webflux-6.1.11.jar"
+- "BOOT-INF/lib/slf4j-api-2.0.13.jar"
+- "BOOT-INF/lib/spring-core-6.1.11.jar"
+- "BOOT-INF/lib/spring-jcl-6.1.11.jar"
+- "BOOT-INF/lib/reactor-core-3.6.8.jar"
 - "BOOT-INF/lib/reactive-streams-1.0.4.jar"
-- "BOOT-INF/lib/spring-boot-jarmode-layertools-3.0.1.jar"
+- "BOOT-INF/lib/spring-boot-jarmode-tools-3.3.2.jar"

java/jar/META-INF/MANIFEST.MF

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Created-By: Maven JAR Plugin 3.3.0
-Build-Jdk-Spec: 17
+Created-By: Maven JAR Plugin 3.4.2
+Build-Jdk-Spec: 21
 Implementation-Title: demo
 Implementation-Version: 0.0.1-SNAPSHOT
-Main-Class: org.springframework.boot.loader.JarLauncher
+Main-Class: org.springframework.boot.loader.launch.JarLauncher
 Start-Class: io.paketo.demo.DemoApplication
-Spring-Boot-Version: 3.0.1
+Spring-Boot-Version: 3.3.2
 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>3.0.1</version>
+		<version>3.3.2</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>

java/jar/META-INF/services/java.nio.file.spi.FileSystemProvider

@@ -0,0 +1 @@
+org.springframework.boot.loader.nio.file.NestedFileSystemProvider

java/jar/README.md

@@ -5,7 +5,7 @@ See [prerequisites](https://paketo.io/docs/howto/java/#prerequisites) of this sa
 ## Building
 
 ```bash
-pack build applications/jar  --env BP_JVM_VERSION=11
+pack build applications/jar  --env BP_JVM_VERSION=17
 ```
 
 ## Running

java/jar/update-me.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -eo pipefail
 
+echo "$(basename $(dirname $0))"
+
 # run from the jar director
 if [ "$(basename $(dirname $0))" != "jar" ]; then
     echo "Run this script from the 'java/jar' directory"

java/kotlin/README.md

@@ -5,7 +5,7 @@ See [prerequisites](https://paketo.io/docs/howto/java/#prerequisites) of this sa
 ## Building
 
 ```bash
-pack build applications/kotlin  --env BP_JVM_VERSION=11
+pack build applications/kotlin  --env BP_JVM_VERSION=17
 ```
 
 ## Running

java/kotlin/build.gradle.kts

@@ -1,15 +1,18 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-	id("org.springframework.boot") version "2.7.15"
-	id("io.spring.dependency-management") version "1.1.3"
-	kotlin("jvm") version "1.6.21"
-  	kotlin("plugin.spring") version "1.6.21"
+	id("org.springframework.boot") version "3.+"
+	id("io.spring.dependency-management") version "1.+"
+	kotlin("jvm") version "1.9.+"
+	kotlin("plugin.spring") version "1.9.+"
 }
 
 group = "io.paketo"
 version = "0.0.1-SNAPSHOT"
-java.sourceCompatibility = JavaVersion.VERSION_1_8
+
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(17)
+  }
+}
 
 tasks.getByName<Jar>("jar") {
 	enabled = false
@@ -20,26 +23,25 @@ repositories {
 }
 
 dependencies {
-	implementation("org.springframework.boot:spring-boot-starter-actuator")
-	implementation("org.springframework.boot:spring-boot-starter-webflux")
-	implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
-	implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
-	implementation("org.jetbrains.kotlin:kotlin-reflect")
-	implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
-	testImplementation("org.springframework.boot:spring-boot-starter-test") {
-		exclude(group = "org.junit.vintage", module = "junit-vintage-engine")
-	}
-	testImplementation("io.projectreactor:reactor-test")
+  implementation("org.springframework.boot:spring-boot-starter-actuator")
+  implementation("org.springframework.boot:spring-boot-starter-webflux")
+  implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
+  implementation("io.projectreactor.kotlin:reactor-kotlin-extensions")
+  implementation("org.jetbrains.kotlin:kotlin-reflect")
+  implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+  testImplementation("org.springframework.boot:spring-boot-starter-test")
+  testImplementation("io.projectreactor:reactor-test")
+  testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-tasks.withType<Test> {
-	useJUnitPlatform()
+kotlin {
+  compilerOptions {
+    freeCompilerArgs.addAll("-Xjsr305=strict")
+  }
 }
 
-tasks.withType<KotlinCompile> {
-	kotlinOptions {
-		freeCompilerArgs = listOf("-Xjsr305=strict")
-		jvmTarget = "1.8"
-	}
+tasks.withType<Test> {
+  useJUnitPlatform()
 }
+

java/kotlin/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists