diff --git a/.kokoro/common.sh b/.kokoro/common.sh index a3bbc5f6..a8d0ea04 100644 --- a/.kokoro/common.sh +++ b/.kokoro/common.sh @@ -13,18 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. -# set -eo pipefail - function retry_with_backoff { attempts_left=$1 sleep_seconds=$2 shift 2 command=$@ + + # store current flag state + flags=$- + + # allow a failures to continue + set +e echo "${command}" ${command} exit_code=$? + # restore "e" flag + if [[ ${flags} =~ e ]] + then set -e + else set +e + fi + if [[ $exit_code == 0 ]] then return 0 @@ -42,3 +52,8 @@ function retry_with_backoff { return $exit_code } + +## Helper functionss +function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; } +function msg() { println "$*" >&2; } +function println() { printf '%s\n' "$(now) $*"; } \ No newline at end of file diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0aade871..cf3bb434 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -36,3 +36,51 @@ retry_with_backoff 3 10 \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true + +echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************" +## Run dependency list completeness check +function completenessCheck() { + # Output dep list with compile scope generated using the original pom + msg "Generating dependency list using original pom..." + mvn dependency:list -f pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | grep -v ':test$' >.org-list.txt + + # Output dep list generated using the flattened pom (test scope deps are ommitted) + msg "Generating dependency list using flattened pom..." + mvn dependency:list -f .flattened-pom.xml -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + + # Compare two dependency lists + msg "Comparing dependency lists..." + diff .org-list.txt .new-list.txt >.diff.txt + if [[ $? == 0 ]] + then + msg "Success. No diff!" + else + msg "Diff found. See below: " + msg "You can also check .diff.txt file located in $1." + cat .diff.txt + return 1 + fi +} + +# Allow failures to continue running the script +set +e + +error_count=0 +for path in $(find -name ".flattened-pom.xml") +do + # Check flattened pom in each dir that contains it for completeness + dir=$(dirname "$path") + pushd "$dir" + completenessCheck "$dir" + error_count=$(($error_count + $?)) + popd +done + +if [[ $error_count == 0 ]] +then + msg "All checks passed." + exit 0 +else + msg "Errors found. See log statements above." + exit 1 +fi diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 8bf59c02..40c4abb7 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -6,11 +6,31 @@ env_vars: { value: "gcr.io/cloud-devrel-kokoro-resources/java8" } +env_vars: { + key: "JOB_TYPE" + value: "integration" +} +# TODO: remove this after we've migrated all tests and scripts +env_vars: { + key: "GCLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + env_vars: { key: "ENABLE_BUILD_COP" value: "true" } +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" +} + before_action { fetch_keystore { keystore_resource { diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index b4b051cd..20aabd55 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -11,9 +11,15 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { key: "GCLOUD_PROJECT" - value: "gcloud-devel" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" } env_vars: { diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index 141f90c1..522e5b10 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -11,14 +11,20 @@ env_vars: { value: "integration" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "gcloud-devel" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "gcloud-devel" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg index fa7b493d..1171aead 100644 --- a/.kokoro/presubmit/samples.cfg +++ b/.kokoro/presubmit/samples.cfg @@ -11,14 +11,20 @@ env_vars: { value: "samples" } +# TODO: remove this after we've migrated all tests and scripts env_vars: { - key: "GCLOUD_PROJECT" - value: "gcloud-devel" + key: "GCLOUD_PROJECT" + value: "java-docs-samples-testing" } env_vars: { - key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + key: "GOOGLE_CLOUD_PROJECT" + value: "java-docs-samples-testing" +} + +env_vars: { + key: "GOOGLE_APPLICATION_CREDENTIALS" + value: "keystore/73713_java_it_service_account" } before_action { diff --git a/CHANGELOG.md b/CHANGELOG.md index e425b67f..f6ab8228 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.33.3](https://www.github.com/googleapis/java-webrisk/compare/v0.33.2...v0.33.3) (2020-04-20) + + +### Dependencies + +* update dependency com.google.guava:guava-bom to v29 ([#121](https://www.github.com/googleapis/java-webrisk/issues/121)) ([78e1a5f](https://www.github.com/googleapis/java-webrisk/commit/78e1a5f9971f5f41a47168ccb3437beaa1845044)) + ### [0.33.2](https://www.github.com/googleapis/java-webrisk/compare/v0.33.1...v0.33.2) (2020-04-07) diff --git a/README.md b/README.md index 8897e607..6f1719fc 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 4.4.0 + 5.1.0 pom import @@ -35,8 +35,6 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file ``` -[//]: # ({x-version-update-start:google-cloud-webrisk:released}) - If you are using Maven without BOM, add this to your dependencies: ```xml @@ -48,13 +46,15 @@ If you are using Maven without BOM, add this to your dependencies: ``` +[//]: # ({x-version-update-start:google-cloud-webrisk:released}) + If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-webrisk:0.33.2' +compile 'com.google.cloud:google-cloud-webrisk:0.33.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-webrisk" % "0.33.2" +libraryDependencies += "com.google.cloud" % "google-cloud-webrisk" % "0.33.3" ``` [//]: # ({x-version-update-end}) @@ -104,13 +104,13 @@ Java 7 or above is required for using this client. ## Versioning + This library follows [Semantic Versioning](http://semver.org/). It is currently in major version zero (``0.y.z``), which means that anything may change at any time and the public API should not be considered stable. - ## Contributing diff --git a/google-cloud-webrisk-bom/pom.xml b/google-cloud-webrisk-bom/pom.xml index a017f53b..140bf303 100644 --- a/google-cloud-webrisk-bom/pom.xml +++ b/google-cloud-webrisk-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-webrisk-bom - 0.33.2 + 0.33.3 pom com.google.cloud google-cloud-shared-config - 0.4.0 + 0.5.0 Google Cloud webrisk BOM @@ -63,27 +63,27 @@ com.google.cloud google-cloud-webrisk - 0.33.2 + 0.33.3 com.google.api.grpc grpc-google-cloud-webrisk-v1 - 0.32.2-SNAPSHOT + 0.33.3 com.google.api.grpc grpc-google-cloud-webrisk-v1beta1 - 0.33.2 + 0.33.3 com.google.api.grpc proto-google-cloud-webrisk-v1 - 0.32.2-SNAPSHOT + 0.33.3 com.google.api.grpc proto-google-cloud-webrisk-v1beta1 - 0.33.2 + 0.33.3 diff --git a/google-cloud-webrisk/pom.xml b/google-cloud-webrisk/pom.xml index cb34ab49..8122e1e3 100644 --- a/google-cloud-webrisk/pom.xml +++ b/google-cloud-webrisk/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-webrisk - 0.33.2 + 0.33.3 jar Google Cloud Web Risk https://github.com/googleapis/java-webrisk @@ -11,7 +11,7 @@ com.google.cloud google-cloud-webrisk-parent - 0.33.2 + 0.33.3 google-cloud-webrisk diff --git a/grpc-google-cloud-webrisk-v1/pom.xml b/grpc-google-cloud-webrisk-v1/pom.xml index 6e6a2dc9..62d81035 100644 --- a/grpc-google-cloud-webrisk-v1/pom.xml +++ b/grpc-google-cloud-webrisk-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-webrisk-v1 - 0.32.2-SNAPSHOT + 0.33.3 grpc-google-cloud-webrisk-v1 GRPC library for grpc-google-cloud-webrisk-v1 com.google.cloud google-cloud-webrisk-parent - 0.33.2 + 0.33.3 diff --git a/grpc-google-cloud-webrisk-v1beta1/pom.xml b/grpc-google-cloud-webrisk-v1beta1/pom.xml index 4c630200..8a470fae 100644 --- a/grpc-google-cloud-webrisk-v1beta1/pom.xml +++ b/grpc-google-cloud-webrisk-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-webrisk-v1beta1 - 0.33.2 + 0.33.3 grpc-google-cloud-webrisk-v1beta1 GRPC library for grpc-google-cloud-webrisk-v1beta1 com.google.cloud google-cloud-webrisk-parent - 0.33.2 + 0.33.3 diff --git a/pom.xml b/pom.xml index 0261b2c4..594a4b9c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-webrisk-parent pom - 0.33.2 + 0.33.3 Google Cloud Web Risk Parent https://github.com/googleapis/java-webrisk @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.4.0 + 0.5.0 @@ -70,7 +70,7 @@ 1.28.1 3.11.4 4.13 - 28.2-android + 29.0-android 1.4.3 1.3.2 1.18 @@ -81,27 +81,27 @@ com.google.api.grpc proto-google-cloud-webrisk-v1 - 0.32.2-SNAPSHOT + 0.33.3 com.google.api.grpc proto-google-cloud-webrisk-v1beta1 - 0.33.2 + 0.33.3 com.google.api.grpc grpc-google-cloud-webrisk-v1 - 0.32.2-SNAPSHOT + 0.33.3 com.google.api.grpc grpc-google-cloud-webrisk-v1beta1 - 0.33.2 + 0.33.3 com.google.cloud google-cloud-webrisk - 0.33.2 + 0.33.3 diff --git a/proto-google-cloud-webrisk-v1/pom.xml b/proto-google-cloud-webrisk-v1/pom.xml index 2352ae4d..477399af 100644 --- a/proto-google-cloud-webrisk-v1/pom.xml +++ b/proto-google-cloud-webrisk-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-webrisk-v1 - 0.32.2-SNAPSHOT + 0.33.3 proto-google-cloud-webrisk-v1 PROTO library for proto-google-cloud-webrisk-v1 com.google.cloud google-cloud-webrisk-parent - 0.33.2 + 0.33.3 diff --git a/proto-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskProto.java b/proto-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskProto.java index 5e59975f..56ed4d80 100644 --- a/proto-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskProto.java +++ b/proto-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskProto.java @@ -190,12 +190,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "K\202\323\344\223\0021\"#/v1/{parent=projects/*}/submiss" + "ions:\nsubmission\332A\021parent,submission\032J\312A" + "\026webrisk.googleapis.com\322A.https://www.go" - + "ogleapis.com/auth/cloud-platformB\242\001\n\025com" + + "ogleapis.com/auth/cloud-platformB\277\001\n\025com" + ".google.webrisk.v1B\014WebRiskProtoP\001Z>goog" + "le.golang.org/genproto/googleapis/cloud/" + "webrisk/v1;webrisk\242\002\004GCWR\252\002\027Google.Cloud" - + ".WebRisk.V1\312\002\027Google\\Cloud\\WebRisk\\V1b\006p" - + "roto3" + + ".WebRisk.V1\312\002\027Google\\Cloud\\WebRisk\\V1\352\002\032" + + "Google::Cloud::WebRisk::V1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-webrisk-v1/src/main/proto/google/cloud/webrisk/v1/webrisk.proto b/proto-google-cloud-webrisk-v1/src/main/proto/google/cloud/webrisk/v1/webrisk.proto index b85598ab..71b6b44f 100644 --- a/proto-google-cloud-webrisk-v1/src/main/proto/google/cloud/webrisk/v1/webrisk.proto +++ b/proto-google-cloud-webrisk-v1/src/main/proto/google/cloud/webrisk/v1/webrisk.proto @@ -29,6 +29,7 @@ option java_outer_classname = "WebRiskProto"; option java_package = "com.google.webrisk.v1"; option objc_class_prefix = "GCWR"; option php_namespace = "Google\\Cloud\\WebRisk\\V1"; +option ruby_package = "Google::Cloud::WebRisk::V1"; // Web Risk API defines an interface to detect malicious URLs on your // website and in client applications. diff --git a/proto-google-cloud-webrisk-v1beta1/pom.xml b/proto-google-cloud-webrisk-v1beta1/pom.xml index dccde9e9..43ab3046 100644 --- a/proto-google-cloud-webrisk-v1beta1/pom.xml +++ b/proto-google-cloud-webrisk-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-webrisk-v1beta1 - 0.33.2 + 0.33.3 proto-google-cloud-webrisk-v1beta1 PROTO library for proto-google-cloud-webrisk-v1beta1 com.google.cloud google-cloud-webrisk-parent - 0.33.2 + 0.33.3 diff --git a/proto-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskProto.java b/proto-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskProto.java index 0a7b4854..b5d86c15 100644 --- a/proto-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskProto.java +++ b/proto-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskProto.java @@ -176,12 +176,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "e\"9\202\323\344\223\002\030\022\026/v1beta1/hashes:search\332A\030hash" + "_prefix,threat_types\032J\312A\026webrisk.googlea" + "pis.com\322A.https://www.googleapis.com/aut" - + "h/cloud-platformB\266\001\n\032com.google.webrisk." + + "h/cloud-platformB\330\001\n\032com.google.webrisk." + "v1beta1B\014WebRiskProtoP\001ZCgoogle.golang.o" + "rg/genproto/googleapis/cloud/webrisk/v1b" + "eta1;webrisk\242\002\004GCWR\252\002\034Google.Cloud.WebRi" + "sk.V1Beta1\312\002\034Google\\Cloud\\WebRisk\\V1beta" - + "1b\006proto3" + + "1\352\002\037Google::Cloud::WebRisk::V1beta1b\006pro" + + "to3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-webrisk-v1beta1/src/main/proto/google/cloud/webrisk/v1beta1/webrisk.proto b/proto-google-cloud-webrisk-v1beta1/src/main/proto/google/cloud/webrisk/v1beta1/webrisk.proto index 7f8021d1..02264252 100644 --- a/proto-google-cloud-webrisk-v1beta1/src/main/proto/google/cloud/webrisk/v1beta1/webrisk.proto +++ b/proto-google-cloud-webrisk-v1beta1/src/main/proto/google/cloud/webrisk/v1beta1/webrisk.proto @@ -29,6 +29,7 @@ option java_outer_classname = "WebRiskProto"; option java_package = "com.google.webrisk.v1beta1"; option objc_class_prefix = "GCWR"; option php_namespace = "Google\\Cloud\\WebRisk\\V1beta1"; +option ruby_package = "Google::Cloud::WebRisk::V1beta1"; // Web Risk v1beta1 API defines an interface to detect malicious URLs on your // website and in client applications. diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 5ab065b0..c422fb34 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.15 + 1.0.17 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-webrisk - 0.33.1 + 0.33.2 diff --git a/samples/pom.xml b/samples/pom.xml index c3b57a5d..ac69c4d6 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.17 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 6132c947..789901e9 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.17 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-webrisk - 0.33.1 + 0.33.2 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 163ef7d0..6c0d34cf 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.15 + 1.0.17 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 4.4.1 + 5.1.0 pom import diff --git a/synth.metadata b/synth.metadata index f5a7d8a1..3c26a4a2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,27 +1,33 @@ { - "updateTime": "2020-04-02T01:28:43.759017Z", "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-webrisk.git", + "sha": "308934f3048610d2f9bac223ffdf7b72524e9ac8" + } + }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545", - "internalRef": "302980301" + "sha": "9ede34d093b9d786a974448fc7a3a17948c203e2", + "internalRef": "305327985" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545", - "internalRef": "302980301" + "sha": "9ede34d093b9d786a974448fc7a3a17948c203e2", + "internalRef": "305327985" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" + "sha": "f8a9933e5e98202b04ef427f28d1d79221190fa4" } } ], diff --git a/versions.txt b/versions.txt index 2bffd2a8..f7fc72a4 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-webrisk-v1beta1:0.33.2:0.33.2 -grpc-google-cloud-webrisk-v1beta1:0.33.2:0.33.2 -google-cloud-webrisk:0.33.2:0.33.2 +proto-google-cloud-webrisk-v1:0.33.3:0.33.3 +proto-google-cloud-webrisk-v1beta1:0.33.3:0.33.3 +grpc-google-cloud-webrisk-v1:0.33.3:0.33.3 +grpc-google-cloud-webrisk-v1beta1:0.33.3:0.33.3 +google-cloud-webrisk:0.33.3:0.33.3