Skip to content

Commit

Permalink
Update Java App dependencies (#394)
Browse files Browse the repository at this point in the history
- Updates Spring Boot from 2.7.1 -> 2.7.3
- Updates Spring Dependency management from 1.0.11 -> 1.0.13
- Updates Quarkus from 2.8.2 -> 2.11.3

Signed-off-by: Daniel Mikusa <[email protected]>
  • Loading branch information
Daniel Mikusa authored Aug 31, 2022
1 parent cbcaf5e commit 941af2c
Show file tree
Hide file tree
Showing 53 changed files with 63 additions and 60 deletions.
2 changes: 1 addition & 1 deletion java/application-insights/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java/aspectj/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
4 changes: 2 additions & 2 deletions java/dist-zip/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.springframework.boot' version '2.7.1'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'org.springframework.boot' version '2.7.3'
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
id 'java'
id 'application'
}
Expand Down
4 changes: 2 additions & 2 deletions java/gradle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id 'org.springframework.boot' version '2.7.1'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'org.springframework.boot' version '2.7.3'
id 'io.spring.dependency-management' version '1.0.13.RELEASE'
id 'java'
}

Expand Down
68 changes: 34 additions & 34 deletions java/jar/BOOT-INF/classpath.idx
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
- "BOOT-INF/lib/spring-boot-2.7.1.jar"
- "BOOT-INF/lib/spring-context-5.3.21.jar"
- "BOOT-INF/lib/spring-aop-5.3.21.jar"
- "BOOT-INF/lib/spring-expression-5.3.21.jar"
- "BOOT-INF/lib/spring-boot-autoconfigure-2.7.1.jar"
- "BOOT-INF/lib/spring-boot-2.7.3.jar"
- "BOOT-INF/lib/spring-context-5.3.22.jar"
- "BOOT-INF/lib/spring-aop-5.3.22.jar"
- "BOOT-INF/lib/spring-expression-5.3.22.jar"
- "BOOT-INF/lib/spring-boot-autoconfigure-2.7.3.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.1.jar"
- "BOOT-INF/lib/spring-boot-actuator-2.7.1.jar"
- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-2.7.3.jar"
- "BOOT-INF/lib/spring-boot-actuator-2.7.3.jar"
- "BOOT-INF/lib/jackson-databind-2.13.3.jar"
- "BOOT-INF/lib/jackson-annotations-2.13.3.jar"
- "BOOT-INF/lib/jackson-core-2.13.3.jar"
- "BOOT-INF/lib/jackson-datatype-jsr310-2.13.3.jar"
- "BOOT-INF/lib/micrometer-core-1.9.1.jar"
- "BOOT-INF/lib/micrometer-core-1.9.3.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.3.jar"
- "BOOT-INF/lib/jackson-module-parameter-names-2.13.3.jar"
- "BOOT-INF/lib/reactor-netty-http-1.0.20.jar"
- "BOOT-INF/lib/netty-codec-http-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-common-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-buffer-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-transport-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-codec-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-handler-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-codec-http2-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-resolver-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-codec-dns-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.78.Final-osx-x86_64.jar"
- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-transport-native-epoll-4.1.78.Final-linux-x86_64.jar"
- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.78.Final.jar"
- "BOOT-INF/lib/reactor-netty-core-1.0.20.jar"
- "BOOT-INF/lib/netty-handler-proxy-4.1.78.Final.jar"
- "BOOT-INF/lib/netty-codec-socks-4.1.78.Final.jar"
- "BOOT-INF/lib/spring-web-5.3.21.jar"
- "BOOT-INF/lib/spring-beans-5.3.21.jar"
- "BOOT-INF/lib/spring-webflux-5.3.21.jar"
- "BOOT-INF/lib/reactor-netty-http-1.0.22.jar"
- "BOOT-INF/lib/netty-codec-http-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-common-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-buffer-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-transport-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-codec-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-handler-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-codec-http2-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-resolver-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-codec-dns-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.79.Final-osx-x86_64.jar"
- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-transport-native-epoll-4.1.79.Final-linux-x86_64.jar"
- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.79.Final.jar"
- "BOOT-INF/lib/reactor-netty-core-1.0.22.jar"
- "BOOT-INF/lib/netty-handler-proxy-4.1.79.Final.jar"
- "BOOT-INF/lib/netty-codec-socks-4.1.79.Final.jar"
- "BOOT-INF/lib/spring-web-5.3.22.jar"
- "BOOT-INF/lib/spring-beans-5.3.22.jar"
- "BOOT-INF/lib/spring-webflux-5.3.22.jar"
- "BOOT-INF/lib/slf4j-api-1.7.36.jar"
- "BOOT-INF/lib/spring-core-5.3.21.jar"
- "BOOT-INF/lib/spring-jcl-5.3.21.jar"
- "BOOT-INF/lib/reactor-core-3.4.19.jar"
- "BOOT-INF/lib/spring-core-5.3.22.jar"
- "BOOT-INF/lib/spring-jcl-5.3.22.jar"
- "BOOT-INF/lib/reactor-core-3.4.22.jar"
- "BOOT-INF/lib/reactive-streams-1.0.4.jar"
- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.7.1.jar"
- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.7.3.jar"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion java/jar/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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.1
Spring-Boot-Version: 2.7.3
Spring-Boot-Classes: BOOT-INF/classes/
Spring-Boot-Lib: BOOT-INF/lib/
Spring-Boot-Classpath-Index: BOOT-INF/classpath.idx
Expand Down
2 changes: 1 addition & 1 deletion java/jar/META-INF/maven/io.paketo/demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
Binary file modified java/jar/org/springframework/boot/loader/jar/Handler.class
Binary file not shown.
Binary file modified java/jar/org/springframework/boot/loader/jar/JarFile.class
Binary file not shown.
Binary file modified java/jar/org/springframework/boot/loader/jar/JarFileWrapper.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions java/kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "2.7.1"
id("io.spring.dependency-management") version "1.0.11.RELEASE"
id("org.springframework.boot") version "2.7.3"
id("io.spring.dependency-management") version "1.0.13.RELEASE"
kotlin("jvm") version "1.6.21"
kotlin("plugin.spring") version "1.6.21"
}
Expand Down
2 changes: 1 addition & 1 deletion java/maven/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
27 changes: 15 additions & 12 deletions java/native-image/java-native-image-sample/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand All @@ -16,7 +16,7 @@
<properties>
<java.version>11</java.version>
<repackage.classifier />
<spring-native.version>0.12.0-SNAPSHOT</spring-native.version>
<spring-native.version>0.12.1</spring-native.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -86,19 +86,22 @@

<repositories>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<releases>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</releases>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<id>spring-releases</id>
<name>Spring Releases</name>
<url>https://repo.spring.io/release</url>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

Expand All @@ -107,7 +110,7 @@
<id>native</id>
<properties>
<repackage.classifier>exec</repackage.classifier>
<native-buildtools.version>0.9.11</native-buildtools.version>
<native-buildtools.version>0.9.13</native-buildtools.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -145,4 +148,4 @@
</profile>
</profiles>

</project>
</project>
4 changes: 2 additions & 2 deletions java/native-image/quarkus-native/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<properties>
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
<quarkus.platform.version>2.8.2.Final</quarkus.platform.version>
<quarkus.platform.version>2.11.3.Final</quarkus.platform.version>
<compiler-plugin.version>3.10.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M6</surefire-plugin.version>
<surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
Expand Down
2 changes: 1 addition & 1 deletion java/war/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>2.7.3</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down

0 comments on commit 941af2c

Please sign in to comment.