diff --git a/.github/release-please.yml b/.github/release-please.yml index f40392f1..2f7e4043 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,2 +1,6 @@ releaseType: java-bom -bumpMinorPreMajor: true \ No newline at end of file +bumpMinorPreMajor: true +branches: + - releaseType: java-yoshi + bumpMinorPreMajor: true + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index bac8c383..ad77da24 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,57 +1,58 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "dependencies (8, java-bigquery)" - - "dependencies (8, java-bigqueryconnection)" - - "dependencies (8, java-spanner)" - - "dependencies (8, java-storage)" - - "dependencies (11, java-bigquery)" - - "dependencies (11, java-bigqueryconnection)" - - "dependencies (11, java-spanner)" - - "dependencies (11, java-storage)" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - dependencies (8, java-bigqueryconnection) + - dependencies (8, java-storage) + - dependencies (8, java-pubsub) + - dependencies (11, java-bigqueryconnection) + - dependencies (11, java-storage) + - dependencies (11, java-pubsub) + - cla/google + - pattern: java7 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - dependencies (8, java-bigquery) + - dependencies (8, java-bigqueryconnection) + - dependencies (8, java-spanner) + - dependencies (8, java-storage) + - dependencies (8, java-pubsub) + - dependencies (11, java-bigquery) + - dependencies (11, java-bigqueryconnection) + - dependencies (11, java-spanner) + - dependencies (11, java-storage) + - dependencies (11, java-pubsub) + - cla/google permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index c103f0f3..40817e11 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -16,6 +16,7 @@ jobs: - java-bigqueryconnection - java-spanner - java-storage + - java-pubsub steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ddf93aa..e5019969 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,38 @@ # Changelog +## [2.0.0](https://www.github.com/googleapis/java-shared-dependencies/compare/1.4.0...v2.0.0) (2021-08-03) + + +### ⚠ BREAKING CHANGES + +* promote to 2.0.0 (#428) + +### Features + +* promote to 2.0.0 ([#428](https://www.github.com/googleapis/java-shared-dependencies/issues/428)) ([4db31f2](https://www.github.com/googleapis/java-shared-dependencies/commit/4db31f29f1668d4743e8af8996b0c4b30e6831b3)) + + +### Documentation + +* we don't use this as a parent pom ([#407](https://www.github.com/googleapis/java-shared-dependencies/issues/407)) ([4c86aaf](https://www.github.com/googleapis/java-shared-dependencies/commit/4c86aafc05097b6702056f5cb37736127b6df306)) + + +### Dependencies + +* update dependency com.fasterxml.jackson:jackson-bom to v2.12.4 ([#398](https://www.github.com/googleapis/java-shared-dependencies/issues/398)) ([f0d49b5](https://www.github.com/googleapis/java-shared-dependencies/commit/f0d49b54ba334f9351c66c9924e3d0d2ed7c0016)) +* update dependency com.google.api:api-common to v1.10.6 ([#411](https://www.github.com/googleapis/java-shared-dependencies/issues/411)) ([79801b5](https://www.github.com/googleapis/java-shared-dependencies/commit/79801b5fee08a8c97e275ed3674ab6c83b204a90)) +* update dependency com.google.api:api-common to v2 ([#414](https://www.github.com/googleapis/java-shared-dependencies/issues/414)) ([17f6e68](https://www.github.com/googleapis/java-shared-dependencies/commit/17f6e68a2792843dd41d3877c095e97c052c5ac0)) +* update dependency com.google.auth:google-auth-library-bom to v0.27.0 ([#400](https://www.github.com/googleapis/java-shared-dependencies/issues/400)) ([0d5a95b](https://www.github.com/googleapis/java-shared-dependencies/commit/0d5a95b84076684f84b0fdbb93a706113f44457d)) +* update dependency com.google.auth:google-auth-library-bom to v1 ([#413](https://www.github.com/googleapis/java-shared-dependencies/issues/413)) ([94897d3](https://www.github.com/googleapis/java-shared-dependencies/commit/94897d30bb1cac0059e272b058f6221fb7e4733f)) +* update dependency com.google.cloud:grpc-gcp to v1.1.0 ([#403](https://www.github.com/googleapis/java-shared-dependencies/issues/403)) ([3cc59f1](https://www.github.com/googleapis/java-shared-dependencies/commit/3cc59f15ebb31a7f97c9f3d78057022afabe75e9)) +* update dependency com.google.errorprone:error_prone_annotations to v2.8.0 ([#406](https://www.github.com/googleapis/java-shared-dependencies/issues/406)) ([2905787](https://www.github.com/googleapis/java-shared-dependencies/commit/29057879adeda8bc40a903ef3b5feafc83c3d972)) +* update dependency com.google.errorprone:error_prone_annotations to v2.8.1 ([#426](https://www.github.com/googleapis/java-shared-dependencies/issues/426)) ([853b68b](https://www.github.com/googleapis/java-shared-dependencies/commit/853b68b16c88c3abb745ee1f71ba4bb317cbc680)) +* update gax.version to v1.67.0 ([#405](https://www.github.com/googleapis/java-shared-dependencies/issues/405)) ([632dcd0](https://www.github.com/googleapis/java-shared-dependencies/commit/632dcd0a9f10b034a2a2ec92c7c3413490dd2a03)) +* update gax.version to v2 (major) ([#418](https://www.github.com/googleapis/java-shared-dependencies/issues/418)) ([670a9e0](https://www.github.com/googleapis/java-shared-dependencies/commit/670a9e0a9588a7e592eb5dd8c0cb9ab08e07293e)) +* update google.core.version to v1.96.1 ([#417](https://www.github.com/googleapis/java-shared-dependencies/issues/417)) ([49db9cb](https://www.github.com/googleapis/java-shared-dependencies/commit/49db9cb473c8d3d794ad57a41cfc223239482174)) +* update google.core.version to v2 (major) ([#427](https://www.github.com/googleapis/java-shared-dependencies/issues/427)) ([8cc7a92](https://www.github.com/googleapis/java-shared-dependencies/commit/8cc7a922cc3ba10a157e3649d7a783bbbcbee010)) +* update guava to 30.1.1-jre ([#423](https://www.github.com/googleapis/java-shared-dependencies/issues/423)) ([94aca59](https://www.github.com/googleapis/java-shared-dependencies/commit/94aca597804d7b45aae22811b277c44281e62d64)) + ## [1.4.0](https://www.github.com/googleapis/java-shared-dependencies/compare/1.3.0...v1.4.0) (2021-06-30) diff --git a/README.md b/README.md index b37dc4cf..ae7cbc89 100644 --- a/README.md +++ b/README.md @@ -7,14 +7,14 @@ Shared Maven dependencies for Google Cloud Java client libraries. ## Quickstart [//]: # ({x-version-update-start:google-cloud-shared-dependencies:released}) -If you are using Maven, use this artifact as your project's parent. +If you are using Maven, add this to the `dependencyManagement` section. ```xml com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import @@ -48,4 +48,4 @@ Apache 2.0 - See [LICENSE][license] for more information. [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-shared-dependencies&core=gav [contributing]: https://github.com/googleapis/java-shared-dependencies/blob/master/CONTRIBUTING.md [code-of-conduct]: https://github.com/googleapis/java-shared-dependencies/blob/master/CODE_OF_CONDUCT.md#contributor-code-of-conduct -[license]: https://github.com/googleapis/java-shared-dependencies/blob/master/LICENSE \ No newline at end of file +[license]: https://github.com/googleapis/java-shared-dependencies/blob/master/LICENSE diff --git a/java.header b/java.header index 3a9b503a..d0970ba7 100644 --- a/java.header +++ b/java.header @@ -1,5 +1,5 @@ ^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$ ^ \*$ ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ ^ \* you may not use this file except in compliance with the License\.$ diff --git a/pom.xml b/pom.xml index 3f58b570..979b0cd2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 1.4.0 + 2.0.0 Google Cloud Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 @@ -36,11 +36,11 @@ sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots + https://google.oss.sonatype.org/content/repositories/snapshots sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -56,14 +56,14 @@ ${project.artifactId} 1.39.0 - 1.66.0 - 1.0.0 - 30.1.1-android + 2.0.0 + 1.1.0 + 30.1.1-jre 3.17.3 - 1.10.4 + 2.0.0 2.3.2 - 1.95.4 - 0.26.0 + 2.0.2 + 1.0.0 1.39.2 1.31.5 1.32.1 @@ -74,8 +74,8 @@ 1.0.14 0.28.0 3.0.2 - 2.7.1 - 2.12.3 + 2.8.1 + 2.12.4 1.15 4.4.14 4.5.13 diff --git a/synth.metadata b/synth.metadata index 3f2c6397..6530484e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-dependencies.git", - "sha": "7b87c9aff5604dd894296a641fb34a3e8a73395c" + "sha": "f0d49b54ba334f9351c66c9924e3d0d2ed7c0016" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "87254ac89a9559864c0a245d6b150406439ce3d8" + "sha": "09c59c20a4bf0daed1665af59035ff240fe356df" } } ], diff --git a/versions.txt b/versions.txt index bb4beeb8..f75561af 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:1.4.0:1.4.0 \ No newline at end of file +google-cloud-shared-dependencies:2.0.0:2.0.0 \ No newline at end of file