Skip to content

Commit

Permalink
Update to Spring Boot 2.6.7, as well as some other updates (#319)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Mikusa <[email protected]>

Co-authored-by: Forest Eckhardt <[email protected]>
  • Loading branch information
Daniel Mikusa and ForestEckhardt authored Apr 28, 2022
1 parent c570b9d commit d247b1d
Show file tree
Hide file tree
Showing 62 changed files with 78 additions and 78 deletions.
8 changes: 4 additions & 4 deletions java/akka/build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lazy val akkaHttpVersion = "10.2.8"
lazy val akkaVersion = "2.6.18"
lazy val akkaHttpVersion = "10.2.9"
lazy val akkaVersion = "2.6.19"

lazy val root = (project in file(".")).
enablePlugins(JavaAppPackaging).
Expand All @@ -14,10 +14,10 @@ lazy val root = (project in file(".")).
"com.typesafe.akka" %% "akka-http-spray-json" % akkaHttpVersion,
"com.typesafe.akka" %% "akka-actor-typed" % akkaVersion,
"com.typesafe.akka" %% "akka-stream" % akkaVersion,
"ch.qos.logback" % "logback-classic" % "1.2.10",
"ch.qos.logback" % "logback-classic" % "1.2.11",

"com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % Test,
"com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion % Test,
"org.scalatest" %% "scalatest" % "3.2.10" % Test
"org.scalatest" %% "scalatest" % "3.2.12" % Test
)
)
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.5.12</version>
<version>2.6.7</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down Expand Up @@ -66,4 +66,4 @@
</plugins>
</build>

</project>
</project>
4 changes: 2 additions & 2 deletions 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.5.12</version>
<version>2.6.7</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down Expand Up @@ -63,4 +63,4 @@
</plugins>
</build>

</project>
</project>
2 changes: 1 addition & 1 deletion java/deps/deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
io.pedestal/pedestal.route {:mvn/version "0.5.10"}
io.pedestal/pedestal.jetty {:mvn/version "0.5.10"}
org.clojure/data.json {:mvn/version "2.4.0"}
org.slf4j/slf4j-simple {:mvn/version "1.7.33"}}
org.slf4j/slf4j-simple {:mvn/version "1.7.36"}}
:paths ["src"]
:aliases {:uberjar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.1.303"}}
:exec-fn hf.depstar/uberjar
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.5.12'
id 'org.springframework.boot' version '2.6.7'
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.5.12'
id 'org.springframework.boot' version '2.6.7'
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.5.12.jar"
- "BOOT-INF/lib/spring-context-5.3.18.jar"
- "BOOT-INF/lib/spring-aop-5.3.18.jar"
- "BOOT-INF/lib/spring-expression-5.3.18.jar"
- "BOOT-INF/lib/spring-boot-autoconfigure-2.5.12.jar"
- "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/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.28.jar"
- "BOOT-INF/lib/spring-boot-actuator-autoconfigure-2.5.12.jar"
- "BOOT-INF/lib/spring-boot-actuator-2.5.12.jar"
- "BOOT-INF/lib/jackson-databind-2.12.6.1.jar"
- "BOOT-INF/lib/jackson-annotations-2.12.6.jar"
- "BOOT-INF/lib/jackson-core-2.12.6.jar"
- "BOOT-INF/lib/jackson-datatype-jsr310-2.12.6.jar"
- "BOOT-INF/lib/micrometer-core-1.7.10.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/HdrHistogram-2.1.12.jar"
- "BOOT-INF/lib/LatencyUtils-2.0.3.jar"
- "BOOT-INF/lib/jackson-datatype-jdk8-2.12.6.jar"
- "BOOT-INF/lib/jackson-module-parameter-names-2.12.6.jar"
- "BOOT-INF/lib/reactor-netty-http-1.0.17.jar"
- "BOOT-INF/lib/netty-codec-http-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-common-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-buffer-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-transport-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-codec-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-handler-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-codec-http2-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-resolver-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-codec-dns-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.75.Final-osx-x86_64.jar"
- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-transport-native-epoll-4.1.75.Final-linux-x86_64.jar"
- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.75.Final.jar"
- "BOOT-INF/lib/reactor-netty-core-1.0.17.jar"
- "BOOT-INF/lib/netty-handler-proxy-4.1.75.Final.jar"
- "BOOT-INF/lib/netty-codec-socks-4.1.75.Final.jar"
- "BOOT-INF/lib/spring-web-5.3.18.jar"
- "BOOT-INF/lib/spring-beans-5.3.18.jar"
- "BOOT-INF/lib/spring-webflux-5.3.18.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/slf4j-api-1.7.36.jar"
- "BOOT-INF/lib/spring-core-5.3.18.jar"
- "BOOT-INF/lib/spring-jcl-5.3.18.jar"
- "BOOT-INF/lib/reactor-core-3.4.16.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/reactive-streams-1.0.3.jar"
- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.5.12.jar"
- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.6.7.jar"
Binary file not shown.
Binary file removed java/jar/BOOT-INF/lib/jackson-core-2.12.6.jar
Binary file not shown.
Binary file added java/jar/BOOT-INF/lib/jackson-core-2.13.2.jar
Binary file not shown.
Binary file removed java/jar/BOOT-INF/lib/jackson-databind-2.12.6.1.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.
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.5.12
Spring-Boot-Version: 2.6.7
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.5.12</version>
<version>2.6.7</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
6 changes: 3 additions & 3 deletions java/kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.springframework.boot") version "2.5.12"
id("org.springframework.boot") version "2.6.7"
id("io.spring.dependency-management") version "1.0.11.RELEASE"
kotlin("jvm") version "1.5.32"
kotlin("plugin.spring") version "1.5.32"
kotlin("jvm") version "1.6.21"
kotlin("plugin.spring") version "1.6.21"
}

