diff --git a/.github/release-please.yml b/.github/release-please.yml index 82744682..dce2c845 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1 +1,2 @@ releaseType: java-yoshi +bumpMinorPreMajor: true \ No newline at end of file diff --git a/.kokoro/build.sh b/.kokoro/build.sh index fa132f41..dc2936ef 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -27,6 +27,7 @@ echo ${JOB_TYPE} mvn install -B -V \ -DskipTests=true \ -Dclirr.skip=true \ + -Denforcer.skip=true \ -Dmaven.javadoc.skip=true \ -Dgcloud.download.skip=true \ -T 1C @@ -38,7 +39,7 @@ fi case ${JOB_TYPE} in test) - mvn test -B -Dclirr.skip=true + mvn test -B -Dclirr.skip=true -Denforcer.skip=true bash ${KOKORO_GFILE_DIR}/codecov.sh bash .kokoro/coerce_logs.sh ;; @@ -49,12 +50,17 @@ javadoc) mvn javadoc:javadoc javadoc:test-javadoc ;; integration) - mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify + mvn -B ${INTEGRATION_TEST_ARGS} \ + -DtrimStackTrace=false \ + -Dclirr.skip=true \ + -Denforcer.skip=true \ + -fae \ + verify bash .kokoro/coerce_logs.sh ;; clirr) - mvn -B clirr:check + mvn -B -Denforcer.skip=true clirr:check ;; *) ;; -esac \ No newline at end of file +esac diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 939cf513..5ca92dc6 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -23,5 +23,9 @@ echo $JOB_TYPE export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" -mvn install -DskipTests=true -B -V +# this should run maven enforcer +mvn install -B -V \ + -DskipTests=true \ + -Dclirr.skip=true + mvn -B dependency:analyze -DfailOnWarning=true diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg index 02476d6a..69e3b1bb 100644 --- a/.kokoro/release/drop.cfg +++ b/.kokoro/release/drop.cfg @@ -4,6 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-texttospeech/.kokoro/release/drop.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-texttospeech" \ No newline at end of file diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg index e55fad5a..9e53d3aa 100644 --- a/.kokoro/release/promote.cfg +++ b/.kokoro/release/promote.cfg @@ -4,7 +4,3 @@ env_vars: { key: "TRAMPOLINE_BUILD_FILE" value: "github/java-texttospeech/.kokoro/release/promote.sh" } - -# Download staging properties file. -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/java/releases/java-texttospeech" - diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 6caa05c2..852efeee 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader # compile all packages mvn clean install -B -DskipTests=true -NAME=texttospeech +NAME=google-cloud-texttospeech VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3) # build the docs diff --git a/CHANGELOG.md b/CHANGELOG.md index d3d30e04..e9bb504a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.117.1](https://www.github.com/googleapis/java-texttospeech/compare/v0.117.0...v0.117.1) (2019-12-03) + + +### Dependencies + +* update dependency com.google.protobuf:protobuf-java to v3.11.1 ([#21](https://www.github.com/googleapis/java-texttospeech/issues/21)) ([4ed1fa7](https://www.github.com/googleapis/java-texttospeech/commit/4ed1fa7db36b2ef77691fc43cddbf2ed5009293e)) +* update gax.version to v1.50.1 ([#12](https://www.github.com/googleapis/java-texttospeech/issues/12)) ([e0f041d](https://www.github.com/googleapis/java-texttospeech/commit/e0f041d188ba620c60e168af7099fd94c68d94b3)) + ## [0.117.0](https://www.github.com/googleapis/java-texttospeech/compare/v0.116.0...v0.117.0) (2019-10-25) diff --git a/README.md b/README.md index d980e51b..c5d5161c 100644 --- a/README.md +++ b/README.md @@ -15,23 +15,41 @@ Java idiomatic client for [Cloud Text-to-Speech][cloud-texttospeech]. Quickstart ---------- +If you are using Maven with a BOM, add this to your pom.xml file. +```xml + + + + com.google.cloud + libraries-bom + 2.8.0 + pom + import + + + + + com.google.cloud + google-cloud-texttospeech + +``` [//]: # ({x-version-update-start:google-cloud-texttospeech:released}) -If you are using Maven, add this to your pom.xml file +If you are using Maven without BOM, add this to your dependencies. ```xml com.google.cloud google-cloud-texttospeech - 0.117.0-beta + 0.117.1-beta ``` If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-texttospeech:0.117.0-beta' +compile 'com.google.cloud:google-cloud-texttospeech:0.117.1-beta' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.117.0-beta" +libraryDependencies += "com.google.cloud" % "google-cloud-texttospeech" % "0.117.1-beta" ``` [//]: # ({x-version-update-end}) diff --git a/google-cloud-texttospeech-bom/pom.xml b/google-cloud-texttospeech-bom/pom.xml index 6cdbedae..d58b7538 100644 --- a/google-cloud-texttospeech-bom/pom.xml +++ b/google-cloud-texttospeech-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-texttospeech-bom - 0.117.0-beta + 0.117.1-beta pom com.google.cloud google-cloud-shared-config - 0.2.1 + 0.3.0 Google Cloud texttospeech BOM @@ -64,27 +64,27 @@ com.google.cloud google-cloud-texttospeech - 0.117.0-beta + 0.117.1-beta com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.82.0 + 0.82.1 com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 0.82.0 + 0.82.1 com.google.api.grpc proto-google-cloud-texttospeech-v1 - 0.82.0 + 0.82.1 com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.82.0 + 0.82.1 diff --git a/google-cloud-texttospeech/pom.xml b/google-cloud-texttospeech/pom.xml index ddeebbe8..c1b5a25c 100644 --- a/google-cloud-texttospeech/pom.xml +++ b/google-cloud-texttospeech/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-texttospeech - 0.117.0-beta + 0.117.1-beta jar Google Cloud Text-to-Speech https://github.com/googleapis/java-texttospeech @@ -11,7 +11,7 @@ com.google.cloud google-cloud-texttospeech-parent - 0.117.0-beta + 0.117.1-beta google-cloud-texttospeech diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java index 052e2202..03ab54f6 100644 --- a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java +++ b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/TextToSpeechClientTest.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -47,7 +48,8 @@ public class TextToSpeechClientTest { public static void startStaticServer() { mockTextToSpeech = new MockTextToSpeech(); serviceHelper = - new MockServiceHelper("in-process-1", Arrays.asList(mockTextToSpeech)); + new MockServiceHelper( + UUID.randomUUID().toString(), Arrays.asList(mockTextToSpeech)); serviceHelper.start(); } diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/it/ITSystemTest.java b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/it/ITSystemTest.java index 2224fe8b..c56679fd 100644 --- a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/it/ITSystemTest.java +++ b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1/it/ITSystemTest.java @@ -14,12 +14,23 @@ * limitations under the License. */ -package com.google.cloud.texttospeech.v1; +package com.google.cloud.texttospeech.v1.it; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.texttospeech.v1.AudioConfig; +import com.google.cloud.texttospeech.v1.AudioEncoding; +import com.google.cloud.texttospeech.v1.ListVoicesRequest; +import com.google.cloud.texttospeech.v1.ListVoicesResponse; +import com.google.cloud.texttospeech.v1.SsmlVoiceGender; +import com.google.cloud.texttospeech.v1.SynthesisInput; +import com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse; +import com.google.cloud.texttospeech.v1.TextToSpeechClient; +import com.google.cloud.texttospeech.v1.Voice; +import com.google.cloud.texttospeech.v1.VoiceSelectionParams; import com.google.protobuf.ByteString; import java.io.IOException; import java.util.List; -import org.junit.Assert; import org.junit.Test; public class ITSystemTest { @@ -43,7 +54,7 @@ public void synthesizeSpeechTest() throws IOException { ByteString audioContents = response.getAudioContent(); - Assert.assertTrue(!audioContents.isEmpty()); + assertTrue(!audioContents.isEmpty()); } } @@ -55,7 +66,7 @@ public void listVoicesTest() throws IOException { ListVoicesResponse response = textToSpeechClient.listVoices(request); List voices = response.getVoicesList(); - Assert.assertTrue(!voices.isEmpty()); + assertTrue(!voices.isEmpty()); } } } diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java index 6afd5805..7a4ed36e 100644 --- a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java +++ b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechClientTest.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -47,7 +48,8 @@ public class TextToSpeechClientTest { public static void startStaticServer() { mockTextToSpeech = new MockTextToSpeech(); serviceHelper = - new MockServiceHelper("in-process-1", Arrays.asList(mockTextToSpeech)); + new MockServiceHelper( + UUID.randomUUID().toString(), Arrays.asList(mockTextToSpeech)); serviceHelper.start(); } diff --git a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/it/ITSystemTest.java b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/it/ITSystemTest.java index 8b3c8ebe..8faf8500 100644 --- a/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/it/ITSystemTest.java +++ b/google-cloud-texttospeech/src/test/java/com/google/cloud/texttospeech/v1beta1/it/ITSystemTest.java @@ -14,12 +14,23 @@ * limitations under the License. */ -package com.google.cloud.texttospeech.v1beta1; +package com.google.cloud.texttospeech.v1beta1.it; +import static org.junit.Assert.assertTrue; + +import com.google.cloud.texttospeech.v1beta1.AudioConfig; +import com.google.cloud.texttospeech.v1beta1.AudioEncoding; +import com.google.cloud.texttospeech.v1beta1.ListVoicesRequest; +import com.google.cloud.texttospeech.v1beta1.ListVoicesResponse; +import com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender; +import com.google.cloud.texttospeech.v1beta1.SynthesisInput; +import com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse; +import com.google.cloud.texttospeech.v1beta1.TextToSpeechClient; +import com.google.cloud.texttospeech.v1beta1.Voice; +import com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams; import com.google.protobuf.ByteString; import java.io.IOException; import java.util.List; -import org.junit.Assert; import org.junit.Test; public class ITSystemTest { @@ -43,7 +54,7 @@ public void synthesizeSpeechTest() throws IOException { ByteString audioContents = response.getAudioContent(); - Assert.assertTrue(!audioContents.isEmpty()); + assertTrue(!audioContents.isEmpty()); } } @@ -55,7 +66,7 @@ public void listVoicesTest() throws IOException { ListVoicesResponse response = textToSpeechClient.listVoices(request); List voices = response.getVoicesList(); - Assert.assertTrue(!voices.isEmpty()); + assertTrue(!voices.isEmpty()); } } } diff --git a/grpc-google-cloud-texttospeech-v1/pom.xml b/grpc-google-cloud-texttospeech-v1/pom.xml index 9729909b..70fe233d 100644 --- a/grpc-google-cloud-texttospeech-v1/pom.xml +++ b/grpc-google-cloud-texttospeech-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 0.82.0 + 0.82.1 grpc-google-cloud-texttospeech-v1 GRPC library for grpc-google-cloud-texttospeech-v1 com.google.cloud google-cloud-texttospeech-parent - 0.117.0-beta + 0.117.1-beta diff --git a/grpc-google-cloud-texttospeech-v1beta1/pom.xml b/grpc-google-cloud-texttospeech-v1beta1/pom.xml index 96526858..c86e5bc4 100644 --- a/grpc-google-cloud-texttospeech-v1beta1/pom.xml +++ b/grpc-google-cloud-texttospeech-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.82.0 + 0.82.1 grpc-google-cloud-texttospeech-v1beta1 GRPC library for grpc-google-cloud-texttospeech-v1beta1 com.google.cloud google-cloud-texttospeech-parent - 0.117.0-beta + 0.117.1-beta diff --git a/pom.xml b/pom.xml index 90bd7d55..460f35b7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-texttospeech-parent pom - 0.117.0-beta + 0.117.1-beta Google Cloud Text-to-Speech Parent https://github.com/googleapis/java-texttospeech @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.2.1 + 0.3.0 @@ -66,9 +66,9 @@ 1.91.1 1.8.1 1.17.0 - 1.49.1 - 1.24.1 - 3.10.0 + 1.50.1 + 1.25.0 + 3.11.1 4.12 28.1-android 1.4.0 @@ -81,27 +81,27 @@ com.google.api.grpc proto-google-cloud-texttospeech-v1 - 0.82.0 + 0.82.1 com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.82.0 + 0.82.1 com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.82.0 + 0.82.1 com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 0.82.0 + 0.82.1 com.google.cloud google-cloud-texttospeech - 0.117.0-beta + 0.117.1-beta diff --git a/proto-google-cloud-texttospeech-v1/pom.xml b/proto-google-cloud-texttospeech-v1/pom.xml index 6cb9ad1d..586970e5 100644 --- a/proto-google-cloud-texttospeech-v1/pom.xml +++ b/proto-google-cloud-texttospeech-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-texttospeech-v1 - 0.82.0 + 0.82.1 proto-google-cloud-texttospeech-v1 PROTO library for proto-google-cloud-texttospeech-v1 com.google.cloud google-cloud-texttospeech-parent - 0.117.0-beta + 0.117.1-beta diff --git a/proto-google-cloud-texttospeech-v1beta1/pom.xml b/proto-google-cloud-texttospeech-v1beta1/pom.xml index ced210b6..694904fc 100644 --- a/proto-google-cloud-texttospeech-v1beta1/pom.xml +++ b/proto-google-cloud-texttospeech-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.82.0 + 0.82.1 proto-google-cloud-texttospeech-v1beta1 PROTO library for proto-google-cloud-texttospeech-v1beta1 com.google.cloud google-cloud-texttospeech-parent - 0.117.0-beta + 0.117.1-beta diff --git a/synth.metadata b/synth.metadata index 7796b276..5c5da0a4 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,18 +1,26 @@ { - "updateTime": "2019-09-10T07:55:44.791288Z", + "updateTime": "2019-11-19T20:01:28.497135Z", "sources": [ { "generator": { "name": "artman", - "version": "0.36.2", - "dockerImage": "googleapis/artman@sha256:0e6f3a668cd68afc768ecbe08817cf6e56a0e64fcbdb1c58c3b97492d12418a1" + "version": "0.42.1", + "dockerImage": "googleapis/artman@sha256:c773192618c608a7a0415dd95282f841f8e6bcdef7dd760a988c93b77a64bd57" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "26e189ad03ba63591fb26eecb6aaade7ad39f57a" + "sha": "5af83f47b9656261cafcf88b0b3334521ab266b3", + "internalRef": "281334391" + } + }, + { + "template": { + "name": "java_library", + "origin": "synthtool.gcp", + "version": "2019.10.17" } } ], diff --git a/versions.txt b/versions.txt index dd9e48a5..eecd01e6 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-texttospeech-v1:0.82.0:0.82.0 -proto-google-cloud-texttospeech-v1beta1:0.82.0:0.82.0 -grpc-google-cloud-texttospeech-v1beta1:0.82.0:0.82.0 -grpc-google-cloud-texttospeech-v1:0.82.0:0.82.0 -google-cloud-texttospeech:0.117.0-beta:0.117.0-beta +proto-google-cloud-texttospeech-v1:0.82.1:0.82.1 +proto-google-cloud-texttospeech-v1beta1:0.82.1:0.82.1 +grpc-google-cloud-texttospeech-v1beta1:0.82.1:0.82.1 +grpc-google-cloud-texttospeech-v1:0.82.1:0.82.1 +google-cloud-texttospeech:0.117.1-beta:0.117.1-beta