Skip to content

Commit 927909b

Browse files
authored
chore: fix storage downstream check to use sdk-platform-java-config artifact (#759)
* chore: fix storage downstream check to use sdk-platform-java-config artifact
1 parent ece0e41 commit 927909b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

.kokoro/client-library-check.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}"
111111
replace_java_shared_dependencies_version "${RELEASED_SHARED_DEPENDENCIES_VERSION}"
112112
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V -q
113113
popd
114+
popd
114115

115116
# Check this BOM against a few java client libraries
116117
# java-bigquery
@@ -122,9 +123,9 @@ fi
122123

123124
pushd ${REPO}
124125

125-
# TODO(#748): Replace the version of sdk-platform-java-config for all libraries. This logic will no longer
126-
# be needed after the rest of the handwritten libraries are migrated to use this artifact.
127-
if [ "$REPO" == "java-storage" ]; then
126+
# If using an older version of java-storage, continue replacing java-shared-config version otherwise replace
127+
# the version of sdk-platform-java-config.
128+
if [ "${REPO_TAG}" == "v2.9.3" ] && [ "${REPO}" == "java-storage" ]; then
128129
replace_java_shared_config_version "${JAVA_SHARED_CONFIG_VERSION}"
129130
else
130131
replace_sdk_platform_java_config_version "${SDK_PLATFORM_JAVA_CONFIG_VERSION}"
@@ -137,7 +138,9 @@ dependencies)
137138
;;
138139
flatten-plugin)
139140
# This creates .flattened-pom.xml
141+
echo "Before running .kokoro/build.sh"
140142
.kokoro/build.sh
143+
echo "After running .kokoro/build.sh"
141144
pushd google-cloud-*
142145
mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true \
143146
| grep '\[INFO] .*:.*:.*:.*:.*' |awk '{print $2}' > .actual-flattened-dependencies-list.txt

0 commit comments

Comments
 (0)