diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index bc9ec9b5..2c6fa12a 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-bigqueryreservation.git", - "sha": "f8ada124589818c4750aa4814f6a65f70858b0f6" + "sha": "c86c6f07e460544f14d09dc8e97ee2ef9c139329" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e5fa6d93e42918dd4a000a80b92be23f5f4c6ac7" + "sha": "0a071b3460344886297a304253bf924aa68ddb7e" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 57a7f5d4..2b6b1924 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c843..59d2aafc 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -33,6 +33,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a7..1f55b770 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2e..8a103384 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e908597..1689c216 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [1.1.4](https://www.github.com/googleapis/java-bigqueryreservation/compare/v1.1.3...v1.1.4) (2021-04-23) + + +### Bug Fixes + +* release scripts from issuing overlapping phases ([#370](https://www.github.com/googleapis/java-bigqueryreservation/issues/370)) ([f5023dc](https://www.github.com/googleapis/java-bigqueryreservation/commit/f5023dc4cc0807dfe5d9bf578ddd0c3c0dd4d808)) +* typo ([#367](https://www.github.com/googleapis/java-bigqueryreservation/issues/367)) ([5efec69](https://www.github.com/googleapis/java-bigqueryreservation/commit/5efec6978ad4b21e5cdca6bd1d5ace3fa8c6375a)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#372](https://www.github.com/googleapis/java-bigqueryreservation/issues/372)) ([1ad9ed7](https://www.github.com/googleapis/java-bigqueryreservation/commit/1ad9ed78cb6179cfa0ac2b177f0742ac71281726)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#376](https://www.github.com/googleapis/java-bigqueryreservation/issues/376)) ([2736ca8](https://www.github.com/googleapis/java-bigqueryreservation/commit/2736ca8b0e314e1d7d247b2ded79b98d81282a7e)) + ### [1.1.3](https://www.github.com/googleapis/java-bigqueryreservation/compare/v1.1.2...v1.1.3) (2021-04-09) diff --git a/README.md b/README.md index f97a8371..f43ed3c1 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,18 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-bigqueryreservation - 1.1.2 + 1.1.3 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigqueryreservation:1.1.2' +compile 'com.google.cloud:google-cloud-bigqueryreservation:1.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigqueryreservation" % "1.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-bigqueryreservation" % "1.1.3" ``` ## Authentication diff --git a/google-cloud-bigqueryreservation-bom/pom.xml b/google-cloud-bigqueryreservation-bom/pom.xml index 17bfee73..284c49e3 100644 --- a/google-cloud-bigqueryreservation-bom/pom.xml +++ b/google-cloud-bigqueryreservation-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-bigqueryreservation-bom - 1.1.3 + 1.1.4 pom com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 Google Cloud BigQuery Reservation BOM @@ -63,17 +63,17 @@ com.google.cloud google-cloud-bigqueryreservation - 1.1.3 + 1.1.4 com.google.api.grpc proto-google-cloud-bigqueryreservation-v1 - 1.1.3 + 1.1.4 com.google.api.grpc grpc-google-cloud-bigqueryreservation-v1 - 1.1.3 + 1.1.4 diff --git a/google-cloud-bigqueryreservation/pom.xml b/google-cloud-bigqueryreservation/pom.xml index 1076fd12..af613aa5 100644 --- a/google-cloud-bigqueryreservation/pom.xml +++ b/google-cloud-bigqueryreservation/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigqueryreservation - 1.1.3 + 1.1.4 jar Google Cloud BigQuery Reservations https://github.com/googleapis/java-bigqueryreservation @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigqueryreservation-parent - 1.1.3 + 1.1.4 google-cloud-bigqueryreservation diff --git a/grpc-google-cloud-bigqueryreservation-v1/pom.xml b/grpc-google-cloud-bigqueryreservation-v1/pom.xml index 34c37dcb..c57580a2 100644 --- a/grpc-google-cloud-bigqueryreservation-v1/pom.xml +++ b/grpc-google-cloud-bigqueryreservation-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigqueryreservation-v1 - 1.1.3 + 1.1.4 grpc-google-cloud-bigqueryreservation-v1 GRPC library for grpc-google-cloud-bigqueryreservation-v1 com.google.cloud google-cloud-bigqueryreservation-parent - 1.1.3 + 1.1.4 diff --git a/pom.xml b/pom.xml index 1e8c43a0..9419dbe6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigqueryreservation-parent pom - 1.1.3 + 1.1.4 Google Cloud BigQuery Reservations Parent https://github.com/googleapis/java-bigqueryreservation @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 @@ -70,23 +70,23 @@ com.google.cloud google-cloud-bigqueryreservation - 1.1.3 + 1.1.4 com.google.api.grpc proto-google-cloud-bigqueryreservation-v1 - 1.1.3 + 1.1.4 com.google.api.grpc grpc-google-cloud-bigqueryreservation-v1 - 1.1.3 + 1.1.4 com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.0.0 pom import diff --git a/proto-google-cloud-bigqueryreservation-v1/pom.xml b/proto-google-cloud-bigqueryreservation-v1/pom.xml index 1959663f..357aa681 100644 --- a/proto-google-cloud-bigqueryreservation-v1/pom.xml +++ b/proto-google-cloud-bigqueryreservation-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigqueryreservation-v1 - 1.1.3 + 1.1.4 proto-google-cloud-bigqueryreservation-v1 PROTO library for proto-google-cloud-bigqueryreservation-v1 com.google.cloud google-cloud-bigqueryreservation-parent - 1.1.3 + 1.1.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 29d67166..c06ddae7 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigqueryreservation - 1.1.2 + 1.1.3 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 16dd2d19..e7877df3 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigqueryreservation - 1.1.2 + 1.1.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 7d062bb4..d07c77de 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 19.2.1 + 20.1.0 pom import @@ -41,7 +41,7 @@ com.google.cloud google-cloud-bigqueryreservation - 1.1.2 + 1.1.3 diff --git a/synth.metadata b/synth.metadata index f3d00d43..6a4a3f15 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigqueryreservation.git", - "sha": "6dc6938c23eec35e5d678c09b796bc404d90301d" + "sha": "7fb75301ccacbb70a0c028a78ce8cf00ae692b5d" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098" + "sha": "8285c2b4cdbc3771d031ad91e1c4ec9e55fff45d" } } ], @@ -45,6 +45,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", diff --git a/versions.txt b/versions.txt index c0201f6d..52e877a3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-bigqueryreservation:1.1.3:1.1.3 -proto-google-cloud-bigqueryreservation-v1:1.1.3:1.1.3 -grpc-google-cloud-bigqueryreservation-v1:1.1.3:1.1.3 +google-cloud-bigqueryreservation:1.1.4:1.1.4 +proto-google-cloud-bigqueryreservation-v1:1.1.4:1.1.4 +grpc-google-cloud-bigqueryreservation-v1:1.1.4:1.1.4