diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 9afeaa49..4ab766e5 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-datalabeling.git", - "sha": "d327741f4be51a91bc8b9cd13624f99976a9b0cb" + "sha": "231b90f796d46df008cbb0ddea99bd42b04f90b3" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1f5e6bc8dc8e3661ee550905fc070e55e1b6cea1" + "sha": "ff6b759fcb58f216f62b48d5be0bb85fafbc3bb2" } } ] diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 9baf69f4..be9e2e94 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 6abbea5a..fcc4ed78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +### [0.119.15](https://www.github.com/googleapis/java-datalabeling/compare/v0.119.14...v0.119.15) (2021-04-23) + + +### Bug Fixes + +* release scripts from issuing overlapping phases ([#456](https://www.github.com/googleapis/java-datalabeling/issues/456)) ([51006aa](https://www.github.com/googleapis/java-datalabeling/commit/51006aa7c725f1a4cbdcdd37766177f1a2b0345f)) +* typo ([#453](https://www.github.com/googleapis/java-datalabeling/issues/453)) ([6036d50](https://www.github.com/googleapis/java-datalabeling/commit/6036d50030261371200ef1f39928c37d315c99ff)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#460](https://www.github.com/googleapis/java-datalabeling/issues/460)) ([fc3a8ee](https://www.github.com/googleapis/java-datalabeling/commit/fc3a8ee98a87ff20c90a26240032bb43cbff8c9d)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#463](https://www.github.com/googleapis/java-datalabeling/issues/463)) ([9ba7a76](https://www.github.com/googleapis/java-datalabeling/commit/9ba7a768bb0ed03afc48e6c5c3e83bf2e9b536d1)) + ### [0.119.14](https://www.github.com/googleapis/java-datalabeling/compare/v0.119.13...v0.119.14) (2021-04-09) diff --git a/README.md b/README.md index 25518fce..47fc1a1f 100644 --- a/README.md +++ b/README.md @@ -8,12 +8,9 @@ Java idiomatic client for [Data Labeling][product-docs]. - [Product Documentation][product-docs] - [Client Library Documentation][javadocs] - > Note: This client is a work-in-progress, and may occasionally > make backwards-incompatible changes. - - ## Quickstart If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file @@ -23,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 19.2.1 + 20.1.0 pom import @@ -51,18 +48,18 @@ 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:19.2.1') +implementation platform('com.google.cloud:libraries-bom:20.1.0') compile 'com.google.cloud:google-cloud-datalabeling' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-datalabeling:0.119.13' +compile 'com.google.cloud:google-cloud-datalabeling:0.119.14' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.119.13" +libraryDependencies += "com.google.cloud" % "google-cloud-datalabeling" % "0.119.14" ``` ## Authentication diff --git a/google-cloud-datalabeling-bom/pom.xml b/google-cloud-datalabeling-bom/pom.xml index 713bbd6e..cfa73d30 100644 --- a/google-cloud-datalabeling-bom/pom.xml +++ b/google-cloud-datalabeling-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-datalabeling-bom - 0.119.14 + 0.119.15 pom com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 Google Cloud Data Labeling BOM @@ -64,17 +64,17 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.14 + 0.84.15 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.14 + 0.84.15 com.google.cloud google-cloud-datalabeling - 0.119.14 + 0.119.15 diff --git a/google-cloud-datalabeling/pom.xml b/google-cloud-datalabeling/pom.xml index 88a9f319..79d4fd3a 100644 --- a/google-cloud-datalabeling/pom.xml +++ b/google-cloud-datalabeling/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-datalabeling - 0.119.14 + 0.119.15 jar Google Cloud Data Labeling https://github.com/googleapis/java-datalabeling @@ -11,7 +11,7 @@ com.google.cloud google-cloud-datalabeling-parent - 0.119.14 + 0.119.15 google-cloud-datalabeling diff --git a/grpc-google-cloud-datalabeling-v1beta1/pom.xml b/grpc-google-cloud-datalabeling-v1beta1/pom.xml index 144df17e..db27043f 100644 --- a/grpc-google-cloud-datalabeling-v1beta1/pom.xml +++ b/grpc-google-cloud-datalabeling-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.14 + 0.84.15 grpc-google-cloud-datalabeling-v1beta1 GRPC library for grpc-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.119.14 + 0.119.15 diff --git a/pom.xml b/pom.xml index a1879e05..db957151 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-datalabeling-parent pom - 0.119.14 + 0.119.15 Google Cloud Data Labeling Parent https://github.com/googleapis/java-datalabeling @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.0 + 0.11.2 @@ -70,23 +70,23 @@ com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.14 + 0.84.15 com.google.api.grpc grpc-google-cloud-datalabeling-v1beta1 - 0.84.14 + 0.84.15 com.google.cloud google-cloud-datalabeling - 0.119.14 + 0.119.15 com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.0.0 pom import diff --git a/proto-google-cloud-datalabeling-v1beta1/pom.xml b/proto-google-cloud-datalabeling-v1beta1/pom.xml index c0d1e11e..ca0f04c5 100644 --- a/proto-google-cloud-datalabeling-v1beta1/pom.xml +++ b/proto-google-cloud-datalabeling-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-datalabeling-v1beta1 - 0.84.14 + 0.84.15 proto-google-cloud-datalabeling-v1beta1 PROTO library for proto-google-cloud-datalabeling-v1beta1 com.google.cloud google-cloud-datalabeling-parent - 0.119.14 + 0.119.15 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 20a6d5ad..2151526e 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 diff --git a/synth.metadata b/synth.metadata index 031b4df3..1521ad96 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-datalabeling.git", - "sha": "c90b5dc31b62d08503ca1e6c75fc73dc26a6fb85" + "sha": "a0269e089e370790df81f4b245cb92a96b08abb6" } }, { @@ -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 d54896f4..2fe18891 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -proto-google-cloud-datalabeling-v1beta1:0.84.14:0.84.14 -grpc-google-cloud-datalabeling-v1beta1:0.84.14:0.84.14 -google-cloud-datalabeling:0.119.14:0.119.14 +proto-google-cloud-datalabeling-v1beta1:0.84.15:0.84.15 +grpc-google-cloud-datalabeling-v1beta1:0.84.15:0.84.15 +google-cloud-datalabeling:0.119.15:0.119.15