group = "io.paketo"
Expand Down
10 changes: 5 additions & 5 deletions java/leiningen/project.clj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
(defproject demo "0.0.1-SNAPSHOT"
:dependencies [[org.clojure/clojure "1.10.3"]
:dependencies [[org.clojure/clojure "1.11.1"]
[io.pedestal/pedestal.service "0.5.10"]
[io.pedestal/pedestal.jetty "0.5.10"]
[ch.qos.logback/logback-classic "1.2.10" :exclusions [org.slf4j/slf4j-api]]
[org.slf4j/jul-to-slf4j "1.7.33"]
[org.slf4j/jcl-over-slf4j "1.7.33"]
[org.slf4j/log4j-over-slf4j "1.7.33"]]
[ch.qos.logback/logback-classic "1.2.11" :exclusions [org.slf4j/slf4j-api]]
[org.slf4j/jul-to-slf4j "1.7.36"]
[org.slf4j/jcl-over-slf4j "1.7.36"]
[org.slf4j/log4j-over-slf4j "1.7.36"]]
:resource-paths ["config"]
:main ^:skip-aot lein-source.server
:profiles {:uberjar {:aot :all
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.5.12</version>
<version>2.6.7</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down
6 changes: 3 additions & 3 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.5.12</version>
<version>2.6.7</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.3</spring-native.version>
<spring-native.version>0.11.4</spring-native.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -148,4 +148,4 @@
</profile>
</profiles>

</project>
</project>
8 changes: 4 additions & 4 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.7.5.Final</quarkus.platform.version>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
<quarkus.platform.version>2.8.2.Final</quarkus.platform.version>
<compiler-plugin.version>3.10.1</compiler-plugin.version>
<surefire-plugin.version>3.0.0-M6</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 Expand Up @@ -115,4 +115,4 @@
</build>
</profile>
</profiles>
</project>
</project>
12 changes: 6 additions & 6 deletions java/tools-build/deps.edn
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{:deps
{io.pedestal/pedestal.service {:mvn/version "0.5.8"}
io.pedestal/pedestal.route {:mvn/version "0.5.8"}
io.pedestal/pedestal.jetty {:mvn/version "0.5.8"}
org.clojure/data.json {:mvn/version "0.2.6"}
org.slf4j/slf4j-simple {:mvn/version "1.7.28"}}
{io.pedestal/pedestal.service {:mvn/version "0.5.10"}
io.pedestal/pedestal.route {:mvn/version "0.5.10"}
io.pedestal/pedestal.jetty {:mvn/version "0.5.10"}
org.clojure/data.json {:mvn/version "2.4.0"}
org.slf4j/slf4j-simple {:mvn/version "1.7.36"}}
:paths ["src"]
:aliases {:build {:deps {io.github.clojure/tools.build {:tag "v0.1.7" :sha "8a3abc2"}}
:aliases {:build {:deps {io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}}
:ns-default build}}}
4 changes: 2 additions & 2 deletions 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.5.12</version>
<version>2.6.7</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>io.paketo</groupId>
Expand Down Expand Up @@ -55,4 +55,4 @@
</dependency>
</dependencies>

</project>
</project>

0 comments on commit d247b1d

Please sign in to comment.