From 3f682f018c95e1616c3d3904ce956c60a387f4b9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 20:40:36 +0000 Subject: [PATCH 1/6] chore: release 2.1.6-SNAPSHOT (#123) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-cloud-shell-bom/pom.xml | 8 ++++---- google-cloud-shell/pom.xml | 4 ++-- grpc-google-cloud-shell-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-shell-v1/pom.xml | 4 ++-- versions.txt | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/google-cloud-shell-bom/pom.xml b/google-cloud-shell-bom/pom.xml index f29db338..76360f49 100644 --- a/google-cloud-shell-bom/pom.xml +++ b/google-cloud-shell-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-shell-bom - 2.1.5 + 2.1.6-SNAPSHOT pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-shell - 2.1.5 + 2.1.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-shell-v1 - 2.1.5 + 2.1.6-SNAPSHOT com.google.api.grpc proto-google-cloud-shell-v1 - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/google-cloud-shell/pom.xml b/google-cloud-shell/pom.xml index dd08ccfa..310c2130 100644 --- a/google-cloud-shell/pom.xml +++ b/google-cloud-shell/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-shell - 2.1.5 + 2.1.6-SNAPSHOT jar Google Cloud Shell https://github.com/googleapis/java-shell @@ -11,7 +11,7 @@ com.google.cloud google-cloud-shell-parent - 2.1.5 + 2.1.6-SNAPSHOT google-cloud-shell diff --git a/grpc-google-cloud-shell-v1/pom.xml b/grpc-google-cloud-shell-v1/pom.xml index 7b6833fc..4127065b 100644 --- a/grpc-google-cloud-shell-v1/pom.xml +++ b/grpc-google-cloud-shell-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-shell-v1 - 2.1.5 + 2.1.6-SNAPSHOT grpc-google-cloud-shell-v1 GRPC library for google-cloud-shell com.google.cloud google-cloud-shell-parent - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/pom.xml b/pom.xml index fc349b0f..9baf9745 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shell-parent pom - 2.1.5 + 2.1.6-SNAPSHOT Google Cloud Shell Parent https://github.com/googleapis/java-shell @@ -60,17 +60,17 @@ com.google.cloud google-cloud-shell - 2.1.5 + 2.1.6-SNAPSHOT com.google.api.grpc grpc-google-cloud-shell-v1 - 2.1.5 + 2.1.6-SNAPSHOT com.google.api.grpc proto-google-cloud-shell-v1 - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/proto-google-cloud-shell-v1/pom.xml b/proto-google-cloud-shell-v1/pom.xml index 33140f02..0cc9e37b 100644 --- a/proto-google-cloud-shell-v1/pom.xml +++ b/proto-google-cloud-shell-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-shell-v1 - 2.1.5 + 2.1.6-SNAPSHOT proto-google-cloud-shell-v1 Proto library for google-cloud-shell com.google.cloud google-cloud-shell-parent - 2.1.5 + 2.1.6-SNAPSHOT diff --git a/versions.txt b/versions.txt index 4adb981d..fb140af0 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-shell:2.1.5:2.1.5 -grpc-google-cloud-shell-v1:2.1.5:2.1.5 -proto-google-cloud-shell-v1:2.1.5:2.1.5 +google-cloud-shell:2.1.5:2.1.6-SNAPSHOT +grpc-google-cloud-shell-v1:2.1.5:2.1.6-SNAPSHOT +proto-google-cloud-shell-v1:2.1.5:2.1.6-SNAPSHOT From f59f115d045c23beba5ff213715a9972d0c150df Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Nov 2021 18:35:19 +0100 Subject: [PATCH 2/6] build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.2 (#125) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build(deps): update dependency com.google.cloud:google-cloud-shared-config to v1.2.2 * 🦉 Updates from OwlBot See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- README.md | 4 ++-- google-cloud-shell-bom/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 47997efa..99e4d1c8 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ If you are using Maven, add this to your pom.xml file: If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-shell:2.1.4' +implementation 'com.google.cloud:google-cloud-shell:2.1.5' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-shell" % "2.1.4" +libraryDependencies += "com.google.cloud" % "google-cloud-shell" % "2.1.5" ``` ## Authentication diff --git a/google-cloud-shell-bom/pom.xml b/google-cloud-shell-bom/pom.xml index 76360f49..c0214f1c 100644 --- a/google-cloud-shell-bom/pom.xml +++ b/google-cloud-shell-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 Google Cloud Shell BOM diff --git a/pom.xml b/pom.xml index 9baf9745..c484a3a2 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.1 + 1.2.2 From dd23ff41e73e13d5776bc0cbe1fd7f6bb1a0cff6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Nov 2021 20:00:36 +0100 Subject: [PATCH 3/6] chore(deps): update dependency com.google.cloud:google-cloud-shell to v2.1.5 (#124) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shell](https://togithub.com/googleapis/java-shell) | `2.1.4` -> `2.1.5` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shell/2.1.5/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shell/2.1.5/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shell/2.1.5/compatibility-slim/2.1.4)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shell/2.1.5/confidence-slim/2.1.4)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shell ### [`v2.1.5`](https://togithub.com/googleapis/java-shell/blob/master/CHANGELOG.md#​215-httpswwwgithubcomgoogleapisjava-shellcomparev214v215-2021-11-15) [Compare Source](https://togithub.com/googleapis/java-shell/compare/v2.1.4...v2.1.5)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shell). --- README.md | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 99e4d1c8..5bd3ee3a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-shell - 2.1.4 + 2.1.5 ``` diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index bf67b2be..08a270ad 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-shell - 2.1.4 + 2.1.5 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 62bdfe1c..859f24cc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-shell - 2.1.4 + 2.1.5 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index fe07077e..07ad8441 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-shell - 2.1.4 + 2.1.5 From dbf4375c10db003175f064285e20eee46fc13d5a Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 18:32:28 +0000 Subject: [PATCH 4/6] chore: remove enable-samples profile (#1284) (#126) --- .github/.OwlBot.lock.yaml | 2 +- .kokoro/build.sh | 1 - CONTRIBUTING.md | 61 +++++---------------------------------- 3 files changed, 8 insertions(+), 56 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5d788be0..88d9b926 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:a744afda1956beb7bd6dc8d0b740a7839bbe402e34e2f4ef24589074db53ceb0 + digest: sha256:5b8c790f57cca57e6b37ba25f79291265c218cea3e6ba9714b001910ab3f1419 diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 80dfc93a..201bd8d7 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee0..b65dd279 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,12 +53,12 @@ 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`. +All code samples must be in compliance with the [java sample formatting guide][3]. +Code Samples must be bundled in separate Maven modules. 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 +1. Primary projects have a minimum Java version of Java 8 whereas samples can have + Java version of Java 11. 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. @@ -68,39 +68,16 @@ The samples must be separate from the primary project for a few reasons: ### Building ```bash -mvn -Penable-samples clean verify +mvn 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 +mvn 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. - ### Code Formatting Code in this repo is formatted with @@ -110,30 +87,6 @@ To run formatting on your project, you can run: mvn com.coveo:fmt-maven-plugin:format ``` -### 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 +[3]: https://github.com/GoogleCloudPlatform/java-docs-samples/blob/main/SAMPLE_FORMAT.md \ No newline at end of file From d9e85a876e0a2a8ea535a0768f9fc3bb95a7e2a6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 3 Dec 2021 18:00:16 +0100 Subject: [PATCH 5/6] deps: update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 (#129) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:google-cloud-shared-dependencies](https://togithub.com/googleapis/java-shared-dependencies) | `2.5.0` -> `2.5.1` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/compatibility-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:google-cloud-shared-dependencies/2.5.1/confidence-slim/2.5.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
googleapis/java-shared-dependencies ### [`v2.5.1`](https://togithub.com/googleapis/java-shared-dependencies/blob/master/CHANGELOG.md#​251-httpswwwgithubcomgoogleapisjava-shared-dependenciescompare250v251-2021-12-03) [Compare Source](https://togithub.com/googleapis/java-shared-dependencies/compare/v2.5.0...v2.5.1)
--- ### Configuration 📅 **Schedule**: At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-shell). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c484a3a2..dce56bad 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.google.cloud google-cloud-shared-dependencies - 2.5.0 + 2.5.1 pom import From 50fe5c9a8fd2c3a79297567d497023855ed29ea1 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 3 Dec 2021 17:24:26 +0000 Subject: [PATCH 6/6] chore: release 2.1.6 (#130) :robot: I have created a release \*beep\* \*boop\* --- ### [2.1.6](https://www.github.com/googleapis/java-shell/compare/v2.1.5...v2.1.6) (2021-12-03) ### Dependencies * update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#129](https://www.github.com/googleapis/java-shell/issues/129)) ([d9e85a8](https://www.github.com/googleapis/java-shell/commit/d9e85a876e0a2a8ea535a0768f9fc3bb95a7e2a6)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ google-cloud-shell-bom/pom.xml | 8 ++++---- google-cloud-shell/pom.xml | 4 ++-- grpc-google-cloud-shell-v1/pom.xml | 4 ++-- pom.xml | 8 ++++---- proto-google-cloud-shell-v1/pom.xml | 4 ++-- versions.txt | 6 +++--- 7 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a07a334..c2f3327e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [2.1.6](https://www.github.com/googleapis/java-shell/compare/v2.1.5...v2.1.6) (2021-12-03) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.5.1 ([#129](https://www.github.com/googleapis/java-shell/issues/129)) ([d9e85a8](https://www.github.com/googleapis/java-shell/commit/d9e85a876e0a2a8ea535a0768f9fc3bb95a7e2a6)) + ### [2.1.5](https://www.github.com/googleapis/java-shell/compare/v2.1.4...v2.1.5) (2021-11-15) diff --git a/google-cloud-shell-bom/pom.xml b/google-cloud-shell-bom/pom.xml index c0214f1c..cf2bacc4 100644 --- a/google-cloud-shell-bom/pom.xml +++ b/google-cloud-shell-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-shell-bom - 2.1.6-SNAPSHOT + 2.1.6 pom com.google.cloud @@ -56,17 +56,17 @@ com.google.cloud google-cloud-shell - 2.1.6-SNAPSHOT + 2.1.6 com.google.api.grpc grpc-google-cloud-shell-v1 - 2.1.6-SNAPSHOT + 2.1.6 com.google.api.grpc proto-google-cloud-shell-v1 - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/google-cloud-shell/pom.xml b/google-cloud-shell/pom.xml index 310c2130..b1363cf5 100644 --- a/google-cloud-shell/pom.xml +++ b/google-cloud-shell/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-shell - 2.1.6-SNAPSHOT + 2.1.6 jar Google Cloud Shell https://github.com/googleapis/java-shell @@ -11,7 +11,7 @@ com.google.cloud google-cloud-shell-parent - 2.1.6-SNAPSHOT + 2.1.6 google-cloud-shell diff --git a/grpc-google-cloud-shell-v1/pom.xml b/grpc-google-cloud-shell-v1/pom.xml index 4127065b..df75cbe8 100644 --- a/grpc-google-cloud-shell-v1/pom.xml +++ b/grpc-google-cloud-shell-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-shell-v1 - 2.1.6-SNAPSHOT + 2.1.6 grpc-google-cloud-shell-v1 GRPC library for google-cloud-shell com.google.cloud google-cloud-shell-parent - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/pom.xml b/pom.xml index dce56bad..c613067f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-shell-parent pom - 2.1.6-SNAPSHOT + 2.1.6 Google Cloud Shell Parent https://github.com/googleapis/java-shell @@ -60,17 +60,17 @@ com.google.cloud google-cloud-shell - 2.1.6-SNAPSHOT + 2.1.6 com.google.api.grpc grpc-google-cloud-shell-v1 - 2.1.6-SNAPSHOT + 2.1.6 com.google.api.grpc proto-google-cloud-shell-v1 - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/proto-google-cloud-shell-v1/pom.xml b/proto-google-cloud-shell-v1/pom.xml index 0cc9e37b..13e9b56d 100644 --- a/proto-google-cloud-shell-v1/pom.xml +++ b/proto-google-cloud-shell-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-shell-v1 - 2.1.6-SNAPSHOT + 2.1.6 proto-google-cloud-shell-v1 Proto library for google-cloud-shell com.google.cloud google-cloud-shell-parent - 2.1.6-SNAPSHOT + 2.1.6 diff --git a/versions.txt b/versions.txt index fb140af0..f9ee4374 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-shell:2.1.5:2.1.6-SNAPSHOT -grpc-google-cloud-shell-v1:2.1.5:2.1.6-SNAPSHOT -proto-google-cloud-shell-v1:2.1.5:2.1.6-SNAPSHOT +google-cloud-shell:2.1.6:2.1.6 +grpc-google-cloud-shell-v1:2.1.6:2.1.6 +proto-google-cloud-shell-v1:2.1.6:2.1.6