From 39d66c3aeec4db8caf2ad0dec7ff4c94074c0205 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2020 11:12:10 -0800 Subject: [PATCH 1/7] chore: release 1.92.2-SNAPSHOT (#115) * updated versions.txt [ci skip] * updated google-cloud-core-bom/pom.xml [ci skip] * updated google-cloud-core-grpc/pom.xml [ci skip] * updated google-cloud-core-http/pom.xml [ci skip] * updated google-cloud-core/pom.xml [ci skip] * updated pom.xml [ci skip] --- google-cloud-core-bom/pom.xml | 8 ++++---- google-cloud-core-grpc/pom.xml | 4 ++-- google-cloud-core-http/pom.xml | 4 ++-- google-cloud-core/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml index 72980232b7..1f56f67f23 100644 --- a/google-cloud-core-bom/pom.xml +++ b/google-cloud-core-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 1.92.1 + 1.92.2-SNAPSHOT pom com.google.cloud @@ -63,17 +63,17 @@ com.google.cloud google-cloud-core - 1.92.1 + 1.92.2-SNAPSHOT com.google.cloud google-cloud-core-grpc - 1.92.1 + 1.92.2-SNAPSHOT com.google.cloud google-cloud-core-http - 1.92.1 + 1.92.2-SNAPSHOT diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index 35cd98d78e..00c8e3b137 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 1.92.1 + 1.92.2-SNAPSHOT jar Google Cloud Core gRPC https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 1.92.1 + 1.92.2-SNAPSHOT google-cloud-core-grpc diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index e0e5478d63..5200ffc64a 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 1.92.1 + 1.92.2-SNAPSHOT jar Google Cloud Core HTTP https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 1.92.1 + 1.92.2-SNAPSHOT google-cloud-core-http diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index e25f8b1a2b..52b3b477d9 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 1.92.1 + 1.92.2-SNAPSHOT jar Google Cloud Core https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 1.92.1 + 1.92.2-SNAPSHOT google-cloud-core diff --git a/pom.xml b/pom.xml index ae180464d7..f00c3b557e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 1.92.1 + 1.92.2-SNAPSHOT Google Cloud Core Parent https://github.com/googleapis/java-core diff --git a/versions.txt b/versions.txt index df5dafcbed..7e4d13af64 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-core:1.92.1:1.92.1 \ No newline at end of file +google-cloud-core:1.92.1:1.92.2-SNAPSHOT \ No newline at end of file From 0f333604b66f9d9e8dadbc9ef257b7648cbf6e79 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 3 Jan 2020 21:42:27 +0200 Subject: [PATCH 2/7] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v0.3.1 (#116) --- google-cloud-core-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml index 1f56f67f23..d2299ea390 100644 --- a/google-cloud-core-bom/pom.xml +++ b/google-cloud-core-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 0.3.0 + 0.3.1 Google Cloud Core diff --git a/pom.xml b/pom.xml index f00c3b557e..8096e7c562 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.3.0 + 0.3.1 From c6781cca509632e9453d3ab57b7e97939473e88d Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 7 Jan 2020 08:46:40 -0800 Subject: [PATCH 3/7] chore: update common templates (#117) --- .kokoro/build.sh | 15 +- .kokoro/continuous/samples.cfg | 31 +++ .kokoro/nightly/samples.cfg | 31 +++ .kokoro/presubmit/samples.cfg | 31 +++ CONTRIBUTING.md | 104 +++++++++- synth.metadata | 342 +++++++++++++++++++-------------- 6 files changed, 405 insertions(+), 149 deletions(-) create mode 100644 .kokoro/continuous/samples.cfg create mode 100644 .kokoro/nightly/samples.cfg create mode 100644 .kokoro/presubmit/samples.cfg diff --git a/.kokoro/build.sh b/.kokoro/build.sh index dc2936ef76..f1ae58408d 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -44,13 +44,26 @@ test) bash .kokoro/coerce_logs.sh ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn \ + -Penable-samples \ + com.coveo:fmt-maven-plugin:check ;; javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -Penable-integration-tests \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify + bash .kokoro/coerce_logs.sh + ;; +samples) + mvn -B \ + -Penable-samples \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg new file mode 100644 index 0000000000..fa7b493d0b --- /dev/null +++ b/.kokoro/continuous/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg new file mode 100644 index 0000000000..9a9102490d --- /dev/null +++ b/.kokoro/nightly/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg new file mode 100644 index 0000000000..fa7b493d0b --- /dev/null +++ b/.kokoro/presubmit/samples.cfg @@ -0,0 +1,31 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Configure the docker image for kokoro-trampoline. +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" +} + +env_vars: { + key: "JOB_TYPE" + value: "samples" +} + +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "java_it_service_account" + } + } +} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ebbb59e531..085021ddec 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -25,4 +25,106 @@ information on using pull requests. ## Community Guidelines This project follows -[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). \ No newline at end of file +[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/). + +## Building the project + +To build, package, and run all unit tests run the command + +``` +mvn clean verify +``` + +### Running Integration tests + +To include integration tests when building the project, you need access to +a GCP Project with a valid service account. + +For instructions on how to generate a service account and corresponding +credentials JSON see: [Creating a Service Account][1]. + +Then run the following to build, package, run all unit tests and run all +integration tests. + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-integration-tests clean verify +``` + +## Code Samples + +Code Samples must be bundled in separate Maven modules, and guarded by a +Maven profile with the name `enable-samples`. + +The samples must be separate from the primary project for a few reasons: +1. Primary projects have a minimum Java version of Java 7 whereas samples have + a minimum Java version of Java 8. Due to this we need the ability to + selectively exclude samples from a build run. +2. Many code samples depend on external GCP services and need + credentials to access the service. +3. Code samples are not released as Maven artifacts and must be excluded from + release builds. + +### Building + +```bash +mvn -Penable-samples clean verify +``` + +Some samples require access to GCP services and require a service account: + +```bash +export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json +mvn -Penable-samples clean verify +``` + +### Profile Config + +1. To add samples in a profile to your Maven project, add the following to your +`pom.xml` + + ```xml + + [...] + + + enable-samples + + sample + + + + [...] + + ``` + +2. [Activate](#profile-activation) the profile. +3. Define your samples in a normal Maven project in the `samples/` directory + +### Profile Activation + +To include code samples when building and testing the project, enable the +`enable-samples` Maven profile. + +#### Command line + +To activate the Maven profile on the command line add `-Penable-samples` to your +Maven command. + +#### Maven `settings.xml` + +To activate the Maven profile in your `~/.m2/settings.xml` add an entry of +`enable-samples` following the instructions in [Active Profiles][2]. + +This method has the benefit of applying to all projects you build (and is +respected by IntelliJ IDEA) and is recommended if you are going to be +contributing samples to several projects. + +#### IntelliJ IDEA + +To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in +[Activate Maven profiles][3] to activate `enable-samples`. + +[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account +[2]: https://maven.apache.org/settings.html#Active_Profiles +[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles diff --git a/synth.metadata b/synth.metadata index f2b99f2290..36f59918bb 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,5 +1,5 @@ { - "updateTime": "2019-12-19T09:04:21.054357Z", + "updateTime": "2020-01-07T09:14:00.627745Z", "sources": [ { "template": { @@ -11,10 +11,7 @@ ], "newFiles": [ { - "path": ".gitignore" - }, - { - "path": "README.md" + "path": ".repo-metadata.json" }, { "path": "renovate.json" @@ -23,16 +20,19 @@ "path": "license-checks.xml" }, { - "path": "CONTRIBUTING.md" + "path": "synth.py" }, { - "path": "synth.py" + "path": "CHANGELOG.md" }, { - "path": "synth.metadata" + "path": "codecov.yaml" }, { - "path": "java.header" + "path": "LICENSE" + }, + { + "path": ".gitignore" }, { "path": "pom.xml" @@ -41,19 +41,22 @@ "path": "CODE_OF_CONDUCT.md" }, { - "path": "versions.txt" + "path": "synth.metadata" }, { - "path": "CHANGELOG.md" + "path": "README.md" }, { - "path": "LICENSE" + "path": "versions.txt" }, { - "path": ".repo-metadata.json" + "path": "CONTRIBUTING.md" }, { - "path": "codecov.yaml" + "path": "java.header" + }, + { + "path": "google-cloud-core-bom/pom.xml" }, { "path": "google-cloud-core/pom.xml" @@ -62,412 +65,415 @@ "path": "google-cloud-core/src/test/java/com/google/cloud/StringEnumTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/ByteArrayTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/BatchResultTest.java" }, { "path": "google-cloud-core/src/test/java/com/google/cloud/AsyncPageImplTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/FieldSelectorHelperTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceDescriptorTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/TimestampTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/IdentityTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/PolicyTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/ExceptionHandlerTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/RoleTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/ByteArrayTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/BaseSerializationTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/ServiceOptionsTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/PageImplTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/BatchResultTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/BaseSerializationTest.java" + }, + { + "path": "google-cloud-core/src/test/java/com/google/cloud/BaseWriteChannelTest.java" }, { "path": "google-cloud-core/src/test/java/com/google/cloud/DateTest.java" }, + { + "path": "google-cloud-core/src/test/java/com/google/cloud/RoleTest.java" + }, { "path": "google-cloud-core/src/test/java/com/google/cloud/RetryOptionTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/BaseServiceExceptionTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/PolicyTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/MonitoredResourceTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/testing/CommandWrapperTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/SerializationTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java" }, { "path": "google-cloud-core/src/test/java/com/google/cloud/testing/BlockingProcessStreamReaderTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/testing/BaseEmulatorHelperTest.java" + "path": "google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/testing/VersionTest.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceDefaults.java" }, { - "path": "google-cloud-core/src/test/java/com/google/cloud/testing/CommandWrapperTest.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceFactory.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/BatchResult.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/GcpLaunchStage.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Restorable.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Restorable.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Date.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/WriteChannel.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/RetryOption.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/BaseService.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Policy.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/TransportOptions.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/PlatformInformation.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/RestorableState.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Identity.java" }, { "path": "google-cloud-core/src/main/java/com/google/cloud/BaseServiceException.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Timestamp.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/BaseWriteChannel.java" }, { "path": "google-cloud-core/src/main/java/com/google/cloud/ReadChannel.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/ByteArray.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Timestamp.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Role.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/PageImpl.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/WriteChannel.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/BatchResult.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/GcpLaunchStage.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/MonitoredResource.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/ByteArray.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Role.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Policy.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/PlatformInformation.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/package-info.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceFactory.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/RetryHelper.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/PageImpl.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/NoCredentials.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Service.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/ExceptionHandler.java" }, { "path": "google-cloud-core/src/main/java/com/google/cloud/MetadataConfig.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/StringEnumValue.java" - }, - { - "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceDefaults.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/TransportOptions.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Tuple.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/RestorableState.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/MonitoredResourceDescriptor.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/BaseService.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/RetryOption.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceRpc.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Tuple.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/StringEnumType.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Date.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/Service.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/Identity.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/ServiceRpc.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/package-info.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/testing/Version.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/testing/Version.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/testing/CommandWrapper.java" }, { "path": "google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/testing/CommandWrapper.java" + "path": "google-cloud-core/src/main/java/com/google/cloud/spi/ServiceRpcFactory.java" }, { - "path": "google-cloud-core/src/main/java/com/google/cloud/testing/BlockingProcessStreamReader.java" + "path": "google-cloud-core-grpc/pom.xml" }, { - "path": "google-cloud-core-grpc/pom.xml" + "path": "google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java" }, { "path": "google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/BaseGrpcServiceExceptionTest.java" }, { - "path": "google-cloud-core-grpc/src/test/java/com/google/cloud/grpc/GrpcTransportOptionsTest.java" + "path": "google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java" }, { "path": "google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/GrpcTransportOptions.java" }, - { - "path": "google-cloud-core-grpc/src/main/java/com/google/cloud/grpc/BaseGrpcServiceException.java" - }, { "path": "google-cloud-core-http/pom.xml" }, { "path": "google-cloud-core-http/src/test/java/com/google/cloud/http/HttpTransportOptionsTest.java" }, - { - "path": "google-cloud-core-http/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java" - }, { "path": "google-cloud-core-http/src/test/java/com/google/cloud/http/BaseHttpServiceExceptionTest.java" }, { - "path": "google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java" + "path": "google-cloud-core-http/src/test/java/com/google/cloud/http/CensusHttpModuleTest.java" }, { "path": "google-cloud-core-http/src/main/java/com/google/cloud/http/BaseHttpServiceException.java" }, { - "path": "google-cloud-core-http/src/main/java/com/google/cloud/http/CensusHttpModule.java" + "path": "google-cloud-core-http/src/main/java/com/google/cloud/http/HttpTransportOptions.java" }, { - "path": ".github/release-please.yml" + "path": "google-cloud-core-http/src/main/java/com/google/cloud/http/CensusHttpModule.java" }, { - "path": ".github/PULL_REQUEST_TEMPLATE.md" + "path": ".kokoro/build.bat" }, { - "path": ".github/ISSUE_TEMPLATE/support_request.md" + "path": ".kokoro/build.sh" }, { - "path": ".github/ISSUE_TEMPLATE/feature_request.md" + "path": ".kokoro/dependencies.sh" }, { - "path": ".github/ISSUE_TEMPLATE/bug_report.md" + "path": ".kokoro/common.cfg" }, { "path": ".kokoro/trampoline.sh" }, { - "path": ".kokoro/build.sh" + "path": ".kokoro/coerce_logs.sh" }, { - "path": ".kokoro/build.bat" + "path": ".kokoro/linkage-monitor.sh" }, { - "path": ".kokoro/linkage-monitor.sh" + "path": ".kokoro/continuous/dependencies.cfg" }, { - "path": ".kokoro/dependencies.sh" + "path": ".kokoro/continuous/samples.cfg" }, { - "path": ".kokoro/common.cfg" + "path": ".kokoro/continuous/java7.cfg" }, { - "path": ".kokoro/coerce_logs.sh" + "path": ".kokoro/continuous/java8-osx.cfg" }, { - "path": ".kokoro/release/common.sh" + "path": ".kokoro/continuous/java8-win.cfg" }, { - "path": ".kokoro/release/publish_javadoc.cfg" + "path": ".kokoro/continuous/propose_release.sh" }, { - "path": ".kokoro/release/stage.cfg" + "path": ".kokoro/continuous/lint.cfg" }, { - "path": ".kokoro/release/publish_javadoc.sh" + "path": ".kokoro/continuous/java11.cfg" }, { - "path": ".kokoro/release/bump_snapshot.cfg" + "path": ".kokoro/continuous/common.cfg" }, { - "path": ".kokoro/release/drop.cfg" + "path": ".kokoro/continuous/propose_release.cfg" }, { - "path": ".kokoro/release/snapshot.cfg" + "path": ".kokoro/continuous/java8.cfg" }, { - "path": ".kokoro/release/promote.sh" + "path": ".kokoro/continuous/integration.cfg" }, { - "path": ".kokoro/release/stage.sh" + "path": ".kokoro/release/drop.sh" }, { - "path": ".kokoro/release/bump_snapshot.sh" + "path": ".kokoro/release/stage.cfg" }, { "path": ".kokoro/release/promote.cfg" }, { - "path": ".kokoro/release/drop.sh" + "path": ".kokoro/release/publish_javadoc.cfg" }, { - "path": ".kokoro/release/common.cfg" + "path": ".kokoro/release/bump_snapshot.cfg" + }, + { + "path": ".kokoro/release/promote.sh" + }, + { + "path": ".kokoro/release/stage.sh" }, { "path": ".kokoro/release/snapshot.sh" }, { - "path": ".kokoro/nightly/java11.cfg" + "path": ".kokoro/release/snapshot.cfg" }, { - "path": ".kokoro/nightly/java8-win.cfg" + "path": ".kokoro/release/common.cfg" }, { - "path": ".kokoro/nightly/lint.cfg" + "path": ".kokoro/release/bump_snapshot.sh" }, { - "path": ".kokoro/nightly/java8-osx.cfg" + "path": ".kokoro/release/common.sh" }, { - "path": ".kokoro/nightly/integration.cfg" + "path": ".kokoro/release/drop.cfg" }, { - "path": ".kokoro/nightly/java7.cfg" + "path": ".kokoro/release/publish_javadoc.sh" }, { - "path": ".kokoro/nightly/java8.cfg" + "path": ".kokoro/presubmit/dependencies.cfg" }, { - "path": ".kokoro/nightly/dependencies.cfg" + "path": ".kokoro/presubmit/samples.cfg" }, { - "path": ".kokoro/nightly/common.cfg" + "path": ".kokoro/presubmit/java7.cfg" }, { - "path": ".kokoro/presubmit/java11.cfg" + "path": ".kokoro/presubmit/java8-osx.cfg" }, { - "path": ".kokoro/presubmit/java8-win.cfg" + "path": ".kokoro/presubmit/linkage-monitor.cfg" }, { - "path": ".kokoro/presubmit/lint.cfg" + "path": ".kokoro/presubmit/java8-win.cfg" }, { - "path": ".kokoro/presubmit/clirr.cfg" + "path": ".kokoro/presubmit/lint.cfg" }, { - "path": ".kokoro/presubmit/java8-osx.cfg" + "path": ".kokoro/presubmit/java11.cfg" }, { - "path": ".kokoro/presubmit/integration.cfg" + "path": ".kokoro/presubmit/common.cfg" }, { - "path": ".kokoro/presubmit/java7.cfg" + "path": ".kokoro/presubmit/clirr.cfg" }, { "path": ".kokoro/presubmit/java8.cfg" }, { - "path": ".kokoro/presubmit/dependencies.cfg" + "path": ".kokoro/presubmit/integration.cfg" }, { - "path": ".kokoro/presubmit/linkage-monitor.cfg" + "path": ".kokoro/nightly/dependencies.cfg" }, { - "path": ".kokoro/presubmit/common.cfg" + "path": ".kokoro/nightly/samples.cfg" }, { - "path": ".kokoro/continuous/propose_release.cfg" + "path": ".kokoro/nightly/java7.cfg" }, { - "path": ".kokoro/continuous/java11.cfg" + "path": ".kokoro/nightly/java8-osx.cfg" }, { - "path": ".kokoro/continuous/java8-win.cfg" + "path": ".kokoro/nightly/java8-win.cfg" }, { - "path": ".kokoro/continuous/lint.cfg" + "path": ".kokoro/nightly/lint.cfg" }, { - "path": ".kokoro/continuous/java8-osx.cfg" + "path": ".kokoro/nightly/java11.cfg" }, { - "path": ".kokoro/continuous/propose_release.sh" + "path": ".kokoro/nightly/common.cfg" }, { - "path": ".kokoro/continuous/integration.cfg" + "path": ".kokoro/nightly/java8.cfg" }, { - "path": ".kokoro/continuous/java7.cfg" + "path": ".kokoro/nightly/integration.cfg" }, { - "path": ".kokoro/continuous/java8.cfg" + "path": ".github/release-please.yml" }, { - "path": ".kokoro/continuous/dependencies.cfg" + "path": ".github/PULL_REQUEST_TEMPLATE.md" }, { - "path": ".kokoro/continuous/common.cfg" + "path": ".github/ISSUE_TEMPLATE/bug_report.md" }, { - "path": "__pycache__/synth.cpython-36.pyc" + "path": ".github/ISSUE_TEMPLATE/support_request.md" }, { - "path": "google-cloud-core-bom/pom.xml" + "path": ".github/ISSUE_TEMPLATE/feature_request.md" }, { - "path": ".git/shallow" + "path": "__pycache__/synth.cpython-36.pyc" }, { "path": ".git/index" @@ -478,35 +484,77 @@ { "path": ".git/HEAD" }, + { + "path": ".git/description" + }, { "path": ".git/config" }, { - "path": ".git/logs/HEAD" + "path": ".git/shallow" }, { - "path": ".git/logs/refs/heads/autosynth" + "path": ".git/objects/pack/pack-0bf53eb9962b8fdfc2878a86d862322de07c0a0b.pack" }, { - "path": ".git/logs/refs/heads/master" + "path": ".git/objects/pack/pack-0bf53eb9962b8fdfc2878a86d862322de07c0a0b.idx" }, { - "path": ".git/logs/refs/remotes/origin/HEAD" + "path": ".git/refs/remotes/origin/HEAD" }, { - "path": ".git/objects/pack/pack-a5d6f9382dda21b97ddbde6b57fd00761ba537a6.idx" + "path": ".git/refs/heads/autosynth" }, { - "path": ".git/objects/pack/pack-a5d6f9382dda21b97ddbde6b57fd00761ba537a6.pack" + "path": ".git/refs/heads/master" }, { - "path": ".git/refs/heads/autosynth" + "path": ".git/hooks/pre-applypatch.sample" }, { - "path": ".git/refs/heads/master" + "path": ".git/hooks/pre-commit.sample" }, { - "path": ".git/refs/remotes/origin/HEAD" + "path": ".git/hooks/fsmonitor-watchman.sample" + }, + { + "path": ".git/hooks/pre-rebase.sample" + }, + { + "path": ".git/hooks/update.sample" + }, + { + "path": ".git/hooks/pre-push.sample" + }, + { + "path": ".git/hooks/applypatch-msg.sample" + }, + { + "path": ".git/hooks/prepare-commit-msg.sample" + }, + { + "path": ".git/hooks/commit-msg.sample" + }, + { + "path": ".git/hooks/post-update.sample" + }, + { + "path": ".git/hooks/pre-receive.sample" + }, + { + "path": ".git/info/exclude" + }, + { + "path": ".git/logs/HEAD" + }, + { + "path": ".git/logs/refs/remotes/origin/HEAD" + }, + { + "path": ".git/logs/refs/heads/autosynth" + }, + { + "path": ".git/logs/refs/heads/master" } ] } \ No newline at end of file From 21d98a098a6d008085a770516d8a6f9010f3ecdd Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Tue, 7 Jan 2020 11:38:29 -0800 Subject: [PATCH 4/7] chore: allow unstable renovate updates --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/renovate.json b/renovate.json index d014232c57..f3a70c9703 100644 --- a/renovate.json +++ b/renovate.json @@ -52,6 +52,12 @@ ], "semanticCommitType": "build", "semanticCommitScope": "deps" + }, + { + "packagePatterns": [ + "^com.google.cloud:google-cloud-" + ], + "ignoreUnstable": false } ], "semanticCommits": true From 01cbf1ed4b7325fb998f5db95d93828c563c5326 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 9 Jan 2020 20:22:17 +0100 Subject: [PATCH 5/7] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v0.4.0 (#122) --- google-cloud-core-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml index d2299ea390..6935293e67 100644 --- a/google-cloud-core-bom/pom.xml +++ b/google-cloud-core-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 0.3.1 + 0.4.0 Google Cloud Core diff --git a/pom.xml b/pom.xml index 8096e7c562..408c3968a5 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.3.1 + 0.4.0 From cd6eabffcdeed485aba088336fa473a6b85c752d Mon Sep 17 00:00:00 2001 From: Cody Oss <6331106+codyoss@users.noreply.github.com> Date: Thu, 9 Jan 2020 13:15:30 -0700 Subject: [PATCH 6/7] fix: cast to proper interface (#124) Fixes #123 --- .../src/main/java/com/google/cloud/ServiceOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java index 792609f4b4..2a84403af0 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java +++ b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java @@ -218,7 +218,7 @@ public B setCredentials(Credentials credentials) { } if (this.quotaProjectId == null && credentials instanceof QuotaProjectIdProvider) { - this.quotaProjectId = ((ServiceAccountCredentials) credentials).getQuotaProjectId(); + this.quotaProjectId = ((QuotaProjectIdProvider) credentials).getQuotaProjectId(); } return self(); } From b10df3dacfd0a37f7aedb5114d743f906ba94cfd Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2020 13:26:31 -0700 Subject: [PATCH 7/7] chore: release 1.92.2 (#125) --- CHANGELOG.md | 7 +++++++ google-cloud-core-bom/pom.xml | 8 ++++---- google-cloud-core-grpc/pom.xml | 4 ++-- google-cloud-core-http/pom.xml | 4 ++-- google-cloud-core/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 2 +- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76c46ec801..23c3ada285 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [1.92.2](https://www.github.com/googleapis/java-core/compare/v1.92.1...v1.92.2) (2020-01-09) + + +### Bug Fixes + +* cast to proper interface ([#124](https://www.github.com/googleapis/java-core/issues/124)) ([cd6eabf](https://www.github.com/googleapis/java-core/commit/cd6eabffcdeed485aba088336fa473a6b85c752d)), closes [#123](https://www.github.com/googleapis/java-core/issues/123) + ### [1.92.1](https://www.github.com/googleapis/java-core/compare/v1.92.0...v1.92.1) (2020-01-02) diff --git a/google-cloud-core-bom/pom.xml b/google-cloud-core-bom/pom.xml index 6935293e67..81c9ec5fbc 100644 --- a/google-cloud-core-bom/pom.xml +++ b/google-cloud-core-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 1.92.2-SNAPSHOT + 1.92.2 pom com.google.cloud @@ -63,17 +63,17 @@ com.google.cloud google-cloud-core - 1.92.2-SNAPSHOT + 1.92.2 com.google.cloud google-cloud-core-grpc - 1.92.2-SNAPSHOT + 1.92.2 com.google.cloud google-cloud-core-http - 1.92.2-SNAPSHOT + 1.92.2 diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml index 00c8e3b137..f550d5dcc9 100644 --- a/google-cloud-core-grpc/pom.xml +++ b/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 1.92.2-SNAPSHOT + 1.92.2 jar Google Cloud Core gRPC https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 1.92.2-SNAPSHOT + 1.92.2 google-cloud-core-grpc diff --git a/google-cloud-core-http/pom.xml b/google-cloud-core-http/pom.xml index 5200ffc64a..0a2709beff 100644 --- a/google-cloud-core-http/pom.xml +++ b/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 1.92.2-SNAPSHOT + 1.92.2 jar Google Cloud Core HTTP https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 1.92.2-SNAPSHOT + 1.92.2 google-cloud-core-http diff --git a/google-cloud-core/pom.xml b/google-cloud-core/pom.xml index 52b3b477d9..27527f2e9a 100644 --- a/google-cloud-core/pom.xml +++ b/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 1.92.2-SNAPSHOT + 1.92.2 jar Google Cloud Core https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core @@ -13,7 +13,7 @@ com.google.cloud google-cloud-core-parent - 1.92.2-SNAPSHOT + 1.92.2 google-cloud-core diff --git a/pom.xml b/pom.xml index 408c3968a5..45456b4e98 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 1.92.2-SNAPSHOT + 1.92.2 Google Cloud Core Parent https://github.com/googleapis/java-core diff --git a/versions.txt b/versions.txt index 7e4d13af64..6aecda8957 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-core:1.92.1:1.92.2-SNAPSHOT \ No newline at end of file +google-cloud-core:1.92.2:1.92.2 \ No newline at end of file