Skip to content

Commit

Permalink
Bump Spring from 2.6.7 -> 2.7.0 in all projects (#340)
Browse files Browse the repository at this point in the history
Also, bumps Spring Java native image project to use the latest Spring Native Image snapshot.

Signed-off-by: Daniel Mikusa <[email protected]>
  • Loading branch information
Daniel Mikusa authored May 26, 2022
1 parent fa3a5d3 commit 25731f2
Show file tree
Hide file tree
Showing 60 changed files with 68 additions and 71 deletions.
4 changes: 2 additions & 2 deletions 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.6.7</version>
<version>2.7.0</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down Expand Up @@ -66,4 +66,4 @@
</plugins>
</build>

</project>
</project>
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.6.7</version>
<version>2.7.0</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java/dist-zip/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.6.7'
id 'org.springframework.boot' version '2.7.0'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
id 'application'
Expand Down
2 changes: 1 addition & 1 deletion java/gradle/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.springframework.boot' version '2.6.7'
id 'org.springframework.boot' version '2.7.0'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
}
Expand Down
82 changes: 41 additions & 41 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.6.7.jar"
- "BOOT-INF/lib/spring-context-5.3.19.jar"
- "BOOT-INF/lib/spring-aop-5.3.19.jar"
- "BOOT-INF/lib/spring-expression-5.3.19.jar"
- "BOOT-INF/lib/spring-boot-autoconfigure-2.6.7.jar"
- "BOOT-INF/lib/spring-boot-2.7.0.jar"
- "BOOT-INF/lib/spring-context-5.3.20.jar"
- "BOOT-INF/lib/spring-aop-5.3.20.jar"
- "BOOT-INF/lib/spring-expression-5.3.20.jar"
- "BOOT-INF/lib/spring-boot-autoconfigure-2.7.0.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.29.jar"
- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-2.6.7.jar"
- "BOOT-INF/lib/spring-boot-actuator-2.6.7.jar"
- "BOOT-INF/lib/jackson-databind-2.13.2.1.jar"
- "BOOT-INF/lib/jackson-annotations-2.13.2.jar"
- "BOOT-INF/lib/jackson-core-2.13.2.jar"
- "BOOT-INF/lib/jackson-datatype-jsr310-2.13.2.jar"
- "BOOT-INF/lib/micrometer-core-1.8.5.jar"
- "BOOT-INF/lib/snakeyaml-1.30.jar"
- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-2.7.0.jar"
- "BOOT-INF/lib/spring-boot-actuator-2.7.0.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.0.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.2.jar"
- "BOOT-INF/lib/jackson-module-parameter-names-2.13.2.jar"
- "BOOT-INF/lib/reactor-netty-http-1.0.18.jar"
- "BOOT-INF/lib/netty-codec-http-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-common-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-buffer-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-transport-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-codec-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-handler-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-codec-http2-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-resolver-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-codec-dns-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.76.Final-osx-x86_64.jar"
- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-transport-native-epoll-4.1.76.Final-linux-x86_64.jar"
- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.76.Final.jar"
- "BOOT-INF/lib/reactor-netty-core-1.0.18.jar"
- "BOOT-INF/lib/netty-handler-proxy-4.1.76.Final.jar"
- "BOOT-INF/lib/netty-codec-socks-4.1.76.Final.jar"
- "BOOT-INF/lib/spring-web-5.3.19.jar"
- "BOOT-INF/lib/spring-beans-5.3.19.jar"
- "BOOT-INF/lib/spring-webflux-5.3.19.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.19.jar"
- "BOOT-INF/lib/netty-codec-http-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-common-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-buffer-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-transport-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-codec-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-handler-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-codec-http2-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-resolver-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-codec-dns-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.77.Final-osx-x86_64.jar"
- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar"
- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.77.Final.jar"
- "BOOT-INF/lib/reactor-netty-core-1.0.19.jar"
- "BOOT-INF/lib/netty-handler-proxy-4.1.77.Final.jar"
- "BOOT-INF/lib/netty-codec-socks-4.1.77.Final.jar"
- "BOOT-INF/lib/spring-web-5.3.20.jar"
- "BOOT-INF/lib/spring-beans-5.3.20.jar"
- "BOOT-INF/lib/spring-webflux-5.3.20.jar"
- "BOOT-INF/lib/slf4j-api-1.7.36.jar"
- "BOOT-INF/lib/spring-core-5.3.19.jar"
- "BOOT-INF/lib/spring-jcl-5.3.19.jar"
- "BOOT-INF/lib/reactor-core-3.4.17.jar"
- "BOOT-INF/lib/spring-core-5.3.20.jar"
- "BOOT-INF/lib/spring-jcl-5.3.20.jar"
- "BOOT-INF/lib/reactor-core-3.4.18.jar"
- "BOOT-INF/lib/reactive-streams-1.0.3.jar"
- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.6.7.jar"
- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.7.0.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 removed java/jar/BOOT-INF/lib/micrometer-core-1.8.5.jar
Binary file not shown.
Binary file added java/jar/BOOT-INF/lib/micrometer-core-1.9.0.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.
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.6.7
Spring-Boot-Version: 2.7.0
Spring-Boot-Classes: BOOT-INF/classes/
Spring-Boot-Lib: BOOT-INF/lib/
Spring-Boot-Classpath-Index: BOOT-INF/classpath.idx
Expand Down
4 changes: 2 additions & 2 deletions 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.6.7</version>
<version>2.7.0</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down Expand Up @@ -59,4 +59,4 @@
</plugins>
</build>

</project>
</project>
Binary file not shown.
Binary file modified java/jar/org/springframework/boot/loader/JarLauncher.class
Binary file not shown.
Binary file modified java/jar/org/springframework/boot/loader/WarLauncher.class
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion java/kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "2.6.7"
id("org.springframework.boot") version "2.7.0"
id("io.spring.dependency-management") version "1.0.11.RELEASE"
kotlin("jvm") version "1.6.21"
kotlin("plugin.spring") version "1.6.21"
Expand Down
4 changes: 2 additions & 2 deletions 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.6.7</version>
<version>2.7.0</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down Expand Up @@ -59,4 +59,4 @@
</plugins>
</build>

</project>
</project>
33 changes: 15 additions & 18 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.6.7</version>
<version>2.7.0</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.11.4</spring-native.version>
<spring-native.version>0.12.0-SNAPSHOT</spring-native.version>
</properties>

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

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

Expand All @@ -110,13 +107,12 @@
<id>native</id>
<properties>
<repackage.classifier>exec</repackage.classifier>
<native-buildtools.version>0.9.0</native-buildtools.version>
<native-buildtools.version>0.9.11</native-buildtools.version>
</properties>
<dependencies>
<dependency>
<groupId>org.graalvm.buildtools</groupId>
<artifactId>junit-platform-native</artifactId>
<version>${native-buildtools.version}</version>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -126,6 +122,7 @@
<groupId>org.graalvm.buildtools</groupId>
<artifactId>native-maven-plugin</artifactId>
<version>${native-buildtools.version}</version>
<extensions>true</extensions>
<executions>
<execution>
<id>test-native</id>
Expand All @@ -148,4 +145,4 @@
</profile>
</profiles>

</project>
</project>
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.6.7</version>
<version>2.7.0</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down

0 comments on commit 25731f2

Please sign in to comment.