diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 5d788be..731a0eb 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:491a007c6bd6e77f9e9b1bebcd6cdf08a4a4ef2c228c123d9696845204cb685d diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 31213af..2d5a888 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -37,6 +37,7 @@ branchProtectionRules: - "units (11)" - "Kokoro - Test: Integration" - "cla/google" + - OwlBot Post Processor # List of explicit permissions to add (additive only) permissionRules: - team: yoshi-admins diff --git a/.kokoro/build.sh b/.kokoro/build.sh index ab74695..5decf12 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -47,15 +47,15 @@ set +e case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true -Denforcer.skip=true + mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true RETURN_CODE=$? ;; lint) - mvn com.coveo:fmt-maven-plugin:check + mvn com.coveo:fmt-maven-plugin:check -B -ntp RETURN_CODE=$? ;; javadoc) - mvn javadoc:javadoc javadoc:test-javadoc + mvn javadoc:javadoc javadoc:test-javadoc -B -ntp RETURN_CODE=$? ;; integration) @@ -71,7 +71,7 @@ integration) ;; graalvm) # Run Unit and Integration Tests with Native Image - mvn test -Pnative -Penable-integration-tests + mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test RETURN_CODE=$? ;; samples) @@ -91,7 +91,6 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ - -Penable-samples \ -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -105,7 +104,7 @@ samples) fi ;; clirr) - mvn -B -Denforcer.skip=true clirr:check + mvn -B -ntp -Denforcer.skip=true clirr:check RETURN_CODE=$? ;; *) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80eafe6..8ae3d40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [0.1.4](https://www.github.com/googleapis/java-deploy/compare/v0.1.3...v0.1.4) (2022-01-07) + + +### Bug Fixes + +* **java:** run Maven in plain console-friendly mode ([#1301](https://www.github.com/googleapis/java-deploy/issues/1301)) ([#48](https://www.github.com/googleapis/java-deploy/issues/48)) ([3435466](https://www.github.com/googleapis/java-deploy/commit/34354669e29091230e7587efbd0fd17e75d22549)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 ([#52](https://www.github.com/googleapis/java-deploy/issues/52)) ([d592b37](https://www.github.com/googleapis/java-deploy/commit/d592b374187b0123f08a4cc0f70397f043f55c1c)) + ### [0.1.3](https://www.github.com/googleapis/java-deploy/compare/v0.1.2...v0.1.3) (2021-12-06) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2dbdee..b65dd27 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 diff --git a/README.md b/README.md index 21ed5f5..8c89766 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-deploy - 0.1.0 + 0.1.3 ``` @@ -30,13 +30,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-deploy:0.1.2' +implementation 'com.google.cloud:google-cloud-deploy:0.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-deploy" % "0.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-deploy" % "0.1.3" ``` ## Authentication diff --git a/google-cloud-deploy-bom/pom.xml b/google-cloud-deploy-bom/pom.xml index 88bb405..0a33af3 100644 --- a/google-cloud-deploy-bom/pom.xml +++ b/google-cloud-deploy-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-deploy-bom - 0.1.3 + 0.1.4 pom com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 Google Google CLoud Deploy BOM @@ -65,17 +65,17 @@ com.google.cloud google-cloud-deploy - 0.1.3 + 0.1.4 com.google.api.grpc grpc-google-cloud-deploy-v1 - 0.1.3 + 0.1.4 com.google.api.grpc proto-google-cloud-deploy-v1 - 0.1.3 + 0.1.4 diff --git a/google-cloud-deploy/pom.xml b/google-cloud-deploy/pom.xml index c28071a..f17b91d 100644 --- a/google-cloud-deploy/pom.xml +++ b/google-cloud-deploy/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-deploy - 0.1.3 + 0.1.4 jar Google Google CLoud Deploy https://github.com/googleapis/java-deploy @@ -11,7 +11,7 @@ com.google.cloud google-cloud-deploy-parent - 0.1.3 + 0.1.4 google-cloud-deploy diff --git a/grpc-google-cloud-deploy-v1/pom.xml b/grpc-google-cloud-deploy-v1/pom.xml index 7f15d44..e3e3bbc 100644 --- a/grpc-google-cloud-deploy-v1/pom.xml +++ b/grpc-google-cloud-deploy-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-deploy-v1 - 0.1.3 + 0.1.4 grpc-google-cloud-deploy-v1 GRPC library for google-cloud-deploy com.google.cloud google-cloud-deploy-parent - 0.1.3 + 0.1.4 diff --git a/pom.xml b/pom.xml index 5044607..8786d54 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-deploy-parent pom - 0.1.3 + 0.1.4 Google Google CLoud Deploy Parent https://github.com/googleapis/java-deploy @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.2.2 + 1.2.4 @@ -69,23 +69,23 @@ com.google.cloud google-cloud-deploy - 0.1.3 + 0.1.4 com.google.api.grpc grpc-google-cloud-deploy-v1 - 0.1.3 + 0.1.4 com.google.api.grpc proto-google-cloud-deploy-v1 - 0.1.3 + 0.1.4 com.google.cloud google-cloud-shared-dependencies - 2.5.1 + 2.6.0 pom import diff --git a/proto-google-cloud-deploy-v1/pom.xml b/proto-google-cloud-deploy-v1/pom.xml index 88bd16e..e7736c2 100644 --- a/proto-google-cloud-deploy-v1/pom.xml +++ b/proto-google-cloud-deploy-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-deploy-v1 - 0.1.3 + 0.1.4 proto-google-cloud-deploy-v1 Proto library for google-cloud-deploy com.google.cloud google-cloud-deploy-parent - 0.1.3 + 0.1.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index ee1d3eb..4f6a8b3 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-deploy - 0.1.0 + 0.1.3 diff --git a/samples/pom.xml b/samples/pom.xml index 50290d1..5ad6c27 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 956e11a..0116019 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-deploy - 0.1.0 + 0.1.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 4230464..2234402 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.23 + 1.2.0 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-deploy - 0.1.0 + 0.1.3 diff --git a/versions.txt b/versions.txt index 8bc452d..ee98a3e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-deploy:0.1.3:0.1.3 -grpc-google-cloud-deploy-v1:0.1.3:0.1.3 -proto-google-cloud-deploy-v1:0.1.3:0.1.3 +google-cloud-deploy:0.1.4:0.1.4 +grpc-google-cloud-deploy-v1:0.1.4:0.1.4 +proto-google-cloud-deploy-v1:0.1.4:0.1.4