diff --git a/.github/workflows/java-kotlin.yml b/.github/workflows/java-kotlin.yml index f30f616d..d6c3ee83 100644 --- a/.github/workflows/java-kotlin.yml +++ b/.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 diff --git a/java/application-insights/README.md b/java/application-insights/README.md index 43608117..4210e93b 100644 --- a/java/application-insights/README.md +++ b/java/application-insights/README.md @@ -21,7 +21,7 @@ echo "" > 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 diff --git a/java/application-insights/pom.xml b/java/application-insights/pom.xml index 6dd3dad6..8468d5f8 100644 --- a/java/application-insights/pom.xml +++ b/java/application-insights/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.3.2 io.paketo @@ -14,7 +14,6 @@ Demo project for Spring Boot - 11 2.6.4 diff --git a/java/aspectj/README.md b/java/aspectj/README.md index 082009cc..f37d28e0 100644 --- a/java/aspectj/README.md +++ b/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 diff --git a/java/aspectj/pom.xml b/java/aspectj/pom.xml index 4a7d814b..4c704744 100644 --- a/java/aspectj/pom.xml +++ b/java/aspectj/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.3.2 io.paketo @@ -13,10 +13,6 @@ demo Demo project for Spring Boot - - 11 - - org.springframework.boot diff --git a/java/jar/BOOT-INF/classes/foo.txt b/java/jar/BOOT-INF/classes/foo.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/java/jar/BOOT-INF/classpath.idx b/java/jar/BOOT-INF/classpath.idx index 2f15094d..2d794e4f 100644 --- a/java/jar/BOOT-INF/classpath.idx +++ b/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" diff --git a/java/jar/BOOT-INF/lib/HdrHistogram-2.1.12.jar b/java/jar/BOOT-INF/lib/HdrHistogram-2.1.12.jar deleted file mode 100644 index 1e43d5eb..00000000 Binary files a/java/jar/BOOT-INF/lib/HdrHistogram-2.1.12.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/HdrHistogram-2.2.2.jar b/java/jar/BOOT-INF/lib/HdrHistogram-2.2.2.jar new file mode 100644 index 00000000..92697e59 Binary files /dev/null and b/java/jar/BOOT-INF/lib/HdrHistogram-2.2.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jackson-annotations-2.14.1.jar b/java/jar/BOOT-INF/lib/jackson-annotations-2.14.1.jar deleted file mode 100644 index e908bd3c..00000000 Binary files a/java/jar/BOOT-INF/lib/jackson-annotations-2.14.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/jackson-annotations-2.17.2.jar b/java/jar/BOOT-INF/lib/jackson-annotations-2.17.2.jar new file mode 100644 index 00000000..c13bcb91 Binary files /dev/null and b/java/jar/BOOT-INF/lib/jackson-annotations-2.17.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jackson-core-2.14.1.jar b/java/jar/BOOT-INF/lib/jackson-core-2.14.1.jar deleted file mode 100644 index cc025836..00000000 Binary files a/java/jar/BOOT-INF/lib/jackson-core-2.14.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/jackson-core-2.17.2.jar b/java/jar/BOOT-INF/lib/jackson-core-2.17.2.jar new file mode 100644 index 00000000..34be9026 Binary files /dev/null and b/java/jar/BOOT-INF/lib/jackson-core-2.17.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jackson-databind-2.14.1.jar b/java/jar/BOOT-INF/lib/jackson-databind-2.14.1.jar deleted file mode 100644 index 1ac80964..00000000 Binary files a/java/jar/BOOT-INF/lib/jackson-databind-2.14.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/jackson-databind-2.17.2.jar b/java/jar/BOOT-INF/lib/jackson-databind-2.17.2.jar new file mode 100644 index 00000000..3750b8c1 Binary files /dev/null and b/java/jar/BOOT-INF/lib/jackson-databind-2.17.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jackson-datatype-jdk8-2.14.1.jar b/java/jar/BOOT-INF/lib/jackson-datatype-jdk8-2.17.2.jar similarity index 72% rename from java/jar/BOOT-INF/lib/jackson-datatype-jdk8-2.14.1.jar rename to java/jar/BOOT-INF/lib/jackson-datatype-jdk8-2.17.2.jar index b92f342e..c6ff58ae 100644 Binary files a/java/jar/BOOT-INF/lib/jackson-datatype-jdk8-2.14.1.jar and b/java/jar/BOOT-INF/lib/jackson-datatype-jdk8-2.17.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jackson-datatype-jsr310-2.14.1.jar b/java/jar/BOOT-INF/lib/jackson-datatype-jsr310-2.14.1.jar deleted file mode 100644 index 29faab62..00000000 Binary files a/java/jar/BOOT-INF/lib/jackson-datatype-jsr310-2.14.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/jackson-datatype-jsr310-2.17.2.jar b/java/jar/BOOT-INF/lib/jackson-datatype-jsr310-2.17.2.jar new file mode 100644 index 00000000..3aa01f1e Binary files /dev/null and b/java/jar/BOOT-INF/lib/jackson-datatype-jsr310-2.17.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jackson-module-parameter-names-2.14.1.jar b/java/jar/BOOT-INF/lib/jackson-module-parameter-names-2.14.1.jar deleted file mode 100644 index c17ee2b4..00000000 Binary files a/java/jar/BOOT-INF/lib/jackson-module-parameter-names-2.14.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/jackson-module-parameter-names-2.17.2.jar b/java/jar/BOOT-INF/lib/jackson-module-parameter-names-2.17.2.jar new file mode 100644 index 00000000..288bf56e Binary files /dev/null and b/java/jar/BOOT-INF/lib/jackson-module-parameter-names-2.17.2.jar differ diff --git a/java/jar/BOOT-INF/lib/jul-to-slf4j-2.0.13.jar b/java/jar/BOOT-INF/lib/jul-to-slf4j-2.0.13.jar new file mode 100644 index 00000000..cbd370c3 Binary files /dev/null and b/java/jar/BOOT-INF/lib/jul-to-slf4j-2.0.13.jar differ diff --git a/java/jar/BOOT-INF/lib/jul-to-slf4j-2.0.6.jar b/java/jar/BOOT-INF/lib/jul-to-slf4j-2.0.6.jar deleted file mode 100644 index 344e7872..00000000 Binary files a/java/jar/BOOT-INF/lib/jul-to-slf4j-2.0.6.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/log4j-api-2.19.0.jar b/java/jar/BOOT-INF/lib/log4j-api-2.19.0.jar deleted file mode 100644 index e55547df..00000000 Binary files a/java/jar/BOOT-INF/lib/log4j-api-2.19.0.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/log4j-api-2.23.1.jar b/java/jar/BOOT-INF/lib/log4j-api-2.23.1.jar new file mode 100644 index 00000000..0e8e3f5e Binary files /dev/null and b/java/jar/BOOT-INF/lib/log4j-api-2.23.1.jar differ diff --git a/java/jar/BOOT-INF/lib/log4j-to-slf4j-2.19.0.jar b/java/jar/BOOT-INF/lib/log4j-to-slf4j-2.19.0.jar deleted file mode 100644 index 86ff0772..00000000 Binary files a/java/jar/BOOT-INF/lib/log4j-to-slf4j-2.19.0.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/log4j-to-slf4j-2.23.1.jar b/java/jar/BOOT-INF/lib/log4j-to-slf4j-2.23.1.jar new file mode 100644 index 00000000..81b51434 Binary files /dev/null and b/java/jar/BOOT-INF/lib/log4j-to-slf4j-2.23.1.jar differ diff --git a/java/jar/BOOT-INF/lib/logback-classic-1.4.5.jar b/java/jar/BOOT-INF/lib/logback-classic-1.4.5.jar deleted file mode 100644 index e0016241..00000000 Binary files a/java/jar/BOOT-INF/lib/logback-classic-1.4.5.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/logback-classic-1.5.6.jar b/java/jar/BOOT-INF/lib/logback-classic-1.5.6.jar new file mode 100644 index 00000000..7ac4c1b8 Binary files /dev/null and b/java/jar/BOOT-INF/lib/logback-classic-1.5.6.jar differ diff --git a/java/jar/BOOT-INF/lib/logback-core-1.4.5.jar b/java/jar/BOOT-INF/lib/logback-core-1.4.5.jar deleted file mode 100644 index 9e645f58..00000000 Binary files a/java/jar/BOOT-INF/lib/logback-core-1.4.5.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/logback-core-1.5.6.jar b/java/jar/BOOT-INF/lib/logback-core-1.5.6.jar new file mode 100644 index 00000000..9c75e363 Binary files /dev/null and b/java/jar/BOOT-INF/lib/logback-core-1.5.6.jar differ diff --git a/java/jar/BOOT-INF/lib/micrometer-commons-1.10.2.jar b/java/jar/BOOT-INF/lib/micrometer-commons-1.10.2.jar deleted file mode 100644 index 59e3502b..00000000 Binary files a/java/jar/BOOT-INF/lib/micrometer-commons-1.10.2.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/micrometer-commons-1.13.2.jar b/java/jar/BOOT-INF/lib/micrometer-commons-1.13.2.jar new file mode 100644 index 00000000..accbdafd Binary files /dev/null and b/java/jar/BOOT-INF/lib/micrometer-commons-1.13.2.jar differ diff --git a/java/jar/BOOT-INF/lib/micrometer-core-1.10.2.jar b/java/jar/BOOT-INF/lib/micrometer-core-1.10.2.jar deleted file mode 100644 index f63d33fb..00000000 Binary files a/java/jar/BOOT-INF/lib/micrometer-core-1.10.2.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/micrometer-core-1.13.2.jar b/java/jar/BOOT-INF/lib/micrometer-core-1.13.2.jar new file mode 100644 index 00000000..9a22c36f Binary files /dev/null and b/java/jar/BOOT-INF/lib/micrometer-core-1.13.2.jar differ diff --git a/java/jar/BOOT-INF/lib/micrometer-jakarta9-1.13.2.jar b/java/jar/BOOT-INF/lib/micrometer-jakarta9-1.13.2.jar new file mode 100644 index 00000000..157c2ad1 Binary files /dev/null and b/java/jar/BOOT-INF/lib/micrometer-jakarta9-1.13.2.jar differ diff --git a/java/jar/BOOT-INF/lib/micrometer-observation-1.10.2.jar b/java/jar/BOOT-INF/lib/micrometer-observation-1.10.2.jar deleted file mode 100644 index 676a317b..00000000 Binary files a/java/jar/BOOT-INF/lib/micrometer-observation-1.10.2.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/micrometer-observation-1.13.2.jar b/java/jar/BOOT-INF/lib/micrometer-observation-1.13.2.jar new file mode 100644 index 00000000..ff3e9562 Binary files /dev/null and b/java/jar/BOOT-INF/lib/micrometer-observation-1.13.2.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-buffer-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-buffer-4.1.111.Final.jar new file mode 100644 index 00000000..878cc677 Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-buffer-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-buffer-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-buffer-4.1.86.Final.jar deleted file mode 100644 index 51f19949..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-buffer-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-4.1.111.Final.jar similarity index 59% rename from java/jar/BOOT-INF/lib/netty-codec-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-codec-4.1.111.Final.jar index ab14c6c1..9afa6d70 100644 Binary files a/java/jar/BOOT-INF/lib/netty-codec-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-codec-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-dns-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-dns-4.1.111.Final.jar new file mode 100644 index 00000000..8b626cea Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-codec-dns-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-dns-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-dns-4.1.86.Final.jar deleted file mode 100644 index 97bac09e..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-codec-dns-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-http-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-http-4.1.111.Final.jar similarity index 56% rename from java/jar/BOOT-INF/lib/netty-codec-http-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-codec-http-4.1.111.Final.jar index 1fc63ae3..316bdec6 100644 Binary files a/java/jar/BOOT-INF/lib/netty-codec-http-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-codec-http-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-http2-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-http2-4.1.111.Final.jar new file mode 100644 index 00000000..73e95705 Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-codec-http2-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-http2-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-http2-4.1.86.Final.jar deleted file mode 100644 index 5ff6df2c..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-codec-http2-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-codec-socks-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-codec-socks-4.1.111.Final.jar similarity index 54% rename from java/jar/BOOT-INF/lib/netty-codec-socks-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-codec-socks-4.1.111.Final.jar index bcbb7c53..4ecfb5db 100644 Binary files a/java/jar/BOOT-INF/lib/netty-codec-socks-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-codec-socks-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-common-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-common-4.1.111.Final.jar new file mode 100644 index 00000000..072d06d4 Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-common-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-common-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-common-4.1.86.Final.jar deleted file mode 100644 index a13de83e..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-common-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-handler-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-handler-4.1.111.Final.jar new file mode 100644 index 00000000..5e19ecdb Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-handler-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-handler-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-handler-4.1.86.Final.jar deleted file mode 100644 index 66527cf4..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-handler-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-handler-proxy-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-handler-proxy-4.1.111.Final.jar new file mode 100644 index 00000000..08c1d314 Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-handler-proxy-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-handler-proxy-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-handler-proxy-4.1.86.Final.jar deleted file mode 100644 index 1d0d5a9e..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-handler-proxy-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-resolver-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-resolver-4.1.111.Final.jar similarity index 79% rename from java/jar/BOOT-INF/lib/netty-resolver-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-resolver-4.1.111.Final.jar index a2b1ea32..3427ee30 100644 Binary files a/java/jar/BOOT-INF/lib/netty-resolver-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-resolver-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-resolver-dns-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-resolver-dns-4.1.111.Final.jar new file mode 100644 index 00000000..5facdd8e Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-resolver-dns-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-resolver-dns-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-resolver-dns-4.1.86.Final.jar deleted file mode 100644 index 8a9110c5..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-resolver-dns-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.111.Final.jar similarity index 52% rename from java/jar/BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.111.Final.jar index 8c6c648b..9cfb6413 100644 Binary files a/java/jar/BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-resolver-dns-classes-macos-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar b/java/jar/BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar new file mode 100644 index 00000000..dabdf21e Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.111.Final-osx-x86_64.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar b/java/jar/BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar deleted file mode 100644 index 2b369be9..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-transport-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-transport-4.1.111.Final.jar similarity index 52% rename from java/jar/BOOT-INF/lib/netty-transport-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-transport-4.1.111.Final.jar index 41da6bd8..575355b8 100644 Binary files a/java/jar/BOOT-INF/lib/netty-transport-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-transport-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-transport-classes-epoll-4.1.111.Final.jar b/java/jar/BOOT-INF/lib/netty-transport-classes-epoll-4.1.111.Final.jar new file mode 100644 index 00000000..39f5787f Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-transport-classes-epoll-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-transport-classes-epoll-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-transport-classes-epoll-4.1.86.Final.jar deleted file mode 100644 index 079a382e..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-transport-classes-epoll-4.1.86.Final.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar b/java/jar/BOOT-INF/lib/netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar new file mode 100644 index 00000000..96378369 Binary files /dev/null and b/java/jar/BOOT-INF/lib/netty-transport-native-epoll-4.1.111.Final-linux-x86_64.jar differ diff --git a/java/jar/BOOT-INF/lib/netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar b/java/jar/BOOT-INF/lib/netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar deleted file mode 100644 index ac68718a..00000000 Binary files a/java/jar/BOOT-INF/lib/netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/netty-transport-native-unix-common-4.1.86.Final.jar b/java/jar/BOOT-INF/lib/netty-transport-native-unix-common-4.1.111.Final.jar similarity index 50% rename from java/jar/BOOT-INF/lib/netty-transport-native-unix-common-4.1.86.Final.jar rename to java/jar/BOOT-INF/lib/netty-transport-native-unix-common-4.1.111.Final.jar index f39a34d9..f06de9ed 100644 Binary files a/java/jar/BOOT-INF/lib/netty-transport-native-unix-common-4.1.86.Final.jar and b/java/jar/BOOT-INF/lib/netty-transport-native-unix-common-4.1.111.Final.jar differ diff --git a/java/jar/BOOT-INF/lib/reactor-core-3.5.1.jar b/java/jar/BOOT-INF/lib/reactor-core-3.5.1.jar deleted file mode 100644 index a27b0943..00000000 Binary files a/java/jar/BOOT-INF/lib/reactor-core-3.5.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/reactor-core-3.6.8.jar b/java/jar/BOOT-INF/lib/reactor-core-3.6.8.jar new file mode 100644 index 00000000..52d05d52 Binary files /dev/null and b/java/jar/BOOT-INF/lib/reactor-core-3.6.8.jar differ diff --git a/java/jar/BOOT-INF/lib/reactor-netty-core-1.1.1.jar b/java/jar/BOOT-INF/lib/reactor-netty-core-1.1.1.jar deleted file mode 100644 index 354bff24..00000000 Binary files a/java/jar/BOOT-INF/lib/reactor-netty-core-1.1.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/reactor-netty-core-1.1.21.jar b/java/jar/BOOT-INF/lib/reactor-netty-core-1.1.21.jar new file mode 100644 index 00000000..256fdbd2 Binary files /dev/null and b/java/jar/BOOT-INF/lib/reactor-netty-core-1.1.21.jar differ diff --git a/java/jar/BOOT-INF/lib/reactor-netty-http-1.1.1.jar b/java/jar/BOOT-INF/lib/reactor-netty-http-1.1.1.jar deleted file mode 100644 index 1bed75dd..00000000 Binary files a/java/jar/BOOT-INF/lib/reactor-netty-http-1.1.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/reactor-netty-http-1.1.21.jar b/java/jar/BOOT-INF/lib/reactor-netty-http-1.1.21.jar new file mode 100644 index 00000000..d407824d Binary files /dev/null and b/java/jar/BOOT-INF/lib/reactor-netty-http-1.1.21.jar differ diff --git a/java/jar/BOOT-INF/lib/slf4j-api-2.0.13.jar b/java/jar/BOOT-INF/lib/slf4j-api-2.0.13.jar new file mode 100644 index 00000000..a800cc2b Binary files /dev/null and b/java/jar/BOOT-INF/lib/slf4j-api-2.0.13.jar differ diff --git a/java/jar/BOOT-INF/lib/slf4j-api-2.0.6.jar b/java/jar/BOOT-INF/lib/slf4j-api-2.0.6.jar deleted file mode 100644 index a2cb8020..00000000 Binary files a/java/jar/BOOT-INF/lib/slf4j-api-2.0.6.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/snakeyaml-1.33.jar b/java/jar/BOOT-INF/lib/snakeyaml-1.33.jar deleted file mode 100644 index 5a95195e..00000000 Binary files a/java/jar/BOOT-INF/lib/snakeyaml-1.33.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/snakeyaml-2.2.jar b/java/jar/BOOT-INF/lib/snakeyaml-2.2.jar new file mode 100644 index 00000000..275dd570 Binary files /dev/null and b/java/jar/BOOT-INF/lib/snakeyaml-2.2.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-aop-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-aop-6.0.3.jar deleted file mode 100644 index 88dbb0f0..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-aop-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-aop-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-aop-6.1.11.jar new file mode 100644 index 00000000..a5435693 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-aop-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-beans-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-beans-6.0.3.jar deleted file mode 100644 index 24bb9057..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-beans-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-beans-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-beans-6.1.11.jar new file mode 100644 index 00000000..c0655a8e Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-beans-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-3.0.1.jar b/java/jar/BOOT-INF/lib/spring-boot-3.0.1.jar deleted file mode 100644 index 8240cff5..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-boot-3.0.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-3.3.2.jar b/java/jar/BOOT-INF/lib/spring-boot-3.3.2.jar new file mode 100644 index 00000000..248a4221 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-boot-3.3.2.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-actuator-3.0.1.jar b/java/jar/BOOT-INF/lib/spring-boot-actuator-3.0.1.jar deleted file mode 100644 index 8a1ae30b..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-boot-actuator-3.0.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-actuator-3.3.2.jar b/java/jar/BOOT-INF/lib/spring-boot-actuator-3.3.2.jar new file mode 100644 index 00000000..cd5076d7 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-boot-actuator-3.3.2.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.0.1.jar b/java/jar/BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.0.1.jar deleted file mode 100644 index bd682a50..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.0.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.3.2.jar b/java/jar/BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.3.2.jar new file mode 100644 index 00000000..5263e415 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-boot-actuator-autoconfigure-3.3.2.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-autoconfigure-3.0.1.jar b/java/jar/BOOT-INF/lib/spring-boot-autoconfigure-3.0.1.jar deleted file mode 100644 index 1224d198..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-boot-autoconfigure-3.0.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-autoconfigure-3.3.2.jar b/java/jar/BOOT-INF/lib/spring-boot-autoconfigure-3.3.2.jar new file mode 100644 index 00000000..54a6b85c Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-boot-autoconfigure-3.3.2.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-jarmode-layertools-3.0.1.jar b/java/jar/BOOT-INF/lib/spring-boot-jarmode-layertools-3.0.1.jar deleted file mode 100644 index 1ab84efb..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-boot-jarmode-layertools-3.0.1.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-boot-jarmode-tools-3.3.2.jar b/java/jar/BOOT-INF/lib/spring-boot-jarmode-tools-3.3.2.jar new file mode 100644 index 00000000..9c431188 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-boot-jarmode-tools-3.3.2.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-context-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-context-6.0.3.jar deleted file mode 100644 index 92c1914a..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-context-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-context-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-context-6.1.11.jar new file mode 100644 index 00000000..e1756c9e Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-context-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-core-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-core-6.0.3.jar deleted file mode 100644 index 8e979f8c..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-core-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-core-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-core-6.1.11.jar new file mode 100644 index 00000000..1eb0e884 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-core-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-expression-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-expression-6.0.3.jar deleted file mode 100644 index a7579e57..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-expression-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-expression-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-expression-6.1.11.jar new file mode 100644 index 00000000..994792f1 Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-expression-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-jcl-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-jcl-6.0.3.jar deleted file mode 100644 index e1357f22..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-jcl-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-jcl-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-jcl-6.1.11.jar new file mode 100644 index 00000000..37bcad6b Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-jcl-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-web-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-web-6.0.3.jar deleted file mode 100644 index 9b33d93c..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-web-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-web-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-web-6.1.11.jar new file mode 100644 index 00000000..2497458f Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-web-6.1.11.jar differ diff --git a/java/jar/BOOT-INF/lib/spring-webflux-6.0.3.jar b/java/jar/BOOT-INF/lib/spring-webflux-6.0.3.jar deleted file mode 100644 index b4ce03b0..00000000 Binary files a/java/jar/BOOT-INF/lib/spring-webflux-6.0.3.jar and /dev/null differ diff --git a/java/jar/BOOT-INF/lib/spring-webflux-6.1.11.jar b/java/jar/BOOT-INF/lib/spring-webflux-6.1.11.jar new file mode 100644 index 00000000..2a1e7fdf Binary files /dev/null and b/java/jar/BOOT-INF/lib/spring-webflux-6.1.11.jar differ diff --git a/java/jar/META-INF/MANIFEST.MF b/java/jar/META-INF/MANIFEST.MF index 63396131..cad6e3ed 100644 --- a/java/jar/META-INF/MANIFEST.MF +++ b/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 diff --git a/java/jar/META-INF/maven/io.paketo/demo/pom.xml b/java/jar/META-INF/maven/io.paketo/demo/pom.xml index e24773c8..9e82b6e4 100644 --- a/java/jar/META-INF/maven/io.paketo/demo/pom.xml +++ b/java/jar/META-INF/maven/io.paketo/demo/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 3.0.1 + 3.3.2 io.paketo diff --git a/java/jar/META-INF/services/java.nio.file.spi.FileSystemProvider b/java/jar/META-INF/services/java.nio.file.spi.FileSystemProvider new file mode 100644 index 00000000..425737d3 --- /dev/null +++ b/java/jar/META-INF/services/java.nio.file.spi.FileSystemProvider @@ -0,0 +1 @@ +org.springframework.boot.loader.nio.file.NestedFileSystemProvider diff --git a/java/jar/README.md b/java/jar/README.md index c40b1c26..46f6bd86 100644 --- a/java/jar/README.md +++ b/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 diff --git a/java/jar/org/springframework/boot/loader/ClassPathIndexFile.class b/java/jar/org/springframework/boot/loader/ClassPathIndexFile.class deleted file mode 100644 index bd44e59f..00000000 Binary files a/java/jar/org/springframework/boot/loader/ClassPathIndexFile.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/ExecutableArchiveLauncher.class b/java/jar/org/springframework/boot/loader/ExecutableArchiveLauncher.class deleted file mode 100644 index 991cde98..00000000 Binary files a/java/jar/org/springframework/boot/loader/ExecutableArchiveLauncher.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/JarLauncher.class b/java/jar/org/springframework/boot/loader/JarLauncher.class deleted file mode 100644 index 2e0ded95..00000000 Binary files a/java/jar/org/springframework/boot/loader/JarLauncher.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader$DefinePackageCallType.class b/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader$DefinePackageCallType.class deleted file mode 100644 index 4a2e5a2b..00000000 Binary files a/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader$DefinePackageCallType.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader$UseFastConnectionExceptionsEnumeration.class b/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader$UseFastConnectionExceptionsEnumeration.class deleted file mode 100644 index 6edfb5c0..00000000 Binary files a/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader$UseFastConnectionExceptionsEnumeration.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader.class b/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader.class deleted file mode 100644 index 28d86998..00000000 Binary files a/java/jar/org/springframework/boot/loader/LaunchedURLClassLoader.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/Launcher.class b/java/jar/org/springframework/boot/loader/Launcher.class deleted file mode 100644 index b11d4373..00000000 Binary files a/java/jar/org/springframework/boot/loader/Launcher.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/MainMethodRunner.class b/java/jar/org/springframework/boot/loader/MainMethodRunner.class deleted file mode 100644 index eb0be321..00000000 Binary files a/java/jar/org/springframework/boot/loader/MainMethodRunner.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/PropertiesLauncher$ArchiveEntryFilter.class b/java/jar/org/springframework/boot/loader/PropertiesLauncher$ArchiveEntryFilter.class deleted file mode 100644 index 6f2dbe9a..00000000 Binary files a/java/jar/org/springframework/boot/loader/PropertiesLauncher$ArchiveEntryFilter.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/PropertiesLauncher$ClassPathArchives.class b/java/jar/org/springframework/boot/loader/PropertiesLauncher$ClassPathArchives.class deleted file mode 100644 index c32f7765..00000000 Binary files a/java/jar/org/springframework/boot/loader/PropertiesLauncher$ClassPathArchives.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/PropertiesLauncher$PrefixMatchingArchiveFilter.class b/java/jar/org/springframework/boot/loader/PropertiesLauncher$PrefixMatchingArchiveFilter.class deleted file mode 100644 index 6f3db1ab..00000000 Binary files a/java/jar/org/springframework/boot/loader/PropertiesLauncher$PrefixMatchingArchiveFilter.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/PropertiesLauncher.class b/java/jar/org/springframework/boot/loader/PropertiesLauncher.class deleted file mode 100644 index b18d9d84..00000000 Binary files a/java/jar/org/springframework/boot/loader/PropertiesLauncher.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/WarLauncher.class b/java/jar/org/springframework/boot/loader/WarLauncher.class deleted file mode 100644 index c32b1482..00000000 Binary files a/java/jar/org/springframework/boot/loader/WarLauncher.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/Archive$Entry.class b/java/jar/org/springframework/boot/loader/archive/Archive$Entry.class deleted file mode 100644 index 5c9a65e0..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/Archive$Entry.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/Archive$EntryFilter.class b/java/jar/org/springframework/boot/loader/archive/Archive$EntryFilter.class deleted file mode 100644 index d4be09a1..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/Archive$EntryFilter.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/Archive.class b/java/jar/org/springframework/boot/loader/archive/Archive.class deleted file mode 100644 index a8969ade..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/Archive.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$AbstractIterator.class b/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$AbstractIterator.class deleted file mode 100644 index 90c9cfa6..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$AbstractIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$ArchiveIterator.class b/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$ArchiveIterator.class deleted file mode 100644 index 52039187..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$ArchiveIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$EntryIterator.class b/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$EntryIterator.class deleted file mode 100644 index ec7e261d..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$EntryIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$FileEntry.class b/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$FileEntry.class deleted file mode 100644 index 24382303..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$FileEntry.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$SimpleJarFileArchive.class b/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$SimpleJarFileArchive.class deleted file mode 100644 index 15a9be05..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive$SimpleJarFileArchive.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive.class b/java/jar/org/springframework/boot/loader/archive/ExplodedArchive.class deleted file mode 100644 index 02061b72..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/ExplodedArchive.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$AbstractIterator.class b/java/jar/org/springframework/boot/loader/archive/JarFileArchive$AbstractIterator.class deleted file mode 100644 index 654e0ede..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$AbstractIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$EntryIterator.class b/java/jar/org/springframework/boot/loader/archive/JarFileArchive$EntryIterator.class deleted file mode 100644 index 922ca53a..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$EntryIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$JarFileEntry.class b/java/jar/org/springframework/boot/loader/archive/JarFileArchive$JarFileEntry.class deleted file mode 100644 index 344ad715..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$JarFileEntry.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$NestedArchiveIterator.class b/java/jar/org/springframework/boot/loader/archive/JarFileArchive$NestedArchiveIterator.class deleted file mode 100644 index 21f392a7..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/JarFileArchive$NestedArchiveIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/archive/JarFileArchive.class b/java/jar/org/springframework/boot/loader/archive/JarFileArchive.class deleted file mode 100644 index 24a30a1f..00000000 Binary files a/java/jar/org/springframework/boot/loader/archive/JarFileArchive.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/data/RandomAccessData.class b/java/jar/org/springframework/boot/loader/data/RandomAccessData.class deleted file mode 100644 index 35beeb1f..00000000 Binary files a/java/jar/org/springframework/boot/loader/data/RandomAccessData.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile$DataInputStream.class b/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile$DataInputStream.class deleted file mode 100644 index 3f0091a6..00000000 Binary files a/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile$DataInputStream.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile$FileAccess.class b/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile$FileAccess.class deleted file mode 100644 index 7c1f103b..00000000 Binary files a/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile$FileAccess.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile.class b/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile.class deleted file mode 100644 index 51dd8947..00000000 Binary files a/java/jar/org/springframework/boot/loader/data/RandomAccessDataFile.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/AbstractJarFile$JarFileType.class b/java/jar/org/springframework/boot/loader/jar/AbstractJarFile$JarFileType.class deleted file mode 100644 index b5ef8616..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/AbstractJarFile$JarFileType.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/AbstractJarFile.class b/java/jar/org/springframework/boot/loader/jar/AbstractJarFile.class deleted file mode 100644 index 5901f787..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/AbstractJarFile.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/AsciiBytes.class b/java/jar/org/springframework/boot/loader/jar/AsciiBytes.class deleted file mode 100644 index 31858800..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/AsciiBytes.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/Bytes.class b/java/jar/org/springframework/boot/loader/jar/Bytes.class deleted file mode 100644 index 89f254f8..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/Bytes.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord$Zip64End.class b/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord$Zip64End.class deleted file mode 100644 index ba766b9f..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord$Zip64End.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord$Zip64Locator.class b/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord$Zip64Locator.class deleted file mode 100644 index f57f2acf..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord$Zip64Locator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.class b/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.class deleted file mode 100644 index 62c4680a..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryEndRecord.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.class b/java/jar/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.class deleted file mode 100644 index ad963738..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryParser.class b/java/jar/org/springframework/boot/loader/jar/CentralDirectoryParser.class deleted file mode 100644 index 18595661..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryParser.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryVisitor.class b/java/jar/org/springframework/boot/loader/jar/CentralDirectoryVisitor.class deleted file mode 100644 index d55cf11a..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/CentralDirectoryVisitor.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/FileHeader.class b/java/jar/org/springframework/boot/loader/jar/FileHeader.class deleted file mode 100644 index be87e3ea..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/FileHeader.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/Handler.class b/java/jar/org/springframework/boot/loader/jar/Handler.class deleted file mode 100644 index dcfbb448..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/Handler.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarEntry.class b/java/jar/org/springframework/boot/loader/jar/JarEntry.class deleted file mode 100644 index 9cebffe6..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarEntry.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarEntryCertification.class b/java/jar/org/springframework/boot/loader/jar/JarEntryCertification.class deleted file mode 100644 index ad37805a..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarEntryCertification.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarEntryFilter.class b/java/jar/org/springframework/boot/loader/jar/JarEntryFilter.class deleted file mode 100644 index 6b57cefd..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarEntryFilter.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFile$1.class b/java/jar/org/springframework/boot/loader/jar/JarFile$1.class deleted file mode 100644 index 8bee236b..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFile$1.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFile$JarEntryEnumeration.class b/java/jar/org/springframework/boot/loader/jar/JarFile$JarEntryEnumeration.class deleted file mode 100644 index 459fc874..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFile$JarEntryEnumeration.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFile.class b/java/jar/org/springframework/boot/loader/jar/JarFile.class deleted file mode 100644 index 356af1d3..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFile.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$1.class b/java/jar/org/springframework/boot/loader/jar/JarFileEntries$1.class deleted file mode 100644 index 1531621a..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$1.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$EntryIterator.class b/java/jar/org/springframework/boot/loader/jar/JarFileEntries$EntryIterator.class deleted file mode 100644 index fd055695..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$EntryIterator.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$Offsets.class b/java/jar/org/springframework/boot/loader/jar/JarFileEntries$Offsets.class deleted file mode 100644 index 8787f720..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$Offsets.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$Zip64Offsets.class b/java/jar/org/springframework/boot/loader/jar/JarFileEntries$Zip64Offsets.class deleted file mode 100644 index 38ec242c..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$Zip64Offsets.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$ZipOffsets.class b/java/jar/org/springframework/boot/loader/jar/JarFileEntries$ZipOffsets.class deleted file mode 100644 index e62793c1..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileEntries$ZipOffsets.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileEntries.class b/java/jar/org/springframework/boot/loader/jar/JarFileEntries.class deleted file mode 100644 index 4033a30b..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileEntries.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarFileWrapper.class b/java/jar/org/springframework/boot/loader/jar/JarFileWrapper.class deleted file mode 100644 index 781a2427..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarFileWrapper.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarURLConnection$1.class b/java/jar/org/springframework/boot/loader/jar/JarURLConnection$1.class deleted file mode 100644 index 21b01907..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarURLConnection$1.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarURLConnection$JarEntryName.class b/java/jar/org/springframework/boot/loader/jar/JarURLConnection$JarEntryName.class deleted file mode 100644 index fdeb860c..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarURLConnection$JarEntryName.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/JarURLConnection.class b/java/jar/org/springframework/boot/loader/jar/JarURLConnection.class deleted file mode 100644 index b7c3f932..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/JarURLConnection.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/ManifestInfo.class b/java/jar/org/springframework/boot/loader/jar/ManifestInfo.class new file mode 100644 index 00000000..7d2fe709 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/ManifestInfo.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/MetaInfVersionsInfo.class b/java/jar/org/springframework/boot/loader/jar/MetaInfVersionsInfo.class new file mode 100644 index 00000000..29ffb948 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/MetaInfVersionsInfo.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntriesEnumeration.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntriesEnumeration.class new file mode 100644 index 00000000..05ad8ba9 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntriesEnumeration.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntryInflaterInputStream.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntryInflaterInputStream.class new file mode 100644 index 00000000..36b29fe2 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntryInflaterInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntryInputStream.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntryInputStream.class new file mode 100644 index 00000000..7f925b20 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$JarEntryInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile$NestedJarEntry.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$NestedJarEntry.class new file mode 100644 index 00000000..89f250a4 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$NestedJarEntry.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile$RawZipDataInputStream.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$RawZipDataInputStream.class new file mode 100644 index 00000000..8974e712 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$RawZipDataInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile$ZipContentEntriesSpliterator.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$ZipContentEntriesSpliterator.class new file mode 100644 index 00000000..8f0e0683 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile$ZipContentEntriesSpliterator.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFile.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFile.class new file mode 100644 index 00000000..413f7bd9 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFile.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/NestedJarFileResources.class b/java/jar/org/springframework/boot/loader/jar/NestedJarFileResources.class new file mode 100644 index 00000000..b1f8e12d Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/NestedJarFileResources.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/SecurityInfo.class b/java/jar/org/springframework/boot/loader/jar/SecurityInfo.class new file mode 100644 index 00000000..48699436 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/jar/SecurityInfo.class differ diff --git a/java/jar/org/springframework/boot/loader/jar/StringSequence.class b/java/jar/org/springframework/boot/loader/jar/StringSequence.class deleted file mode 100644 index 6401e2eb..00000000 Binary files a/java/jar/org/springframework/boot/loader/jar/StringSequence.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/jar/ZipInflaterInputStream.class b/java/jar/org/springframework/boot/loader/jar/ZipInflaterInputStream.class index 72394d11..ff538c8e 100644 Binary files a/java/jar/org/springframework/boot/loader/jar/ZipInflaterInputStream.class and b/java/jar/org/springframework/boot/loader/jar/ZipInflaterInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/jarmode/TestJarMode.class b/java/jar/org/springframework/boot/loader/jarmode/TestJarMode.class deleted file mode 100644 index 9212b05e..00000000 Binary files a/java/jar/org/springframework/boot/loader/jarmode/TestJarMode.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/launch/Archive$Entry.class b/java/jar/org/springframework/boot/loader/launch/Archive$Entry.class new file mode 100644 index 00000000..4b7b7eaf Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/Archive$Entry.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/Archive.class b/java/jar/org/springframework/boot/loader/launch/Archive.class new file mode 100644 index 00000000..d8d2d59f Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/Archive.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/ClassPathIndexFile.class b/java/jar/org/springframework/boot/loader/launch/ClassPathIndexFile.class new file mode 100644 index 00000000..89512ea5 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/ClassPathIndexFile.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/ExecutableArchiveLauncher.class b/java/jar/org/springframework/boot/loader/launch/ExecutableArchiveLauncher.class new file mode 100644 index 00000000..5a4e124f Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/ExecutableArchiveLauncher.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/ExplodedArchive$FileArchiveEntry.class b/java/jar/org/springframework/boot/loader/launch/ExplodedArchive$FileArchiveEntry.class new file mode 100644 index 00000000..0136514d Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/ExplodedArchive$FileArchiveEntry.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/ExplodedArchive.class b/java/jar/org/springframework/boot/loader/launch/ExplodedArchive.class new file mode 100644 index 00000000..d300782b Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/ExplodedArchive.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/JarFileArchive$JarArchiveEntry.class b/java/jar/org/springframework/boot/loader/launch/JarFileArchive$JarArchiveEntry.class new file mode 100644 index 00000000..07742594 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/JarFileArchive$JarArchiveEntry.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/JarFileArchive.class b/java/jar/org/springframework/boot/loader/launch/JarFileArchive.class new file mode 100644 index 00000000..bc9f2d18 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/JarFileArchive.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/JarLauncher.class b/java/jar/org/springframework/boot/loader/launch/JarLauncher.class new file mode 100644 index 00000000..9f72c1dd Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/JarLauncher.class differ diff --git a/java/jar/org/springframework/boot/loader/jarmode/JarModeLauncher.class b/java/jar/org/springframework/boot/loader/launch/JarModeRunner.class similarity index 77% rename from java/jar/org/springframework/boot/loader/jarmode/JarModeLauncher.class rename to java/jar/org/springframework/boot/loader/launch/JarModeRunner.class index e3c9c0b3..793d47dc 100644 Binary files a/java/jar/org/springframework/boot/loader/jarmode/JarModeLauncher.class and b/java/jar/org/springframework/boot/loader/launch/JarModeRunner.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/LaunchedClassLoader$DefinePackageCallType.class b/java/jar/org/springframework/boot/loader/launch/LaunchedClassLoader$DefinePackageCallType.class new file mode 100644 index 00000000..c3760877 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/LaunchedClassLoader$DefinePackageCallType.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/LaunchedClassLoader.class b/java/jar/org/springframework/boot/loader/launch/LaunchedClassLoader.class new file mode 100644 index 00000000..e4d02323 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/LaunchedClassLoader.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/Launcher.class b/java/jar/org/springframework/boot/loader/launch/Launcher.class new file mode 100644 index 00000000..360108f0 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/Launcher.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher$Instantiator$Using.class b/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher$Instantiator$Using.class new file mode 100644 index 00000000..c275763d Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher$Instantiator$Using.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher$Instantiator.class b/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher$Instantiator.class new file mode 100644 index 00000000..e55e0908 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher$Instantiator.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher.class b/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher.class new file mode 100644 index 00000000..38922f29 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/PropertiesLauncher.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/SystemPropertyUtils.class b/java/jar/org/springframework/boot/loader/launch/SystemPropertyUtils.class new file mode 100644 index 00000000..ac7d2394 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/SystemPropertyUtils.class differ diff --git a/java/jar/org/springframework/boot/loader/launch/WarLauncher.class b/java/jar/org/springframework/boot/loader/launch/WarLauncher.class new file mode 100644 index 00000000..800f2cc4 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/launch/WarLauncher.class differ diff --git a/java/jar/org/springframework/boot/loader/log/DebugLogger$DisabledDebugLogger.class b/java/jar/org/springframework/boot/loader/log/DebugLogger$DisabledDebugLogger.class new file mode 100644 index 00000000..063c7593 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/log/DebugLogger$DisabledDebugLogger.class differ diff --git a/java/jar/org/springframework/boot/loader/log/DebugLogger$SystemErrDebugLogger.class b/java/jar/org/springframework/boot/loader/log/DebugLogger$SystemErrDebugLogger.class new file mode 100644 index 00000000..ade369e1 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/log/DebugLogger$SystemErrDebugLogger.class differ diff --git a/java/jar/org/springframework/boot/loader/log/DebugLogger.class b/java/jar/org/springframework/boot/loader/log/DebugLogger.class new file mode 100644 index 00000000..28f71510 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/log/DebugLogger.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/Handlers.class b/java/jar/org/springframework/boot/loader/net/protocol/Handlers.class new file mode 100644 index 00000000..26c918f7 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/Handlers.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/Canonicalizer.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/Canonicalizer.class new file mode 100644 index 00000000..9368d804 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/Canonicalizer.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/Handler.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/Handler.class new file mode 100644 index 00000000..fb9cd3c1 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/Handler.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarFileUrlKey.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarFileUrlKey.class new file mode 100644 index 00000000..628d72a7 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarFileUrlKey.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrl.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrl.class new file mode 100644 index 00000000..a850ab33 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrl.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader$OptimizedEnumeration.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader$OptimizedEnumeration.class new file mode 100644 index 00000000..147a18b8 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader$OptimizedEnumeration.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader.class new file mode 100644 index 00000000..07cd8d60 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlClassLoader.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection$ConnectionInputStream.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection$ConnectionInputStream.class new file mode 100644 index 00000000..3a3b175e Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection$ConnectionInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection$EmptyUrlStreamHandler.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection$EmptyUrlStreamHandler.class new file mode 100644 index 00000000..c1909c3b Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection$EmptyUrlStreamHandler.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.class new file mode 100644 index 00000000..7450ca0f Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/JarUrlConnection.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/LazyDelegatingInputStream.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/LazyDelegatingInputStream.class new file mode 100644 index 00000000..b7239ac5 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/LazyDelegatingInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/Optimizations.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/Optimizations.class new file mode 100644 index 00000000..85b6e613 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/Optimizations.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarEntry.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarEntry.class new file mode 100644 index 00000000..e5d4fc31 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarEntry.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFile.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFile.class new file mode 100644 index 00000000..8d4f7a62 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFile.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFileFactory.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFileFactory.class new file mode 100644 index 00000000..ae5fb55f Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFileFactory.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles$Cache.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles$Cache.class new file mode 100644 index 00000000..265c5b4f Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles$Cache.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles.class new file mode 100644 index 00000000..13efec0d Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarFiles.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarManifest$ManifestSupplier.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarManifest$ManifestSupplier.class new file mode 100644 index 00000000..85672c9f Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarManifest$ManifestSupplier.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarManifest.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarManifest.class new file mode 100644 index 00000000..d3a4a09a Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlJarManifest.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlNestedJarFile.class b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlNestedJarFile.class new file mode 100644 index 00000000..17580518 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/jar/UrlNestedJarFile.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/nested/Handler.class b/java/jar/org/springframework/boot/loader/net/protocol/nested/Handler.class new file mode 100644 index 00000000..70935876 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/nested/Handler.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedLocation.class b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedLocation.class new file mode 100644 index 00000000..46ebb95a Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedLocation.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnection$ConnectionInputStream.class b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnection$ConnectionInputStream.class new file mode 100644 index 00000000..e6069385 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnection$ConnectionInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnection.class b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnection.class new file mode 100644 index 00000000..403765bd Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnection.class differ diff --git a/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionResources.class b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionResources.class new file mode 100644 index 00000000..d8862071 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionResources.class differ diff --git a/java/jar/org/springframework/boot/loader/net/util/UrlDecoder.class b/java/jar/org/springframework/boot/loader/net/util/UrlDecoder.class new file mode 100644 index 00000000..f9a29dd7 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/net/util/UrlDecoder.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/NestedByteChannel$Resources.class b/java/jar/org/springframework/boot/loader/nio/file/NestedByteChannel$Resources.class new file mode 100644 index 00000000..8d3b0c5e Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/NestedByteChannel$Resources.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/NestedByteChannel.class b/java/jar/org/springframework/boot/loader/nio/file/NestedByteChannel.class new file mode 100644 index 00000000..e42217f5 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/NestedByteChannel.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/NestedFileStore.class b/java/jar/org/springframework/boot/loader/nio/file/NestedFileStore.class new file mode 100644 index 00000000..59bd111b Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/NestedFileStore.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/NestedFileSystem.class b/java/jar/org/springframework/boot/loader/nio/file/NestedFileSystem.class new file mode 100644 index 00000000..1639f0ac Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/NestedFileSystem.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/NestedFileSystemProvider.class b/java/jar/org/springframework/boot/loader/nio/file/NestedFileSystemProvider.class new file mode 100644 index 00000000..717e84c9 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/NestedFileSystemProvider.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/NestedPath.class b/java/jar/org/springframework/boot/loader/nio/file/NestedPath.class new file mode 100644 index 00000000..7ad7ed67 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/NestedPath.class differ diff --git a/java/jar/org/springframework/boot/loader/nio/file/UriPathEncoder.class b/java/jar/org/springframework/boot/loader/nio/file/UriPathEncoder.class new file mode 100644 index 00000000..62d44a24 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/nio/file/UriPathEncoder.class differ diff --git a/java/jar/org/springframework/boot/loader/ref/Cleaner.class b/java/jar/org/springframework/boot/loader/ref/Cleaner.class new file mode 100644 index 00000000..3999f51b Binary files /dev/null and b/java/jar/org/springframework/boot/loader/ref/Cleaner.class differ diff --git a/java/jar/org/springframework/boot/loader/ref/DefaultCleaner.class b/java/jar/org/springframework/boot/loader/ref/DefaultCleaner.class new file mode 100644 index 00000000..6120a017 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/ref/DefaultCleaner.class differ diff --git a/java/jar/org/springframework/boot/loader/util/SystemPropertyUtils.class b/java/jar/org/springframework/boot/loader/util/SystemPropertyUtils.class deleted file mode 100644 index c4663b4d..00000000 Binary files a/java/jar/org/springframework/boot/loader/util/SystemPropertyUtils.class and /dev/null differ diff --git a/java/jar/org/springframework/boot/loader/zip/ByteArrayDataBlock.class b/java/jar/org/springframework/boot/loader/zip/ByteArrayDataBlock.class new file mode 100644 index 00000000..12645582 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ByteArrayDataBlock.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/CloseableDataBlock.class b/java/jar/org/springframework/boot/loader/zip/CloseableDataBlock.class new file mode 100644 index 00000000..495d6566 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/CloseableDataBlock.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/DataBlock.class b/java/jar/org/springframework/boot/loader/zip/DataBlock.class new file mode 100644 index 00000000..9a5fab62 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/DataBlock.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/DataBlockInputStream.class b/java/jar/org/springframework/boot/loader/zip/DataBlockInputStream.class new file mode 100644 index 00000000..3a4fb692 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/DataBlockInputStream.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/FileDataBlock$FileAccess.class b/java/jar/org/springframework/boot/loader/zip/FileDataBlock$FileAccess.class new file mode 100644 index 00000000..da51cc42 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/FileDataBlock$FileAccess.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/FileDataBlock$Tracker$1.class b/java/jar/org/springframework/boot/loader/zip/FileDataBlock$Tracker$1.class new file mode 100644 index 00000000..ae5df665 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/FileDataBlock$Tracker$1.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/FileDataBlock$Tracker.class b/java/jar/org/springframework/boot/loader/zip/FileDataBlock$Tracker.class new file mode 100644 index 00000000..afad850b Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/FileDataBlock$Tracker.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/FileDataBlock.class b/java/jar/org/springframework/boot/loader/zip/FileDataBlock.class new file mode 100644 index 00000000..a569d18d Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/FileDataBlock.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/NameOffsetLookups.class b/java/jar/org/springframework/boot/loader/zip/NameOffsetLookups.class new file mode 100644 index 00000000..05e60224 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/NameOffsetLookups.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/VirtualDataBlock.class b/java/jar/org/springframework/boot/loader/zip/VirtualDataBlock.class new file mode 100644 index 00000000..76cc0fc2 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/VirtualDataBlock.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/VirtualZipDataBlock$DataPart.class b/java/jar/org/springframework/boot/loader/zip/VirtualZipDataBlock$DataPart.class new file mode 100644 index 00000000..49e25a84 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/VirtualZipDataBlock$DataPart.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/VirtualZipDataBlock.class b/java/jar/org/springframework/boot/loader/zip/VirtualZipDataBlock.class new file mode 100644 index 00000000..6429a53a Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/VirtualZipDataBlock.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/Zip64EndOfCentralDirectoryLocator.class b/java/jar/org/springframework/boot/loader/zip/Zip64EndOfCentralDirectoryLocator.class new file mode 100644 index 00000000..c0525d41 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/Zip64EndOfCentralDirectoryLocator.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/Zip64EndOfCentralDirectoryRecord.class b/java/jar/org/springframework/boot/loader/zip/Zip64EndOfCentralDirectoryRecord.class new file mode 100644 index 00000000..909bbcc1 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/Zip64EndOfCentralDirectoryRecord.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipCentralDirectoryFileHeaderRecord.class b/java/jar/org/springframework/boot/loader/zip/ZipCentralDirectoryFileHeaderRecord.class new file mode 100644 index 00000000..c8078f17 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipCentralDirectoryFileHeaderRecord.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipContent$Entry.class b/java/jar/org/springframework/boot/loader/zip/ZipContent$Entry.class new file mode 100644 index 00000000..f7a27154 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipContent$Entry.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipContent$Kind.class b/java/jar/org/springframework/boot/loader/zip/ZipContent$Kind.class new file mode 100644 index 00000000..d2d3a08a Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipContent$Kind.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipContent$Loader.class b/java/jar/org/springframework/boot/loader/zip/ZipContent$Loader.class new file mode 100644 index 00000000..a311daa9 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipContent$Loader.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipContent$Source.class b/java/jar/org/springframework/boot/loader/zip/ZipContent$Source.class new file mode 100644 index 00000000..8317deed Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipContent$Source.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipContent.class b/java/jar/org/springframework/boot/loader/zip/ZipContent.class new file mode 100644 index 00000000..588dd987 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipContent.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipDataDescriptorRecord.class b/java/jar/org/springframework/boot/loader/zip/ZipDataDescriptorRecord.class new file mode 100644 index 00000000..d74bb25c Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipDataDescriptorRecord.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipEndOfCentralDirectoryRecord$Located.class b/java/jar/org/springframework/boot/loader/zip/ZipEndOfCentralDirectoryRecord$Located.class new file mode 100644 index 00000000..a389609a Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipEndOfCentralDirectoryRecord$Located.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipEndOfCentralDirectoryRecord.class b/java/jar/org/springframework/boot/loader/zip/ZipEndOfCentralDirectoryRecord.class new file mode 100644 index 00000000..e0f805c2 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipEndOfCentralDirectoryRecord.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipLocalFileHeaderRecord.class b/java/jar/org/springframework/boot/loader/zip/ZipLocalFileHeaderRecord.class new file mode 100644 index 00000000..da933dbc Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipLocalFileHeaderRecord.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipString$CompareType.class b/java/jar/org/springframework/boot/loader/zip/ZipString$CompareType.class new file mode 100644 index 00000000..9870c992 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipString$CompareType.class differ diff --git a/java/jar/org/springframework/boot/loader/zip/ZipString.class b/java/jar/org/springframework/boot/loader/zip/ZipString.class new file mode 100644 index 00000000..43769a23 Binary files /dev/null and b/java/jar/org/springframework/boot/loader/zip/ZipString.class differ diff --git a/java/jar/update-me.sh b/java/jar/update-me.sh index 7e9529bc..74104dd5 100755 --- a/java/jar/update-me.sh +++ b/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" diff --git a/java/kotlin/README.md b/java/kotlin/README.md index eb694eaa..36c8dd38 100644 --- a/java/kotlin/README.md +++ b/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 diff --git a/java/kotlin/build.gradle.kts b/java/kotlin/build.gradle.kts index 7608d244..96f7effc 100644 --- a/java/kotlin/build.gradle.kts +++ b/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") { 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 { - useJUnitPlatform() +kotlin { + compilerOptions { + freeCompilerArgs.addAll("-Xjsr305=strict") + } } -tasks.withType { - kotlinOptions { - freeCompilerArgs = listOf("-Xjsr305=strict") - jvmTarget = "1.8" - } +tasks.withType { + useJUnitPlatform() } + diff --git a/java/kotlin/gradle/wrapper/gradle-wrapper.jar b/java/kotlin/gradle/wrapper/gradle-wrapper.jar index 7454180f..2c352119 100644 Binary files a/java/kotlin/gradle/wrapper/gradle-wrapper.jar and b/java/kotlin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/java/kotlin/gradle/wrapper/gradle-wrapper.properties b/java/kotlin/gradle/wrapper/gradle-wrapper.properties index 98debb84..09523c0e 100644 --- a/java/kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/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 diff --git a/java/kotlin/gradlew b/java/kotlin/gradlew index 744e882e..f5feea6d 100755 --- a/java/kotlin/gradlew +++ b/java/kotlin/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,104 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +122,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +133,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/java/kotlin/gradlew.bat b/java/kotlin/gradlew.bat index 107acd32..9d21a218 100644 --- a/java/kotlin/gradlew.bat +++ b/java/kotlin/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/java/war/README.md b/java/war/README.md index fd573ac4..d8fdbf7f 100644 --- a/java/war/README.md +++ b/java/war/README.md @@ -5,7 +5,7 @@ See [prerequisites](https://paketo.io/docs/howto/java/#prerequisites) of this sa ## Building ```bash -pack build applications/war --env BP_JVM_VERSION=11 +pack build applications/war --env BP_JVM_VERSION=17 --env BP_TOMCAT_VERSION=10 ``` ## Running diff --git a/java/war/pom.xml b/java/war/pom.xml index f5667879..fdff33fc 100644 --- a/java/war/pom.xml +++ b/java/war/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.3.2 io.paketo @@ -14,10 +16,6 @@ demo Demo project for Spring Boot - - 11 - - org.springframework.boot @@ -27,10 +25,6 @@ org.springframework.boot spring-boot-starter-web - - org.springframework.boot - spring-boot-starter-webflux - org.springframework.boot @@ -48,11 +42,37 @@ - - io.projectreactor - reactor-test - test - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + + 10 + + paketobuildpacks/builder-jammy-buildpackless-tiny + + docker.io/paketobuildpacks/java:15.1.0 + + + + + + repackage + + repackage + + + true + + + + + + + + \ No newline at end of file diff --git a/java/war/smoke_test/war_test.go b/java/war/smoke_test/war_test.go index 509c75e4..cc36feba 100644 --- a/java/war/smoke_test/war_test.go +++ b/java/war/smoke_test/war_test.go @@ -3,12 +3,13 @@ package war_test import ( "flag" "fmt" - "github.com/paketo-buildpacks/samples/tests" "os" "path/filepath" "testing" "time" + "github.com/paketo-buildpacks/samples/tests" + "github.com/paketo-buildpacks/occam" "github.com/sclevine/spec" "github.com/sclevine/spec/report" @@ -96,6 +97,7 @@ func testWARWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { image, logs, err = pack.Build. WithPullPolicy("never"). WithBuilder(builder). + WithEnv(map[string]string{"BP_TOMCAT_VERSION": "10"}). Execute(name, source) Expect(err).ToNot(HaveOccurred(), logs.String)