diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index d7af452001..81cf73dfdc 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-storage.git", - "sha": "e8d52ad934d485d5f035fbdc6c8117f256fed566" + "sha": "6745c9e5a9d3a907873b989ca8f8a47edd833523" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "484b7ec7bdef3909589a83e3d763e7588cb8c37c" + "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" } } ] diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml new file mode 100644 index 0000000000..d4ca94189e --- /dev/null +++ b/.github/release-trigger.yml @@ -0,0 +1 @@ +enabled: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 65ae6ecdda..e23d923e1e 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 cf95ee7c84..a2c32213b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [2.1.1](https://www.github.com/googleapis/java-storage/compare/v2.1.0...v2.1.1) (2021-09-03) + + +### Documentation + +* Modify OLM notice to recommend upgrading to latest version. ([#932](https://www.github.com/googleapis/java-storage/issues/932)) ([be72433](https://www.github.com/googleapis/java-storage/commit/be72433ef5446db880e44f103a7d120f444f183f)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-conformance-tests to v0.2.0 ([#982](https://www.github.com/googleapis/java-storage/issues/982)) ([c7460a3](https://www.github.com/googleapis/java-storage/commit/c7460a3ffef81ef2f651b582a97139c0523d1eab)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#989](https://www.github.com/googleapis/java-storage/issues/989)) ([6745c9e](https://www.github.com/googleapis/java-storage/commit/6745c9e5a9d3a907873b989ca8f8a47edd833523)) +* update kms.version to v0.91.3 ([#991](https://www.github.com/googleapis/java-storage/issues/991)) ([1f15022](https://www.github.com/googleapis/java-storage/commit/1f15022a590bce4f80dcb86d150b8e3dbe43aec9)) + ## [2.1.0](https://www.github.com/googleapis/java-storage/compare/v2.0.2...v2.1.0) (2021-08-24) diff --git a/README.md b/README.md index b8b681afe4..6e1fb66385 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-storage - 2.0.2 + 2.1.0 ``` @@ -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-storage' +implementation 'com.google.cloud:google-cloud-storage' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-storage:2.0.2' +implementation 'com.google.cloud:google-cloud-storage:2.1.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.0.2" +libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.1.0" ``` ## Authentication diff --git a/gapic-google-cloud-storage-v2/pom.xml b/gapic-google-cloud-storage-v2/pom.xml index e1d04272b4..b8cd9eaa10 100644 --- a/gapic-google-cloud-storage-v2/pom.xml +++ b/gapic-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc gapic-google-cloud-storage-v2 - 2.1.0-alpha + 2.1.1-alpha gapic-google-cloud-storage-v2 GRPC library for gapic-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.0 + 2.1.1 diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java index 7a10ecf5e4..85c8639848 100644 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java +++ b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java @@ -157,7 +157,9 @@ public static List getDefaultServiceScopes() { /** Returns a builder for the default credentials for this service. */ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { - return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES); + return GoogleCredentialsProvider.newBuilder() + .setScopesToApply(DEFAULT_SERVICE_SCOPES) + .setUseJwtAccessWithScope(true); } /** Returns a builder for the default ChannelProvider for this service. */ diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml index 92110287ab..cef5dd3020 100644 --- a/google-cloud-storage/pom.xml +++ b/google-cloud-storage/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-storage - 2.1.0 + 2.1.1 jar Google Cloud Storage https://github.com/googleapis/java-storage @@ -12,11 +12,11 @@ com.google.cloud google-cloud-storage-parent - 2.1.0 + 2.1.1 google-cloud-storage - 0.91.2 + 0.91.3 diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java index a549487250..2bc3df3906 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BucketInfo.java @@ -414,8 +414,8 @@ public Logging build() { * *

