Bump dependencies for Java apps

- Bump to Spring Boot 2.5.9
- Bump other dependnecies that have been skipped
- Bump lein script & workflow

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

.github/workflows/java-leiningen.yml

@@ -29,3 +29,5 @@ jobs:
           restore-keys: ${{ runner.os }}-lein
       - run: ./lein uberjar
         working-directory: java/leiningen
+        env:
+          LEIN_HOME: ~/.lein

.github/workflows/java-native-image.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11, 17]
 
     steps:
       - uses: actions/[email protected]

java/akka/build.sbt

@@ -1,23 +1,23 @@
-lazy val akkaHttpVersion = "10.2.1"
-lazy val akkaVersion    = "2.6.10"
+lazy val akkaHttpVersion = "10.2.7"
+lazy val akkaVersion    = "2.6.18"
 
 lazy val root = (project in file(".")).
   enablePlugins(JavaAppPackaging).
   settings(
     inThisBuild(List(
       organization    := "com.example",
-      scalaVersion    := "2.13.3"
+      scalaVersion    := "2.13.8"
     )),
     name := "akka-http-quickstart-scala",
     libraryDependencies ++= Seq(
       "com.typesafe.akka" %% "akka-http"                % akkaHttpVersion,
       "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.3",
+      "ch.qos.logback"    % "logback-classic"           % "1.2.10",
 
       "com.typesafe.akka" %% "akka-http-testkit"        % akkaHttpVersion % Test,
       "com.typesafe.akka" %% "akka-actor-testkit-typed" % akkaVersion     % Test,
-      "org.scalatest"     %% "scalatest"                % "3.0.8"         % Test
+      "org.scalatest"     %% "scalatest"                % "3.2.10"         % Test
     )
   )

java/application-insights/pom.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.8</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>2.5.9</version>
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
 	<artifactId>demo</artifactId>
@@ -67,4 +66,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>

java/deps/deps.edn

