diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
index 5cf7ba49..46edbf7f 100755
--- a/.kokoro/coerce_logs.sh
+++ b/.kokoro/coerce_logs.sh
@@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME})
echo "coercing sponge logs..."
for xml in `find . -name *-sponge_log.xml`
do
- echo "processing ${xml}"
class=$(basename ${xml} | cut -d- -f2)
dir=$(dirname ${xml})/${job}/${class}
text=$(dirname ${xml})/${class}-sponge_log.txt
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 59d2aafc..9030ba8f 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -14,6 +14,7 @@
# limitations under the License.
set -eo pipefail
+shopt -s nullglob
## Get the directory of the build script
scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
@@ -46,7 +47,7 @@ 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/\\s--\\smodule.*// >.org-list.txt
+ mvn dependency:list -f pom.xml -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..."
@@ -70,7 +71,7 @@ function completenessCheck() {
set +e
error_count=0
-for path in $(find -name ".flattened-pom.xml")
+for path in **/.flattened-pom.xml
do
# Check flattened pom in each dir that contains it for completeness
dir=$(dirname "$path")
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f59f0a0..2ddf93aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,34 @@
# Changelog
+## [1.4.0](https://www.github.com/googleapis/java-shared-dependencies/compare/1.3.0...v1.4.0) (2021-06-30)
+
+
+### Features
+
+* add grpc-gcp to dependencyManagement ([#389](https://www.github.com/googleapis/java-shared-dependencies/issues/389)) ([57fd2e6](https://www.github.com/googleapis/java-shared-dependencies/commit/57fd2e646e28e37e0b5e4e1b37425d4897a8776f))
+
+
+### Bug Fixes
+
+* Add `shopt -s nullglob` to dependencies script ([#392](https://www.github.com/googleapis/java-shared-dependencies/issues/392)) ([f8f29df](https://www.github.com/googleapis/java-shared-dependencies/commit/f8f29df1c9cc6eca517c99113fb9509fd611ac92))
+* Add common httpclient and oauth dependencies ([#391](https://www.github.com/googleapis/java-shared-dependencies/issues/391)) ([09660e1](https://www.github.com/googleapis/java-shared-dependencies/commit/09660e1e50c96dcd7df4e80d8ad357f8256eda6c))
+* Update dependencies.sh to not break on mac ([#384](https://www.github.com/googleapis/java-shared-dependencies/issues/384)) ([0ae2841](https://www.github.com/googleapis/java-shared-dependencies/commit/0ae2841d7ce2885d041795c58a38d2d3973c2e5a))
+
+
+### Dependencies
+
+* update dependency com.google.api-client:google-api-client-bom to v1.32.1 ([#390](https://www.github.com/googleapis/java-shared-dependencies/issues/390)) ([00288c1](https://www.github.com/googleapis/java-shared-dependencies/commit/00288c18d09616582c8bec961ecc5c00ef1d4288))
+* update dependency com.google.api:api-common to v1.10.4 ([#385](https://www.github.com/googleapis/java-shared-dependencies/issues/385)) ([5f2b39b](https://www.github.com/googleapis/java-shared-dependencies/commit/5f2b39b5bdc4cec9d5ab2f050e11000ed372d057))
+* update dependency com.google.api:gax-grpc to v1.65.1 ([#382](https://www.github.com/googleapis/java-shared-dependencies/issues/382)) ([a2a1547](https://www.github.com/googleapis/java-shared-dependencies/commit/a2a15471dee21207a0b97b3bc8f6f59d6a4a2d13))
+* update dependency com.google.protobuf:protobuf-bom to v3.17.3 ([#379](https://www.github.com/googleapis/java-shared-dependencies/issues/379)) ([6f43eb5](https://www.github.com/googleapis/java-shared-dependencies/commit/6f43eb553dca98140d343bee3f1003096d79ee6c))
+* update dependency io.grpc:grpc-bom to v1.38.1 ([#386](https://www.github.com/googleapis/java-shared-dependencies/issues/386)) ([7b1d4cf](https://www.github.com/googleapis/java-shared-dependencies/commit/7b1d4cf317fbd75b91d6a63f82b5fc2f46eaf3ca))
+* update dependency io.grpc:grpc-bom to v1.39.0 ([#394](https://www.github.com/googleapis/java-shared-dependencies/issues/394)) ([ebc8af6](https://www.github.com/googleapis/java-shared-dependencies/commit/ebc8af6b3f850b58b35d9720a7a0b1545d4616bd))
+* update gax.version to v1.66.0 ([#395](https://www.github.com/googleapis/java-shared-dependencies/issues/395)) ([c73f73e](https://www.github.com/googleapis/java-shared-dependencies/commit/c73f73e84740a8117be342a66e179eaf3e29c6fd))
+* update google.core.version to v1.95.1 ([#381](https://www.github.com/googleapis/java-shared-dependencies/issues/381)) ([4496153](https://www.github.com/googleapis/java-shared-dependencies/commit/44961532f621b0ab19e9e7feebb7d588aef5d423))
+* update google.core.version to v1.95.2 ([#383](https://www.github.com/googleapis/java-shared-dependencies/issues/383)) ([7216859](https://www.github.com/googleapis/java-shared-dependencies/commit/7216859bcd67fa1ce1119831c33c50a2d5b79324))
+* update google.core.version to v1.95.3 ([#388](https://www.github.com/googleapis/java-shared-dependencies/issues/388)) ([354e4e8](https://www.github.com/googleapis/java-shared-dependencies/commit/354e4e811f4ba886406681a4261ac0455a9eb2d2))
+* update google.core.version to v1.95.4 ([#393](https://www.github.com/googleapis/java-shared-dependencies/issues/393)) ([be78ad8](https://www.github.com/googleapis/java-shared-dependencies/commit/be78ad85e31d8876eabafee7aa8242712573cb46))
+
## [1.3.0](https://www.github.com/googleapis/java-shared-dependencies/compare/1.2.0...v1.3.0) (2021-06-03)
diff --git a/README.md b/README.md
index 8740845c..b37dc4cf 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ If you are using Maven, use this artifact as your project's parent.
com.google.cloud
google-cloud-shared-dependencies
- 1.3.0
+ 1.4.0
pom
import
diff --git a/pom.xml b/pom.xml
index 3803cd26..3f58b570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-shared-dependencies
pom
- 1.3.0
+ 1.4.0
Google Cloud Shared Dependencies
https://github.com/googleapis/java-shared-dependencies
@@ -55,16 +55,18 @@
UTF-8
${project.artifactId}
- 1.38.0
- 1.65.0
+ 1.39.0
+ 1.66.0
+ 1.0.0
30.1.1-android
- 3.17.2
- 1.10.3
+ 3.17.3
+ 1.10.4
2.3.2
- 1.95.0
+ 1.95.4
0.26.0
1.39.2
- 1.31.5
+ 1.31.5
+ 1.32.1
2.8.7
1.5.1
1.3.2
@@ -75,6 +77,8 @@
2.7.1
2.12.3
1.15
+ 4.4.14
+ 4.5.13
@@ -93,6 +97,11 @@
pom
import
+
+ com.google.cloud
+ grpc-gcp
+ ${grpc-gcp.version}
+
com.google.guava
guava-bom
@@ -108,6 +117,19 @@
pom
import
+
+
+
+ org.apache.httpcomponents
+ httpcore
+ ${httpcomponents.httpcore.version}
+
+
+ org.apache.httpcomponents
+ httpclient
+ ${httpcomponents.httpclient.version}
+
+
com.google.api
api-common
@@ -149,6 +171,13 @@
pom
import
+
+ com.google.oauth-client
+ google-oauth-client-bom
+ ${google.oauth-client.version}
+ pom
+ import
+
com.google.api-client
google-api-client-bom
diff --git a/synth.metadata b/synth.metadata
index adb93e57..3f2c6397 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,14 +4,14 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-shared-dependencies.git",
- "sha": "4b4dc836196e6c4d08725f201aa0f14fe145e3b3"
+ "sha": "7b87c9aff5604dd894296a641fb34a3e8a73395c"
}
},
{
"git": {
"name": "synthtool",
"remote": "https://github.com/googleapis/synthtool.git",
- "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47"
+ "sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
}
}
],
@@ -79,6 +79,7 @@
"CODE_OF_CONDUCT.md",
"CONTRIBUTING.md",
"LICENSE",
+ "SECURITY.md",
"codecov.yaml",
"java.header",
"license-checks.xml"
diff --git a/versions.txt b/versions.txt
index aa3de0b3..bb4beeb8 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,4 +1,4 @@
# Format:
# module:released-version:current-version
-google-cloud-shared-dependencies:1.3.0:1.3.0
\ No newline at end of file
+google-cloud-shared-dependencies:1.4.0:1.4.0
\ No newline at end of file