diff --git a/.github/workflows/java-gradle.yml b/.github/workflows/java-gradle.yml index 3c8429ee..572c40dc 100644 --- a/.github/workflows/java-gradle.yml +++ b/.github/workflows/java-gradle.yml @@ -28,5 +28,6 @@ jobs: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('java/gradle/*.gradle') }} restore-keys: ${{ runner.os }}-gradle + # simulate the bindings - run: ./gradlew build working-directory: java/gradle diff --git a/ca-certificates/ca-certificates-sample/buildpack/buildpack.toml b/ca-certificates/ca-certificates-sample/buildpack/buildpack.toml index a5e825be..bbdad8df 100644 --- a/ca-certificates/ca-certificates-sample/buildpack/buildpack.toml +++ b/ca-certificates/ca-certificates-sample/buildpack/buildpack.toml @@ -1,4 +1,4 @@ -api = "0.4" +api = "0.7" [buildpack] id = "paketo-buildpacks/samples-ca-certficates" diff --git a/go.mod b/go.mod index 2fa16c82..91b7dbf5 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/gabriel-vasile/mimetype v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.5.9 // indirect github.com/google/uuid v1.3.0 // indirect github.com/magiconair/properties v1.8.6 // indirect @@ -46,8 +46,8 @@ require ( golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.6.0 // indirect - google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect - google.golang.org/grpc v1.53.0 // indirect - google.golang.org/protobuf v1.28.1 // indirect + google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect + google.golang.org/grpc v1.56.3 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 18e13c79..d6e7615d 100644 --- a/go.sum +++ b/go.sum @@ -1060,8 +1060,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -3174,8 +3175,8 @@ google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljW google.golang.org/genproto v0.0.0-20220706132729-d86698d07c53/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220720214146-176da50484ac/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE= google.golang.org/genproto v0.0.0-20220805133916-01dd62135a58/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= -google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= +google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -3222,8 +3223,8 @@ google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0/go.mod h1:DNq5QpG7LJqD2AamLZ7zvKE0DEpVl2BSEVjFycAAjRY= google.golang.org/grpc/examples v0.0.0-20201130180447-c456688b1860/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE= @@ -3242,8 +3243,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/statsd.v2 v2.0.0/go.mod h1:i0ubccKGzBVNBpdGV5MocxyA/XlLUJzA7SLonnE4drU= diff --git a/java/application-insights/pom.xml b/java/application-insights/pom.xml index aee5668e..4d002ae3 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.15 + 2.7.17 io.paketo diff --git a/java/aspectj/pom.xml b/java/aspectj/pom.xml index 8c16392d..6acc3379 100644 --- a/java/aspectj/pom.xml +++ b/java/aspectj/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.15 + 2.7.17 io.paketo diff --git a/java/dist-zip/build.gradle b/java/dist-zip/build.gradle index e25e160f..3deb641c 100644 --- 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.3' - id 'io.spring.dependency-management' version '1.1.3' + id 'org.springframework.boot' version '3.1.5' + id 'io.spring.dependency-management' version '1.1.4' id 'application' } diff --git a/java/gradle/README.md b/java/gradle/README.md index a67bb7ce..56aaf733 100644 --- a/java/gradle/README.md +++ b/java/gradle/README.md @@ -5,22 +5,30 @@ See [prerequisites](https://paketo.io/docs/howto/java/#prerequisites) of this sa ## Building ```bash -pack build applications/gradle --env BP_JVM_VERSION=17 +pack build applications/gradle ``` -Alternatively, if you want to attach a `gradle.properties` file to pass additional configuration to Gradle. +Alternatively, if you want to attach a `gradle.properties` and/or a `gradle-wrapper.properties` file to pass additional configuration to Gradle (Wrapper). ```bash -pack build applications/gradle --volume $(pwd)/bindings:/platform/bindings --env BP_JVM_VERSION=17 +pack build applications/gradle --volume $(pwd)/bindings:/platform/bindings ``` -The command above will use the sample `gradle.properties` file from this repo. It may be more useful to copy your local `gradle.properties` file first. +The command above will use: + +* the sample `gradle.properties` file from this repo. It may be more useful to copy your local `gradle.properties` file first. ```bash cp ~/.gradle/gradle.properties java/gradle/bindings/gradle/gradle.properties -pack build applications/gradle --volume $(pwd)/bindings:/platform/bindings --env BP_JVM_VERSION=17 +pack build applications/gradle --volume $(pwd)/bindings:/platform/bindings ``` +* the sample `gradle-wrapper.properties` file from this repo. It may be more useful to copy your local `gradle-wrapper.properties` file first. + +```bash +cp ~/gradle/wrapper/gradle-wrapper.properties java/gradle/bindings/gradle-wrapper/gradle-wrapper.properties +pack build applications/gradle --volume $(pwd)/bindings:/platform/bindings + ## Running ```bash diff --git a/java/gradle/bindings/gradle-wrapper/gradle-wrapper.properties b/java/gradle/bindings/gradle-wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..c7f216f6 --- /dev/null +++ b/java/gradle/bindings/gradle-wrapper/gradle-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=60000 \ No newline at end of file diff --git a/java/gradle/bindings/gradle-wrapper/type b/java/gradle/bindings/gradle-wrapper/type new file mode 100644 index 00000000..f9033942 --- /dev/null +++ b/java/gradle/bindings/gradle-wrapper/type @@ -0,0 +1 @@ +gradle-wrapper \ No newline at end of file diff --git a/java/gradle/build.gradle b/java/gradle/build.gradle index 88413502..99a2b0d6 100644 --- a/java/gradle/build.gradle +++ b/java/gradle/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.1.3' - id 'io.spring.dependency-management' version '1.1.3' + id 'org.springframework.boot' version '3.1.5' + id 'io.spring.dependency-management' version '1.1.4' } group = 'io.paketo' diff --git a/java/gradle/gradle/wrapper/gradle-wrapper.properties b/java/gradle/gradle/wrapper/gradle-wrapper.properties index 4e86b927..91dc3417 100644 --- a/java/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/java/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ 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-7.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/java/gradle/smoke_test/gradle_test.go b/java/gradle/smoke_test/gradle_test.go index 34e21f3a..e81ca718 100644 --- a/java/gradle/smoke_test/gradle_test.go +++ b/java/gradle/smoke_test/gradle_test.go @@ -101,6 +101,10 @@ func testGradleWithBuilder(builder string) func(*testing.T, spec.G, spec.S) { }). 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) diff --git a/java/java-node/maven-yarn/yarn.lock b/java/java-node/maven-yarn/yarn.lock index 2f93a681..e753017c 100644 --- a/java/java-node/maven-yarn/yarn.lock +++ b/java/java-node/maven-yarn/yarn.lock @@ -185,9 +185,9 @@ picocolors@^1.0.0: integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== postcss@^8.4.21: - version "8.4.22" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.22.tgz#c29e6776b60ab3af602d4b513d5bd2ff9aa85dc1" - integrity sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA== + version "8.4.31" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d" + integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ== dependencies: nanoid "^3.3.6" picocolors "^1.0.0" diff --git a/java/maven/pom.xml b/java/maven/pom.xml index 05ace2ad..bd7c6ea4 100644 --- a/java/maven/pom.xml +++ b/java/maven/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.1.5 io.paketo diff --git a/java/war/pom.xml b/java/war/pom.xml index 3022f1b4..e1736235 100644 --- a/java/war/pom.xml +++ b/java/war/pom.xml @@ -4,7 +4,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.15 + 2.7.17 io.paketo diff --git a/nodejs/react-yarn/yarn.lock b/nodejs/react-yarn/yarn.lock index 30a5e40a..a1f2ea11 100644 --- a/nodejs/react-yarn/yarn.lock +++ b/nodejs/react-yarn/yarn.lock @@ -8424,9 +8424,9 @@ which@^2.0.1: isexe "^2.0.0" word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + version "1.2.5" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34" + integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA== workbox-background-sync@6.5.3: version "6.5.3"