Merge branch 'main' into dependabot/go_modules/go/mod/github.com/gori…

…lla/mux-1.8.1
paketo-buildpacks · May 21, 2024 · 40bf653 · 40bf653
2 parents b8eecd5 + 86a7812
commit 40bf653
Show file tree

Hide file tree

Showing 20 changed files with 434 additions and 460 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3,7 +3,7 @@ ca-certificates/ @paketo-buildpacks/utilities-maintainers
 dotnet-core/     @paketo-buildpacks/dotnet-core-maintainers
 git/             @paketo-buildpacks/utilities-maintainers
 go/              @paketo-buildpacks/go-maintainers
-java/            @paketo-buildpacks/java-buildpacks
+java/            @paketo-buildpacks/java-maintainers
 nginx/           @paketo-buildpacks/web-servers-maintainers
 nodejs/          @paketo-buildpacks/nodejs-maintainers
 php/             @paketo-buildpacks/php-maintainers

diff --git a/java/application-insights/pom.xml b/java/application-insights/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.17</version>
+		<version>2.7.18</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>

diff --git a/java/aspectj/pom.xml b/java/aspectj/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.17</version>
+		<version>2.7.18</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.paketo</groupId>

diff --git a/java/dist-zip/build.gradle b/java/dist-zip/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.5'
-	id 'io.spring.dependency-management' version '1.1.4'
+	id 'org.springframework.boot' version '3.2.5'
+	id 'io.spring.dependency-management' version '1.1.5'
 	id 'application'
 }
 

diff --git a/java/gradle/build.gradle b/java/gradle/build.gradle
@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '3.1.5'
-	id 'io.spring.dependency-management' version '1.1.4'
+	id 'org.springframework.boot' version '3.2.5'
+	id 'io.spring.dependency-management' version '1.1.5'
 }
 
 group = 'io.paketo'

diff --git a/java/gradle/smoke_test/gradle_test.go b/java/gradle/smoke_test/gradle_test.go
@@ -98,12 +98,10 @@ func testGradleWithBuilder(builder string) func(*testing.T, spec.G, spec.S) {
 						WithEnv(map[string]string{
 							"BP_JVM_VERSION":           "17",
 							"BP_GRADLE_BUILT_ARTIFACT": "build/libs/*-SNAPSHOT.jar",
+							"SERVICE_BINDING_ROOT":     "/bindings",
 						}).
 						WithBuilder(builder).
 						WithGID("123").
-						WithEnv(map[string]string{
-							"SERVICE_BINDING_ROOT": "/bindings",
-						}).
 						WithVolumes(fmt.Sprintf("%s:/bindings/gradle-wrapper", filepath.Join(source, "bindings/gradle-wrapper"))).
 						Execute(name, source)
 					Expect(err).ToNot(HaveOccurred(), logs.String)