diff --git a/.github/release-please.yml b/.github/release-please.yml index 2f7e4043..b13f3c0c 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,6 +1,8 @@ releaseType: java-bom +handleGHRelease: true bumpMinorPreMajor: true branches: - releaseType: java-yoshi + handleGHRelease: true bumpMinorPreMajor: true branch: java7 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecd..d510359d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,19 +42,6 @@ jobs: java-version: ${{matrix.java}} - run: java -version - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate any conflicts with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index 40817e11..3ff62e52 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -19,6 +19,9 @@ jobs: - java-pubsub steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: ${{matrix.java}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fee7bb4..2f5068d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [2.2.1](https://www.github.com/googleapis/java-shared-dependencies/compare/2.2.0...v2.2.1) (2021-09-13) + + +### Dependencies + +* update gax.version to v2.4.1 ([#464](https://www.github.com/googleapis/java-shared-dependencies/issues/464)) ([bc7c6d7](https://www.github.com/googleapis/java-shared-dependencies/commit/bc7c6d7ca161ebfa31895c375d65bca29d4c7336)) +* update google.core.version to v2.1.3 ([#465](https://www.github.com/googleapis/java-shared-dependencies/issues/465)) ([848f608](https://www.github.com/googleapis/java-shared-dependencies/commit/848f608ae850bd2dd80ec56034eb0c9a18f0415b)) + ## [2.2.0](https://www.github.com/googleapis/java-shared-dependencies/compare/2.1.0...v2.2.0) (2021-08-31) diff --git a/README.md b/README.md index 2dccb0b7..da8de9ad 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.2.0 + 2.2.1 pom import diff --git a/first-party-dependencies/pom.xml b/first-party-dependencies/pom.xml index ecc92b4d..700676c2 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.2.0 + 2.2.1 Google Cloud First-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies @@ -56,13 +56,13 @@ UTF-8 ${project.artifactId} 1.40.1 - 2.4.0 + 2.4.1 1.1.0 30.1.1-jre 3.17.3 2.0.2 2.5.0 - 2.1.2 + 2.1.3 1.1.0 1.40.0 1.32.1 diff --git a/pom.xml b/pom.xml index 4904246e..e81f3e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shared-dependencies pom - 2.2.0 + 2.2.1 first-party-dependencies third-party-dependencies @@ -65,14 +65,14 @@ com.google.cloud first-party-dependencies - 2.2.0 + 2.2.1 pom import com.google.cloud third-party-dependencies - 2.2.0 + 2.2.1 pom import diff --git a/synth.metadata b/synth.metadata index a041e293..fac550a6 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-shared-dependencies.git", - "sha": "b28723ace0c27ebc73f23a2d094e0fe9ba8a9075" + "sha": "9998ae51ee4643c0834a3b7649912f65160d18d6" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "63cff634aabb85854caa511c5837ea6b45f42b4b" + "sha": "e2aa5bcc3356d9e3b8b53de3b5c86226447d3a22" } } ], diff --git a/third-party-dependencies/pom.xml b/third-party-dependencies/pom.xml index c58d58dc..aa5e94b2 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.2.0 + 2.2.1 Google Cloud Third-party Shared Dependencies https://github.com/googleapis/java-shared-dependencies diff --git a/versions.txt b/versions.txt index af744a4b..32ee2d1b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-dependencies:2.2.0:2.2.0 \ No newline at end of file +google-cloud-shared-dependencies:2.2.1:2.2.1 \ No newline at end of file