From 2b4f7e48dbd77bcbd4928daa0a3ea6de7a78ee81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 14:08:42 +0000 Subject: [PATCH 1/2] Bump io.undertow:undertow-core Bumps [io.undertow:undertow-core](https://github.com/undertow-io/undertow) from 2.3.12.Final to 2.3.17.Final. - [Release notes](https://github.com/undertow-io/undertow/releases) - [Commits](https://github.com/undertow-io/undertow/compare/2.3.12.Final...2.3.17.Final) --- updated-dependencies: - dependency-name: io.undertow:undertow-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- buildpacks/maven/test-apps/simple-http-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/maven/test-apps/simple-http-service/pom.xml b/buildpacks/maven/test-apps/simple-http-service/pom.xml index a2c169b0..21e7138d 100644 --- a/buildpacks/maven/test-apps/simple-http-service/pom.xml +++ b/buildpacks/maven/test-apps/simple-http-service/pom.xml @@ -22,7 +22,7 @@ io.undertow undertow-core - 2.3.12.Final + 2.3.17.Final com.google.guava From 66dca795b4d911d9cb15b0d8caf5b70b4f9c0022 Mon Sep 17 00:00:00 2001 From: Manuel Fuchs Date: Wed, 23 Oct 2024 12:41:18 +0200 Subject: [PATCH 2/2] Fix integration tests --- .../gradle/test-apps/heroku-gradle-getting-started | 2 +- .../maven/test-apps/heroku-java-getting-started | 2 +- buildpacks/maven/tests/integration/customization.rs | 6 +++--- buildpacks/maven/tests/integration/misc.rs | 12 ++++++------ buildpacks/sbt/sbt-extras | 2 +- .../sbt/test-apps/heroku-scala-getting-started | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/buildpacks/gradle/test-apps/heroku-gradle-getting-started b/buildpacks/gradle/test-apps/heroku-gradle-getting-started index f46765f5..50c6269b 160000 --- a/buildpacks/gradle/test-apps/heroku-gradle-getting-started +++ b/buildpacks/gradle/test-apps/heroku-gradle-getting-started @@ -1 +1 @@ -Subproject commit f46765f58520bc87629a6fbc1c2ff5fefb80aea3 +Subproject commit 50c6269b98789ce34a59d7dd46adea7b944fd119 diff --git a/buildpacks/maven/test-apps/heroku-java-getting-started b/buildpacks/maven/test-apps/heroku-java-getting-started index 0e29785d..46661f6d 160000 --- a/buildpacks/maven/test-apps/heroku-java-getting-started +++ b/buildpacks/maven/test-apps/heroku-java-getting-started @@ -1 +1 @@ -Subproject commit 0e29785d6b289de49b29b95876b9dc044f0d0f6f +Subproject commit 46661f6d0fff059f3ebc62d2c4a11a33e751637d diff --git a/buildpacks/maven/tests/integration/customization.rs b/buildpacks/maven/tests/integration/customization.rs index a76366ba..e0a99243 100644 --- a/buildpacks/maven/tests/integration/customization.rs +++ b/buildpacks/maven/tests/integration/customization.rs @@ -17,12 +17,12 @@ fn maven_custom_goals() { indoc! {" The following files have been resolved: - io.undertow:undertow-core:jar:2.3.12.Final:compile + io.undertow:undertow-core:jar:2.3.17.Final:compile org.jboss.logging:jboss-logging:jar:3.4.3.Final:compile - org.jboss.xnio:xnio-api:jar:3.8.8.Final:compile + org.jboss.xnio:xnio-api:jar:3.8.16.Final:compile org.wildfly.common:wildfly-common:jar:1.5.4.Final:compile org.wildfly.client:wildfly-client-config:jar:1.0.1.Final:compile - org.jboss.xnio:xnio-nio:jar:3.8.8.Final:runtime + org.jboss.xnio:xnio-nio:jar:3.8.16.Final:runtime org.jboss.threads:jboss-threads:jar:3.5.0.Final:compile com.google.guava:guava:jar:32.0.0-jre:compile com.google.guava:failureaccess:jar:1.0.1:compile diff --git a/buildpacks/maven/tests/integration/misc.rs b/buildpacks/maven/tests/integration/misc.rs index d9cbcdfc..6699d70f 100644 --- a/buildpacks/maven/tests/integration/misc.rs +++ b/buildpacks/maven/tests/integration/misc.rs @@ -28,12 +28,12 @@ fn mvn_dependency_list() { indoc! {" The following files have been resolved: - io.undertow:undertow-core:jar:2.3.12.Final:compile + io.undertow:undertow-core:jar:2.3.17.Final:compile org.jboss.logging:jboss-logging:jar:3.4.3.Final:compile - org.jboss.xnio:xnio-api:jar:3.8.8.Final:compile + org.jboss.xnio:xnio-api:jar:3.8.16.Final:compile org.wildfly.common:wildfly-common:jar:1.5.4.Final:compile org.wildfly.client:wildfly-client-config:jar:1.0.1.Final:compile - org.jboss.xnio:xnio-nio:jar:3.8.8.Final:runtime + org.jboss.xnio:xnio-nio:jar:3.8.16.Final:runtime org.jboss.threads:jboss-threads:jar:3.5.0.Final:compile com.google.guava:guava:jar:32.0.0-jre:compile com.google.guava:failureaccess:jar:1.0.1:compile @@ -80,11 +80,11 @@ fn no_unexpected_files_in_app_dir() { /workspace/target/dependency/jsr305-3.0.2.jar /workspace/target/dependency/junit-4.13.1.jar /workspace/target/dependency/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar - /workspace/target/dependency/undertow-core-2.3.12.Final.jar + /workspace/target/dependency/undertow-core-2.3.17.Final.jar /workspace/target/dependency/wildfly-client-config-1.0.1.Final.jar /workspace/target/dependency/wildfly-common-1.5.4.Final.jar - /workspace/target/dependency/xnio-api-3.8.8.Final.jar - /workspace/target/dependency/xnio-nio-3.8.8.Final.jar + /workspace/target/dependency/xnio-api-3.8.16.Final.jar + /workspace/target/dependency/xnio-nio-3.8.16.Final.jar /workspace/target/maven-archiver/pom.properties /workspace/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst /workspace/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/buildpacks/sbt/sbt-extras b/buildpacks/sbt/sbt-extras index 408f7484..ed4bce34 160000 --- a/buildpacks/sbt/sbt-extras +++ b/buildpacks/sbt/sbt-extras @@ -1 +1 @@ -Subproject commit 408f74841b90169a7f674955389212e2d02f7f4d +Subproject commit ed4bce34420650fbc06cc161f1960b539f19289d diff --git a/buildpacks/sbt/test-apps/heroku-scala-getting-started b/buildpacks/sbt/test-apps/heroku-scala-getting-started index 928d3c94..61340fc2 160000 --- a/buildpacks/sbt/test-apps/heroku-scala-getting-started +++ b/buildpacks/sbt/test-apps/heroku-scala-getting-started @@ -1 +1 @@ -Subproject commit 928d3c9405f36eb35021c3306fd1c648238dcc6f +Subproject commit 61340fc2b557cb8bcf365c7bd7f05042cc9768f0