diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a335feb7..731a0eb4 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:4e961d006ec9e44501273788f3cbe1e060c4666742ba190f60d6a05bcdf3ac8f + digest: sha256:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 2d2cdbce..957e3c84 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -22,6 +22,7 @@ branchProtectionRules: - dependencies (11, java-storage) - dependencies (11, java-pubsub) - cla/google + - OwlBot Post Processor - pattern: java7 isAdminEnforced: true requiredApprovingReviewCount: 1 @@ -67,6 +68,7 @@ branchProtectionRules: - dependencies (11, java-storage) - dependencies (11, java-pubsub) - cla/google + - OwlBot Post Processor - pattern: 0.20.x isAdminEnforced: true requiredApprovingReviewCount: 1 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 134256ee..4ae1bcd4 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,15 +47,15 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true -Denforcer.skip=true + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp RETURN_CODE=$? ;; integration) @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) @@ -104,7 +104,7 @@ samples) fi ;; clirr) - mvn -B -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de57de1..71b139f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # Changelog +## [2.6.0](https://www.github.com/googleapis/java-shared-dependencies/compare/2.5.1...v2.6.0) (2022-01-07) + + +### Bug Fixes + +* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-shared-dependencies/issues/1299)) ([#546](https://www.github.com/googleapis/java-shared-dependencies/issues/546)) ([d8bb8d9](https://www.github.com/googleapis/java-shared-dependencies/commit/d8bb8d9d8e3b8c582f768cd3164e8580ec334511)) +* **java:** run Maven in plain console-friendly mode ([#1301](https://www.github.com/googleapis/java-shared-dependencies/issues/1301)) ([#557](https://www.github.com/googleapis/java-shared-dependencies/issues/557)) ([6b57d08](https://www.github.com/googleapis/java-shared-dependencies/commit/6b57d08816ec6c1dfb637cae022624e896930ad8)) + + +### Dependencies + +* gRPC upgrade to 1.43.2 ([#567](https://www.github.com/googleapis/java-shared-dependencies/issues/567)) ([c946655](https://www.github.com/googleapis/java-shared-dependencies/commit/c94665571f26d24fbbb3f89ef5a3db99663bfdba)) +* update dependency com.google.api-client:google-api-client-bom to v1.33.0 ([#563](https://www.github.com/googleapis/java-shared-dependencies/issues/563)) ([0aedddb](https://www.github.com/googleapis/java-shared-dependencies/commit/0aedddb9a535753767d56f5910f355c7a1c8509c)) +* update dependency com.google.api:api-common to v2.1.2 ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f)) +* update dependency com.google.http-client:google-http-client-bom to v1.41.0 ([#562](https://www.github.com/googleapis/java-shared-dependencies/issues/562)) ([6da0735](https://www.github.com/googleapis/java-shared-dependencies/commit/6da0735d4db9df998d11c549488a024b800bed65)) +* update dependency io.grpc:grpc-bom to v1.43.1 ([#553](https://www.github.com/googleapis/java-shared-dependencies/issues/553)) ([b787c8f](https://www.github.com/googleapis/java-shared-dependencies/commit/b787c8f2032b7ffc9797158c3ff214b7813f34b7)) +* update dependency org.apache.httpcomponents:httpcore to v4.4.15 ([#550](https://www.github.com/googleapis/java-shared-dependencies/issues/550)) ([e2d3dba](https://www.github.com/googleapis/java-shared-dependencies/commit/e2d3dbad6dd54c117abb5ab1b6137cfee4e5a32b)) +* update dependency org.checkerframework:checker-qual to v3.20.0 ([#549](https://www.github.com/googleapis/java-shared-dependencies/issues/549)) ([586df59](https://www.github.com/googleapis/java-shared-dependencies/commit/586df5949d4ddca11d0705d696882c32d8436c31)) +* update gax.version to v2.8.0 ([#564](https://www.github.com/googleapis/java-shared-dependencies/issues/564)) ([9ad5d4f](https://www.github.com/googleapis/java-shared-dependencies/commit/9ad5d4f5385753a0c5739ef400f5d346e3342b84)) +* update gax.version to v2.8.1 ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f)) +* update google.common-protos.version to v2.7.1 ([#561](https://www.github.com/googleapis/java-shared-dependencies/issues/561)) ([9aa860d](https://www.github.com/googleapis/java-shared-dependencies/commit/9aa860d92f745f1d4382eb16439bf17ac6ca8ae9)) +* update google.core.version to v2.3.5 ([#565](https://www.github.com/googleapis/java-shared-dependencies/issues/565)) ([2f154a3](https://www.github.com/googleapis/java-shared-dependencies/commit/2f154a3ff759211438c72859e98b314c7ff8405f)) +* update iam.version to v1.2.0 ([#547](https://www.github.com/googleapis/java-shared-dependencies/issues/547)) ([3232c82](https://www.github.com/googleapis/java-shared-dependencies/commit/3232c828b628cb604a200b3e569e56e758e5e11d)) +* upgrading protobuf to 3.19.2 ([#560](https://www.github.com/googleapis/java-shared-dependencies/issues/560)) ([7ef3325](https://www.github.com/googleapis/java-shared-dependencies/commit/7ef33250f5473348d3546210b7a534360f476101)) + ### [2.5.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.5.0...v2.5.1) (2021-12-03) diff --git a/README.md b/README.md index 0e61bb15..07b51a8b 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ If you are using Maven, add this to the `dependencyManagement` section. com.google.cloud google-cloud-shared-dependencies - 2.5.1 + 2.6.0 pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index 9bcd1879..80466834 100644 --- a/first-party-dependencies/pom.xml +++ b/first-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud first-party-dependencies pom - 2.5.1 + 2.6.0 Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 @@ -55,19 +55,19 @@ UTF-8 ${project.artifactId} - 1.42.1 - 2.7.1 + 1.43.2 + 2.8.1 1.1.0 31.0.1-jre - 3.19.1 - 2.1.1 - 2.7.0 - 2.3.3 + 3.19.2 + 2.1.2 + 2.7.1 + 2.3.5 1.3.0 - 1.40.1 + 1.41.0 1.32.1 - 1.32.2 - 1.1.7 + 1.33.0 + 1.2.0 diff --git a/pom.xml b/pom.xml index 531ff51b..45f63dbd 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.5.1 + 2.6.0 first-party-dependencies third-party-dependencies @@ -18,7 +18,7 @@ com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.5.1 + 2.6.0 pom import com.google.cloud third-party-dependencies - 2.5.1 + 2.6.0 pom import diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index bfa99499..209bfda7 100644 --- a/third-party-dependencies/pom.xml +++ b/third-party-dependencies/pom.xml @@ -6,7 +6,7 @@ com.google.cloud third-party-dependencies pom - 2.5.1 + 2.6.0 Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -16,7 +16,7 @@ com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 @@ -66,10 +66,10 @@ 2.10.0 2.13.0 1.15 - 4.4.14 + 4.4.15 4.5.13 - 3.19.0 + 3.20.0 diff --git a/upper-bound-check/pom.xml b/upper-bound-check/pom.xml index f6eb64a8..6ce0a595 100644 --- a/upper-bound-check/pom.xml +++ b/upper-bound-check/pom.xml @@ -4,7 +4,7 @@ com.google.cloud shared-dependencies-upper-bound-test pom - 2.5.1 + 2.6.0 Upper bound test for Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -17,7 +17,7 @@ com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 @@ -53,7 +53,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.1 + 2.6.0 pom import diff --git a/versions.txt b/versions.txt index cac1392b..668d84aa 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.5.1:2.5.1 \ No newline at end of file +google-cloud-shared-dependencies:2.6.0:2.6.0 \ No newline at end of file