diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index d7476cfe..bb299fcb 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -66,11 +66,11 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt + mvn dependency:list -f pom.xml -DexcludeArtifactIds=gson -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." - mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt + mvn dependency:list -f .flattened-pom.xml -DexcludeArtifactIds=gson -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' >.new-list.txt # Compare two dependency lists msg "Comparing dependency lists..." diff --git a/README.md b/README.md index 8893d42c..a2bbae56 100644 --- a/README.md +++ b/README.md @@ -57,13 +57,13 @@ implementation 'com.google.cloud:google-cloud-monitoring' If you are using Gradle without BOM, add this to your dependencies: ```Groovy -implementation 'com.google.cloud:google-cloud-monitoring:3.3.5' +implementation 'com.google.cloud:google-cloud-monitoring:3.3.6' ``` If you are using SBT, add this to your dependencies: ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "3.3.5" +libraryDependencies += "com.google.cloud" % "google-cloud-monitoring" % "3.3.6" ``` ## Authentication diff --git a/google-cloud-monitoring-bom/pom.xml b/google-cloud-monitoring-bom/pom.xml index a86128c7..b5030e4b 100644 --- a/google-cloud-monitoring-bom/pom.xml +++ b/google-cloud-monitoring-bom/pom.xml @@ -8,7 +8,7 @@ com.google.cloud google-cloud-shared-config - 1.5.0 + 1.5.3 Google Cloud Monitoring BOM diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml index 9b0164a1..4b87ab4c 100644 --- a/google-cloud-monitoring/pom.xml +++ b/google-cloud-monitoring/pom.xml @@ -79,6 +79,7 @@ com.google.auth google-auth-library-oauth2-http + test diff --git a/owlbot.py b/owlbot.py index f9c5e127..67776e87 100644 --- a/owlbot.py +++ b/owlbot.py @@ -40,4 +40,6 @@ def fix_resource(client, version, name): s.move(library) s.remove_staging_dirs() -java.common_templates() +java.common_templates(excludes=[ + '.kokoro/dependencies.sh', +]) diff --git a/pom.xml b/pom.xml index 3a94fec2..9acc9de9 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.5.0 + 1.5.3