diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 6669b043..7e6b2637 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-containeranalysis.git", - "sha": "71209b3deb889a1cb6e3af81415091485a72f848" + "sha": "b0a2a5055181848842eed8b2475a036ae16461f4" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "484b7ec7bdef3909589a83e3d763e7588cb8c37c" + "sha": "e770c12f2a9a5f84566fe04b16a4ceec1c8c109b" } } ] 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 7dd5c376..efe88147 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) @@ -25,7 +24,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..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/CHANGELOG.md b/CHANGELOG.md index ee13461c..47beb86f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.3](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.2...v2.1.3) (2021-08-31) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.2.0 ([#683](https://www.github.com/googleapis/java-containeranalysis/issues/683)) ([76dddc8](https://www.github.com/googleapis/java-containeranalysis/commit/76dddc86c0024ee9854ad65e62ca5364b025ba6a)) + ### [2.1.2](https://www.github.com/googleapis/java-containeranalysis/compare/v2.1.1...v2.1.2) (2021-08-24) diff --git a/README.md b/README.md index 5806e049..154469aa 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-containeranalysis - 2.1.0 + 2.1.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-containeranalysis' +implementation 'com.google.cloud:google-cloud-containeranalysis' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-containeranalysis:2.1.0' +implementation 'com.google.cloud:google-cloud-containeranalysis:2.1.2' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "2.1.0" +libraryDependencies += "com.google.cloud" % "google-cloud-containeranalysis" % "2.1.2" ``` ## Authentication diff --git a/google-cloud-containeranalysis-bom/pom.xml b/google-cloud-containeranalysis-bom/pom.xml index 73825c9d..c7fb0507 100644 --- a/google-cloud-containeranalysis-bom/pom.xml +++ b/google-cloud-containeranalysis-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis-bom - 2.1.2 + 2.1.3 pom com.google.cloud @@ -53,27 +53,27 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.2 + 2.1.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.2 + 0.91.3 com.google.cloud google-cloud-containeranalysis - 2.1.2 + 2.1.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.2 + 2.1.3 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.2 + 0.91.3 diff --git a/google-cloud-containeranalysis/pom.xml b/google-cloud-containeranalysis/pom.xml index 226826df..05455879 100644 --- a/google-cloud-containeranalysis/pom.xml +++ b/google-cloud-containeranalysis/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-containeranalysis - 2.1.2 + 2.1.3 jar Google Cloud Container Analysis https://github.com/googleapis/java-containeranalysis @@ -11,7 +11,7 @@ com.google.cloud google-cloud-containeranalysis-parent - 2.1.2 + 2.1.3 google-cloud-containeranalysis diff --git a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java index 7b04cf5d..06e39ac0 100644 --- a/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java +++ b/google-cloud-containeranalysis/src/main/java/com/google/cloud/devtools/containeranalysis/v1/stub/ContainerAnalysisStubSettings.java @@ -152,7 +152,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/grpc-google-cloud-containeranalysis-v1/pom.xml b/grpc-google-cloud-containeranalysis-v1/pom.xml index a84e0f7d..01c716a9 100644 --- a/grpc-google-cloud-containeranalysis-v1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.2 + 2.1.3 grpc-google-cloud-containeranalysis-v1 GRPC library for grpc-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.2 + 2.1.3 diff --git a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml index a9f72f0e..12dfdbbb 100644 --- a/grpc-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/grpc-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.2 + 0.91.3 grpc-google-cloud-containeranalysis-v1beta1 GRPC library for grpc-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.2 + 2.1.3 diff --git a/pom.xml b/pom.xml index 47dff3ba..9481a51f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-containeranalysis-parent pom - 2.1.2 + 2.1.3 Google Cloud Container Analysis Parent https://github.com/googleapis/java-containeranalysis @@ -61,33 +61,33 @@ com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.2 + 2.1.3 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1beta1 - 0.91.2 + 0.91.3 com.google.api.grpc grpc-google-cloud-containeranalysis-v1 - 2.1.2 + 2.1.3 com.google.cloud google-cloud-containeranalysis - 2.1.2 + 2.1.3 com.google.cloud google-cloud-shared-dependencies - 2.1.0 + 2.2.0 pom import diff --git a/proto-google-cloud-containeranalysis-v1/pom.xml b/proto-google-cloud-containeranalysis-v1/pom.xml index b9cc5b65..1374f81c 100644 --- a/proto-google-cloud-containeranalysis-v1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1 - 2.1.2 + 2.1.3 proto-google-cloud-containeranalysis-v1 PROTO library for proto-google-cloud-containeranalysis-v1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.2 + 2.1.3 diff --git a/proto-google-cloud-containeranalysis-v1beta1/pom.xml b/proto-google-cloud-containeranalysis-v1beta1/pom.xml index 2a6ac645..6b1ab153 100644 --- a/proto-google-cloud-containeranalysis-v1beta1/pom.xml +++ b/proto-google-cloud-containeranalysis-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-containeranalysis-v1beta1 - 0.91.2 + 0.91.3 proto-google-cloud-containeranalysis-v1beta1 PROTO library for proto-google-cloud-containeranalysis-v1beta1 com.google.cloud google-cloud-containeranalysis-parent - 2.1.2 + 2.1.3 diff --git a/renovate.json b/renovate.json index 31639ff4..db4884ee 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 5caaa6e4..15980f8a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-containeranalysis - 2.1.1 + 2.1.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 2ad2e5b9..127df918 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-containeranalysis - 2.1.1 + 2.1.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index c0c7f9f4..cd8cf5fd 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 25194929..fb8c5cab 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-containeranalysis.git", - "sha": "cd874a778e3f41fb32670cef4409c34f32c03bd7" + "sha": "c15a998d1e1f7082f894648b3d3cd2f9c3743efd" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a739464cacb3aa6d375683aefe16b79c21da1bb0", - "internalRef": "389657692" + "sha": "e1738ee972b49fd0c4d4718b035444495142b781", + "internalRef": "391407209" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "ff01716e16d2c6e87eaf87197b753ac9fcbbed5d" + "sha": "9a238a0623879c3de129a376c6085d4a862f6eb9" } } ], @@ -44,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 df8df3e7..ab89ed74 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-containeranalysis-v1:2.1.2:2.1.2 -proto-google-cloud-containeranalysis-v1beta1:0.91.2:0.91.2 -grpc-google-cloud-containeranalysis-v1beta1:0.91.2:0.91.2 -grpc-google-cloud-containeranalysis-v1:2.1.2:2.1.2 -google-cloud-containeranalysis:2.1.2:2.1.2 +proto-google-cloud-containeranalysis-v1:2.1.3:2.1.3 +proto-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.3 +grpc-google-cloud-containeranalysis-v1beta1:0.91.3:0.91.3 +grpc-google-cloud-containeranalysis-v1:2.1.3:2.1.3 +google-cloud-containeranalysis:2.1.3:2.1.3