Versions 1.50.0-1.111.2 of this library don’t support the CustomTimeBefore, * DaysSinceCustomTime, DaysSinceNoncurrentTime and NoncurrentTimeBefore lifecycle conditions. To - * read GCS objects with those lifecycle conditions, update your Java client library to version - * 1.112.0 or higher. + * read GCS objects with those lifecycle conditions, update your Java client library to the latest + * version. * * @see Object Lifecycle * Management diff --git a/grpc-google-cloud-storage-v2/pom.xml b/grpc-google-cloud-storage-v2/pom.xml index 155b129356..9b8ac5848f 100644 --- a/grpc-google-cloud-storage-v2/pom.xml +++ b/grpc-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-storage-v2 - 2.1.0-alpha + 2.1.1-alpha grpc-google-cloud-storage-v2 GRPC library for grpc-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.0 + 2.1.1 diff --git a/pom.xml b/pom.xml index 923f26796c..ce919c4501 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-storage-parent pom - 2.1.0 + 2.1.1 Storage Parent https://github.com/googleapis/java-storage @@ -54,7 +54,7 @@ UTF-8 github google-cloud-storage-parent - 2.1.0 + 2.2.0 @@ -93,23 +93,29 @@ com.google.api.grpc proto-google-cloud-storage-v2 - 2.1.0-alpha + 2.1.1-alpha com.google.api.grpc grpc-google-cloud-storage-v2 - 2.1.0-alpha + 2.1.1-alpha com.google.api.grpc gapic-google-cloud-storage-v2 - 2.1.0-alpha + 2.1.1-alpha com.google.cloud google-cloud-conformance-tests - 0.1.1 + 0.2.0 test + + + org.checkerframework + checker-qual + + org.apache.httpcomponents diff --git a/proto-google-cloud-storage-v2/pom.xml b/proto-google-cloud-storage-v2/pom.xml index 4a369883ed..bc1f21b2c1 100644 --- a/proto-google-cloud-storage-v2/pom.xml +++ b/proto-google-cloud-storage-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-storage-v2 - 2.1.0-alpha + 2.1.1-alpha proto-google-cloud-storage-v2 PROTO library for proto-google-cloud-storage-v2 com.google.cloud google-cloud-storage-parent - 2.1.0 + 2.1.1 diff --git a/renovate.json b/renovate.json index 4b49dc47a5..2c84ceb069 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 7c067d0017..5570bf3976 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-storage - 2.0.2 + 2.1.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 378d59cfae..be0ed8772e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-storage - 2.0.2 + 2.1.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 386f58f898..9772dd57f7 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/synth.metadata b/synth.metadata index 5366ca88bf..76a598957e 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,21 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-storage.git", - "sha": "0bfdc2a1c764ddd3d712716823c3d211cad18246" + "sha": "bfd6077464054f5aaf0ad1b1b2ed138ad053424c" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "eb7c9d1c3915851dd8b357ee950e0467490bce34" + "sha": "e1738ee972b49fd0c4d4718b035444495142b781", + "internalRef": "391407209" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" + "sha": "ad7fd76e17bf9494a3e47ff9cf445f61564432e0" } } ], @@ -43,6 +44,7 @@ ".github/generated-files-bot.yml", ".github/readme/synth.py", ".github/release-please.yml", + ".github/release-trigger.yml", ".github/snippet-bot.yml", ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", diff --git a/versions.txt b/versions.txt index bf70375bcc..68f62a96f5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,7 +1,7 @@ # Format: # module:released-version:current-version -google-cloud-storage:2.1.0:2.1.0 -gapic-google-cloud-storage-v2:2.1.0-alpha:2.1.0-alpha -grpc-google-cloud-storage-v2:2.1.0-alpha:2.1.0-alpha -proto-google-cloud-storage-v2:2.1.0-alpha:2.1.0-alpha +google-cloud-storage:2.1.1:2.1.1 +gapic-google-cloud-storage-v2:2.1.1-alpha:2.1.1-alpha +grpc-google-cloud-storage-v2:2.1.1-alpha:2.1.1-alpha +proto-google-cloud-storage-v2:2.1.1-alpha:2.1.1-alpha