@@ -1,11 +1,11 @@
 {: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.33"}}
  :paths ["src"]
- :aliases {:uberjar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.1.278"}}
+ :aliases {:uberjar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.1.303"}}
                      :exec-fn hf.depstar/uberjar
                      :exec-args {:aot true
                                  :jar "target/demo.jar"

java/dist-zip/.gitignore

@@ -4,6 +4,7 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**
 !**/src/test/**
+bin
 
 ### STS ###
 .apt_generated

java/dist-zip/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.8'
+	id 'org.springframework.boot' version '2.5.9'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 	id 'application'

java/gradle/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'org.springframework.boot' version '2.5.8'
+	id 'org.springframework.boot' version '2.5.9'
 	id 'io.spring.dependency-management' version '1.0.11.RELEASE'
 	id 'java'
 }

java/jar/BOOT-INF/classpath.idx

@@ -1,53 +1,52 @@
-- "spring-boot-starter-actuator-2.3.0.RELEASE.jar"
-- "spring-boot-starter-2.3.0.RELEASE.jar"
-- "spring-boot-2.3.0.RELEASE.jar"
-- "spring-boot-autoconfigure-2.3.0.RELEASE.jar"
-- "spring-boot-starter-logging-2.3.0.RELEASE.jar"
-- "logback-classic-1.2.3.jar"
-- "logback-core-1.2.3.jar"
-- "log4j-to-slf4j-2.13.2.jar"
-- "log4j-api-2.13.2.jar"
-- "jul-to-slf4j-1.7.30.jar"
-- "jakarta.annotation-api-1.3.5.jar"
-- "snakeyaml-1.26.jar"
-- "spring-boot-actuator-autoconfigure-2.3.0.RELEASE.jar"
-- "spring-boot-actuator-2.3.0.RELEASE.jar"
-- "jackson-databind-2.11.0.jar"
-- "jackson-annotations-2.11.0.jar"
-- "jackson-core-2.11.0.jar"
-- "jackson-datatype-jsr310-2.11.0.jar"
-- "spring-context-5.2.6.RELEASE.jar"
-- "spring-aop-5.2.6.RELEASE.jar"
-- "spring-expression-5.2.6.RELEASE.jar"
-- "micrometer-core-1.5.1.jar"
-- "HdrHistogram-2.1.12.jar"
-- "LatencyUtils-2.0.3.jar"
-- "spring-boot-starter-webflux-2.3.0.RELEASE.jar"
-- "spring-boot-starter-json-2.3.0.RELEASE.jar"
-- "jackson-datatype-jdk8-2.11.0.jar"
-- "jackson-module-parameter-names-2.11.0.jar"
-- "spring-boot-starter-reactor-netty-2.3.0.RELEASE.jar"
-- "reactor-netty-0.9.7.RELEASE.jar"
-- "netty-codec-http-4.1.49.Final.jar"
-- "netty-common-4.1.49.Final.jar"
-- "netty-buffer-4.1.49.Final.jar"
-- "netty-transport-4.1.49.Final.jar"
-- "netty-codec-4.1.49.Final.jar"
-- "netty-codec-http2-4.1.49.Final.jar"
-- "netty-handler-4.1.49.Final.jar"
-- "netty-resolver-4.1.49.Final.jar"
-- "netty-handler-proxy-4.1.49.Final.jar"
-- "netty-codec-socks-4.1.49.Final.jar"
-- "netty-transport-native-epoll-4.1.49.Final-linux-x86_64.jar"
-- "netty-transport-native-unix-common-4.1.49.Final.jar"
-- "spring-web-5.2.6.RELEASE.jar"
-- "spring-beans-5.2.6.RELEASE.jar"
-- "spring-webflux-5.2.6.RELEASE.jar"
-- "nio-multipart-parser-1.1.0.jar"
-- "slf4j-api-1.7.30.jar"
-- "nio-stream-storage-1.1.3.jar"
-- "spring-core-5.2.6.RELEASE.jar"
-- "spring-jcl-5.2.6.RELEASE.jar"
-- "reactor-core-3.3.5.RELEASE.jar"
-- "reactive-streams-1.0.3.jar"
-- "spring-boot-jarmode-layertools-2.3.0.RELEASE.jar"
+- "BOOT-INF/lib/spring-boot-2.5.9.jar"
+- "BOOT-INF/lib/spring-context-5.3.15.jar"
+- "BOOT-INF/lib/spring-aop-5.3.15.jar"
+- "BOOT-INF/lib/spring-expression-5.3.15.jar"
+- "BOOT-INF/lib/spring-boot-autoconfigure-2.5.9.jar"
+- "BOOT-INF/lib/logback-classic-1.2.10.jar"
+- "BOOT-INF/lib/logback-core-1.2.10.jar"
+- "BOOT-INF/lib/log4j-to-slf4j-2.17.1.jar"
+- "BOOT-INF/lib/log4j-api-2.17.1.jar"
+- "BOOT-INF/lib/jul-to-slf4j-1.7.33.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.9.jar"
+- "BOOT-INF/lib/spring-boot-actuator-2.5.9.jar"
+- "BOOT-INF/lib/jackson-databind-2.12.6.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.8.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.15.jar"
+- "BOOT-INF/lib/netty-codec-http-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-common-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-buffer-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-transport-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-codec-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-handler-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-tcnative-classes-2.0.46.Final.jar"
+- "BOOT-INF/lib/netty-codec-http2-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-resolver-dns-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-resolver-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-codec-dns-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.73.Final-osx-x86_64.jar"
+- "BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-transport-native-epoll-4.1.73.Final-linux-x86_64.jar"
+- "BOOT-INF/lib/netty-transport-native-unix-common-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-transport-classes-epoll-4.1.73.Final.jar"
+- "BOOT-INF/lib/reactor-netty-core-1.0.15.jar"
+- "BOOT-INF/lib/netty-handler-proxy-4.1.73.Final.jar"
+- "BOOT-INF/lib/netty-codec-socks-4.1.73.Final.jar"
+- "BOOT-INF/lib/spring-web-5.3.15.jar"
+- "BOOT-INF/lib/spring-beans-5.3.15.jar"
+- "BOOT-INF/lib/spring-webflux-5.3.15.jar"
+- "BOOT-INF/lib/slf4j-api-1.7.33.jar"
+- "BOOT-INF/lib/spring-core-5.3.15.jar"
+- "BOOT-INF/lib/spring-jcl-5.3.15.jar"
+- "BOOT-INF/lib/reactor-core-3.4.14.jar"
+- "BOOT-INF/lib/reactive-streams-1.0.3.jar"
+- "BOOT-INF/lib/spring-boot-jarmode-layertools-2.5.9.jar"

java/jar/META-INF/MANIFEST.MF

@@ -1,12 +1,11 @@
 Manifest-Version: 1.0
-Created-By: Maven Jar Plugin 3.2.0
-Build-Jdk-Spec: 14
+Created-By: Maven JAR Plugin 3.2.2
+Build-Jdk-Spec: 11
 Implementation-Title: demo
 Implementation-Version: 0.0.1-SNAPSHOT
-Implementation-Vendor: Pivotal Software, Inc.
 Main-Class: org.springframework.boot.loader.JarLauncher
 Start-Class: io.paketo.demo.DemoApplication
-Spring-Boot-Version: 2.3.0.RELEASE
+Spring-Boot-Version: 2.5.9
 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

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.0.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>2.5.9</version>
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
 	<artifactId>demo</artifactId>
@@ -15,7 +14,7 @@
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>11</java.version>
 	</properties>
 
 	<dependencies>
@@ -60,4 +59,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>

java/java_test.go

@@ -403,7 +403,7 @@ func testJavaWithBuilder(builder string) func(*testing.T, spec.G, spec.S) {
 						WithBuilder(builder).
 						WithEnv(map[string]string{
 							"BP_CLJ_TOOLS_BUILD_ENABLED": "true",
-							"JAVA_TOOL_OPTIONS": "-XX:MaxMetaspaceSize=100M"}).
+							"JAVA_TOOL_OPTIONS":          "-XX:MaxMetaspaceSize=100M"}).
 						Execute(name, source)
 					Expect(err).ToNot(HaveOccurred(), logs.String)
 

java/kotlin/build.gradle.kts

@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	id("org.springframework.boot") version "2.3.1.RELEASE"
-	id("io.spring.dependency-management") version "1.0.9.RELEASE"
-	kotlin("jvm") version "1.3.72"
-	kotlin("plugin.spring") version "1.3.72"
+	id("org.springframework.boot") version "2.5.9"
+	id("io.spring.dependency-management") version "1.0.11.RELEASE"
+	kotlin("jvm") version "1.5.32"
+  	kotlin("plugin.spring") version "1.5.32"
 }
 
 group = "io.paketo"

java/leiningen/lein

@@ -8,9 +8,9 @@ function msg {
     echo "$@" 1>&2
 }
 
-export LEIN_VERSION="2.9.4"
+export LEIN_VERSION="2.9.8"
 # Must be sha256sum, will be replaced by bin/release
-export LEIN_CHECKSUM='0e3c339480347df0445317d329accbd4a578ebbd8d91e568e661feb1b388706c'
+export LEIN_CHECKSUM='2a0e9114e0d623c748a9ade5d72b54128b31b5ddb13f51b04c533f104bb0c48d'
 
 case $LEIN_VERSION in
     *SNAPSHOT) SNAPSHOT="YES" ;;
@@ -98,7 +98,7 @@ function self_install {
   fi
   msg "Downloading Leiningen to $LEIN_JAR now..."
   mkdir -p "$(dirname "$LEIN_JAR")"
-  LEIN_URL="https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.zip"
+  LEIN_URL="https://github.com/technomancy/leiningen/releases/download/$LEIN_VERSION/leiningen-$LEIN_VERSION-standalone.jar"
   $HTTP_CLIENT "$LEIN_JAR.pending" "$LEIN_URL"
   local exit_code=$?
   if [ $exit_code == 0 ]; then
@@ -142,7 +142,7 @@ if $cygwin; then
     export LEIN_HOME=$(cygpath -w "$LEIN_HOME")
 fi
 
-LEIN_JAR="$LEIN_HOME/self-installs/leiningen-$LEIN_VERSION-standalone.jar"
+LEIN_JAR="${LEIN_JAR:-${LEIN_HOME}/self-installs/leiningen-${LEIN_VERSION}-standalone.jar}"
 
 # normalize $0 on certain BSDs
 if [ "$(dirname "$0")" = "." ]; then
@@ -167,7 +167,7 @@ done
 
 BIN_DIR="$(dirname "$SCRIPT")"
 
-export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-Xverify:none -XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
+export LEIN_JVM_OPTS="${LEIN_JVM_OPTS-"-XX:+TieredCompilation -XX:TieredStopAtLevel=1"}"
 
 # This needs to be defined before we call HTTP_CLIENT below
 if [ "$HTTP_CLIENT" = "" ]; then

java/leiningen/project.clj

@@ -1,11 +1,11 @@
 (defproject demo "0.0.1-SNAPSHOT"
-  :dependencies [[org.clojure/clojure "1.10.1"]
-                 [io.pedestal/pedestal.service "0.5.8"]
-                 [io.pedestal/pedestal.jetty "0.5.8"]
-                 [ch.qos.logback/logback-classic "1.2.3" :exclusions [org.slf4j/slf4j-api]]
-                 [org.slf4j/jul-to-slf4j "1.7.26"]
-                 [org.slf4j/jcl-over-slf4j "1.7.26"]
-                 [org.slf4j/log4j-over-slf4j "1.7.26"]]
+  :dependencies [[org.clojure/clojure "1.10.3"]
+                 [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"]]
   :resource-paths ["config"]
   :main ^:skip-aot lein-source.server
   :profiles {:uberjar {:aot :all

java/maven/pom.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.8</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>2.5.9</version>
+		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>
 	<artifactId>demo</artifactId>
@@ -60,4 +59,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>