diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 00000000..eeb480bd --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + digest: sha256:e09db16aef633f4cae68b6eb2771b40ea01464f8db08badcd1c5197b9c623457 + image: gcr.io/repo-automation-bots/owlbot-java:latest diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml new file mode 100644 index 00000000..e86d5cc4 --- /dev/null +++ b/.github/.OwlBot.yaml @@ -0,0 +1,29 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + image: "gcr.io/repo-automation-bots/owlbot-java:latest" + +deep-remove-regex: +- "/grpc-google-.*/src" +- "/proto-google-.*/src" +- "/google-.*/src" + +deep-copy-regex: +- source: "/google/cloud/language/(v.*)/.*-java/proto-google-.*/src" + dest: "/owl-bot-staging/$1/proto-google-cloud-language-$1/src" +- source: "/google/cloud/language/(v.*)/.*-java/grpc-google-.*/src" + dest: "/owl-bot-staging/$1/grpc-google-cloud-language-$1/src" +- source: "/google/cloud/language/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-cloud-language/src" diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 50b70c21..e3cb8a0d 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-language.git", - "sha": "1e2efa8b8d69d8b6979949e31344026249f16a42" + "sha": "9063bdfb475a0c9514e6aae08ee155af554eaa49" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "bd8281a06cc7f84906e04d4843c1d3d386a980cd" + "sha": "a2de127f90799cd5bace653b1dcc5dd2ca8b19c9" } } ] diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index 5a82289b..61eeded4 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml diff --git a/CHANGELOG.md b/CHANGELOG.md index 54bb5df0..37f1e6ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [1.103.0](https://www.github.com/googleapis/java-language/compare/v1.102.3...v1.103.0) (2021-05-26) + + +### Features + +* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#464](https://www.github.com/googleapis/java-language/issues/464)) ([894ed25](https://www.github.com/googleapis/java-language/commit/894ed25f36aee0a6f43f80a1c668b12eac169937)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#463](https://www.github.com/googleapis/java-language/issues/463)) ([5bbfa0b](https://www.github.com/googleapis/java-language/commit/5bbfa0b5fb6fe6b0a988e8d8a1827702cec548d2)) + ### [1.102.3](https://www.github.com/googleapis/java-language/compare/v1.102.2...v1.102.3) (2021-05-14) diff --git a/README.md b/README.md index d945f529..3c94c257 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 20.3.0 + 20.5.0 pom import @@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-language - 1.102.2 + 1.102.3 ``` If you are using Gradle 5.x or later, add this to your dependencies ```Groovy -implementation platform('com.google.cloud:libraries-bom:20.3.0') +implementation platform('com.google.cloud:libraries-bom:20.5.0') compile 'com.google.cloud:google-cloud-language' ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-language:1.102.2' +compile 'com.google.cloud:google-cloud-language:1.102.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.102.2" +libraryDependencies += "com.google.cloud" % "google-cloud-language" % "1.102.3" ``` ## Authentication diff --git a/google-cloud-language-bom/pom.xml b/google-cloud-language-bom/pom.xml index b4763dfe..7d698f1e 100644 --- a/google-cloud-language-bom/pom.xml +++ b/google-cloud-language-bom/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 com.google.cloud google-cloud-language-bom - 1.102.3 + 1.103.0 pom com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 Google Cloud language BOM @@ -60,31 +60,30 @@ - + + com.google.cloud + google-cloud-language + 1.103.0 + com.google.api.grpc grpc-google-cloud-language-v1 - 1.84.3 + 1.85.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.85.3 + 0.86.0 com.google.api.grpc proto-google-cloud-language-v1 - 1.84.3 - - - com.google.cloud - google-cloud-language - 1.102.3 + 1.85.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.85.3 + 0.86.0 @@ -100,4 +99,4 @@ - \ No newline at end of file + diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml index 2f0af98f..e64b5671 100644 --- a/google-cloud-language/pom.xml +++ b/google-cloud-language/pom.xml @@ -1,9 +1,9 @@ - + 4.0.0 com.google.cloud google-cloud-language - 1.102.3 + 1.103.0 jar Google Cloud Natural Language https://github.com/googleapis/java-language @@ -11,7 +11,7 @@ com.google.cloud google-cloud-language-parent - 1.102.3 + 1.103.0 google-cloud-language @@ -116,4 +116,4 @@ - \ No newline at end of file + diff --git a/grpc-google-cloud-language-v1/pom.xml b/grpc-google-cloud-language-v1/pom.xml index 8aaf29b4..e7af2205 100644 --- a/grpc-google-cloud-language-v1/pom.xml +++ b/grpc-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1 - 1.84.3 + 1.85.0 grpc-google-cloud-language-v1 GRPC library for grpc-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 1.102.3 + 1.103.0 diff --git a/grpc-google-cloud-language-v1beta2/pom.xml b/grpc-google-cloud-language-v1beta2/pom.xml index 557523bf..4deb8e27 100644 --- a/grpc-google-cloud-language-v1beta2/pom.xml +++ b/grpc-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.85.3 + 0.86.0 grpc-google-cloud-language-v1beta2 GRPC library for grpc-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 1.102.3 + 1.103.0 diff --git a/synth.py b/owlbot.py similarity index 58% rename from synth.py rename to owlbot.py index 03a317d2..dca9d867 100644 --- a/synth.py +++ b/owlbot.py @@ -1,10 +1,10 @@ -# Copyright 2018 Google LLC +# Copyright 2021 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -12,19 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" +import synthtool as s +from synthtool.languages import java -import synthtool.languages.java as java -AUTOSYNTH_MULTIPLE_COMMITS = True - -service = 'language' -versions = ['v1', 'v1beta2'] - -for version in versions: - java.bazel_library( - service=service, - version=version, - ) +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) +s.remove_staging_dirs() java.common_templates() diff --git a/pom.xml b/pom.xml index d9c79d56..dc342e84 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-language-parent pom - 1.102.3 + 1.103.0 Google Cloud Natural Language Parent https://github.com/googleapis/java-language @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.2 + 0.12.0 @@ -70,33 +70,33 @@ com.google.api.grpc proto-google-cloud-language-v1 - 1.84.3 + 1.85.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.85.3 + 0.86.0 com.google.api.grpc grpc-google-cloud-language-v1 - 1.84.3 + 1.85.0 com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.85.3 + 0.86.0 com.google.cloud google-cloud-language - 1.102.3 + 1.103.0 com.google.cloud google-cloud-shared-dependencies - 1.1.0 + 1.2.0 pom import @@ -128,12 +128,12 @@ - proto-google-cloud-language-v1 - proto-google-cloud-language-v1beta2 + google-cloud-language grpc-google-cloud-language-v1 grpc-google-cloud-language-v1beta2 - google-cloud-language - google-cloud-language-bom + proto-google-cloud-language-v1 + proto-google-cloud-language-v1beta2 + google-cloud-language-bom @@ -168,7 +168,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html diff --git a/proto-google-cloud-language-v1/pom.xml b/proto-google-cloud-language-v1/pom.xml index da1729db..1cb9bb9d 100644 --- a/proto-google-cloud-language-v1/pom.xml +++ b/proto-google-cloud-language-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1 - 1.84.3 + 1.85.0 proto-google-cloud-language-v1 PROTO library for proto-google-cloud-language-v1 com.google.cloud google-cloud-language-parent - 1.102.3 + 1.103.0 diff --git a/proto-google-cloud-language-v1beta2/pom.xml b/proto-google-cloud-language-v1beta2/pom.xml index 1d0667a8..8a55000a 100644 --- a/proto-google-cloud-language-v1beta2/pom.xml +++ b/proto-google-cloud-language-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.85.3 + 0.86.0 proto-google-cloud-language-v1beta2 PROTO library for proto-google-cloud-language-v1beta2 com.google.cloud google-cloud-language-parent - 1.102.3 + 1.103.0 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index d21bea75..a06ea5e7 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-language - 1.102.2 + 1.102.3 @@ -42,7 +42,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 67216eb3..484ee3ac 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-language - 1.102.2 + 1.102.3 @@ -40,7 +40,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 11934382..f3d4a8d1 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.3.0 + 20.5.0 pom import @@ -53,7 +53,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/synth.metadata b/synth.metadata index 4602f558..01a2bc12 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-language.git", - "sha": "55410a1e4edefa7c1c6f9a3f0ac343433fb62a23" + "sha": "c26a57867727a2155af9febc38a68a688b39268c" } }, { @@ -27,7 +27,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4f4b1b9b8d8b52f1e9e4a76165896debce5ab7f1" + "sha": "7332178a11ddddc91188dc0f25bca1ccadcaa6c6" } } ], diff --git a/versions.txt b/versions.txt index 78ad7c2d..c7976256 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-language-v1:1.84.3:1.84.3 -proto-google-cloud-language-v1beta2:0.85.3:0.85.3 -grpc-google-cloud-language-v1:1.84.3:1.84.3 -grpc-google-cloud-language-v1beta2:0.85.3:0.85.3 -google-cloud-language:1.102.3:1.102.3 \ No newline at end of file +google-cloud-language:1.103.0:1.103.0 +grpc-google-cloud-language-v1:1.85.0:1.85.0 +grpc-google-cloud-language-v1beta2:0.86.0:0.86.0 +proto-google-cloud-language-v1:1.85.0:1.85.0 +proto-google-cloud-language-v1beta2:0.86.0:0.86.0