diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 1830d09a..91c0ea20 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:8e27e5a7297b40eca3ab46ae67f10c575813a85c673839030aa161d0818f3a24 + digest: sha256:4837f2a7fdff2985b4f7432f8a6d6a87beacebf3ac071746532c0ce2e3f24b9b diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 00000000..d4ca9418 --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index ffd39f6f..32e0ea5a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -10,7 +10,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (8) @@ -26,7 +25,6 @@ branchProtectionRules: requiredStatusCheckContexts: - dependencies (8) - dependencies (11) - - linkage-monitor - lint - clirr - units (7) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecd..e23d923e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,9 @@ jobs: java: [8, 11] 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}} @@ -37,28 +40,21 @@ jobs: java: [8, 11] 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}} - 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: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 @@ -70,10 +66,13 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - uses: stCarolas/setup-maven@v4 + with: + maven-version: 3.8.1 - uses: actions/setup-java@v1 with: java-version: 8 - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr + JOB_TYPE: clirr \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 468b377f..364bb516 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [2.1.0](https://www.github.com/googleapis/java-container/compare/v2.0.2...v2.1.0) (2021-09-03) + + +### Features + +* Remove use of deprecated gradle command in java README ([#1196](https://www.github.com/googleapis/java-container/issues/1196)) ([#556](https://www.github.com/googleapis/java-container/issues/556)) ([d6d6905](https://www.github.com/googleapis/java-container/commit/d6d6905d6b19b79586a1a23c88b2759bcf77d93c)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#558](https://www.github.com/googleapis/java-container/issues/558)) ([674b516](https://www.github.com/googleapis/java-container/commit/674b51685f9ecb2c26634926319c19c052f130cd)) + ### [2.0.2](https://www.github.com/googleapis/java-container/compare/v2.0.1...v2.0.2) (2021-08-23) diff --git a/README.md b/README.md index 69aa69d7..9eed7ea5 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 21.0.0 + 22.0.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-container - 1.5.0 + 2.0.2 ``` @@ -49,20 +49,20 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:21.0.0') +implementation platform('com.google.cloud:libraries-bom:22.0.0') -compile 'com.google.cloud:google-cloud-container' +implementation 'com.google.cloud:google-cloud-container' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-container:2.0.1' +implementation 'com.google.cloud:google-cloud-container:2.0.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.0.1" +libraryDependencies += "com.google.cloud" % "google-cloud-container" % "2.0.2" ``` ## Authentication diff --git a/google-cloud-container-bom/pom.xml b/google-cloud-container-bom/pom.xml index 7b4820e2..0ed1ab4b 100644 --- a/google-cloud-container-bom/pom.xml +++ b/google-cloud-container-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container-bom - 2.0.2 + 2.1.0 pom com.google.cloud @@ -52,27 +52,27 @@ com.google.cloud google-cloud-container - 2.0.2 + 2.1.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.0.2 + 2.1.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.0.2 + 2.1.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.0.2 + 2.1.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.0.2 + 2.1.0 diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml index 8662456a..cc724b5c 100644 --- a/google-cloud-container/pom.xml +++ b/google-cloud-container/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-container - 2.0.2 + 2.1.0 jar Google Cloud Container https://github.com/googleapis/java-container @@ -11,7 +11,7 @@ com.google.cloud google-cloud-container-parent - 2.0.2 + 2.1.0 google-cloud-container diff --git a/grpc-google-cloud-container-v1/pom.xml b/grpc-google-cloud-container-v1/pom.xml index 8e68c8d0..7b98abeb 100644 --- a/grpc-google-cloud-container-v1/pom.xml +++ b/grpc-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.0.2 + 2.1.0 grpc-google-cloud-container-v1 GRPC library for grpc-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.0.2 + 2.1.0 diff --git a/grpc-google-cloud-container-v1beta1/pom.xml b/grpc-google-cloud-container-v1beta1/pom.xml index 51e52fd7..f45a5ee5 100644 --- a/grpc-google-cloud-container-v1beta1/pom.xml +++ b/grpc-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.0.2 + 2.1.0 grpc-google-cloud-container-v1beta1 GRPC library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.0.2 + 2.1.0 diff --git a/pom.xml b/pom.xml index b777e21e..d122f43f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-container-parent pom - 2.0.2 + 2.1.0 Google Cloud Container Parent https://github.com/googleapis/java-container @@ -61,33 +61,33 @@ com.google.api.grpc proto-google-cloud-container-v1 - 2.0.2 + 2.1.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.0.2 + 2.1.0 com.google.api.grpc grpc-google-cloud-container-v1beta1 - 2.0.2 + 2.1.0 com.google.api.grpc grpc-google-cloud-container-v1 - 2.0.2 + 2.1.0 com.google.cloud google-cloud-container - 2.0.2 + 2.1.0 com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import diff --git a/proto-google-cloud-container-v1/pom.xml b/proto-google-cloud-container-v1/pom.xml index 38039e31..41212af2 100644 --- a/proto-google-cloud-container-v1/pom.xml +++ b/proto-google-cloud-container-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1 - 2.0.2 + 2.1.0 proto-google-cloud-container-v1 PROTO library for proto-google-cloud-container-v1 com.google.cloud google-cloud-container-parent - 2.0.2 + 2.1.0 diff --git a/proto-google-cloud-container-v1beta1/pom.xml b/proto-google-cloud-container-v1beta1/pom.xml index 6883a988..65663aad 100644 --- a/proto-google-cloud-container-v1beta1/pom.xml +++ b/proto-google-cloud-container-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-container-v1beta1 - 2.0.2 + 2.1.0 proto-google-cloud-container-v1beta1 Proto library for google-cloud-container com.google.cloud google-cloud-container-parent - 2.0.2 + 2.1.0 diff --git a/renovate.json b/renovate.json index 4fb08a94..da4ee87a 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,8 @@ "^junit:junit", "^com.google.truth:truth", "^org.mockito:mockito-core", - "^org.objenesis:objenesis" + "^org.objenesis:objenesis", + "^com.google.cloud:google-cloud-conformance-tests" ], "semanticCommitType": "test", "semanticCommitScope": "deps" diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index e1dc367d..2d0d4fb9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-container - 1.5.0 + 2.0.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6edd8197..178e8ecc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-container - 1.5.0 + 2.0.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 1e236a29..aeae643b 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 21.0.0 + 22.0.0 pom import diff --git a/versions.txt b/versions.txt index 72853e44..2ab4eadb 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-cloud-container:2.0.2:2.0.2 -grpc-google-cloud-container-v1:2.0.2:2.0.2 -grpc-google-cloud-container-v1beta1:2.0.2:2.0.2 -proto-google-cloud-container-v1:2.0.2:2.0.2 -proto-google-cloud-container-v1beta1:2.0.2:2.0.2 +google-cloud-container:2.1.0:2.1.0 +grpc-google-cloud-container-v1:2.1.0:2.1.0 +grpc-google-cloud-container-v1beta1:2.1.0:2.1.0 +proto-google-cloud-container-v1:2.1.0:2.1.0 +proto-google-cloud-container-v1beta1:2.1.0:2.1.0