Skip to content

Commit 3bfa5d6

Browse files
committed
fix showcase tests
1 parent c102cc1 commit 3bfa5d6

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.kokoro/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ excluded_modules=(
3333
'java-spanner'
3434
'java-spanner-jdbc'
3535
'google-auth-library-java'
36+
'google-auth-library-java/oauth2_http'
3637
'java-storage'
3738
'java-storage-nio'
3839
)

sdk-platform-java/.cloudbuild/library_generation/library_generation.Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,20 @@
1818

1919
FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852c9910ff5ef09de17541c2587819364b79d7dc044634dfb8a3388 AS ggj-build
2020

21-
WORKDIR /sdk-platform-java
22-
COPY sdk-platform-java/ .
21+
WORKDIR /google-cloud-java
22+
23+
COPY . .
2324
# {x-version-update-start:gapic-generator-java:current}
2425
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.68.1-SNAPSHOT"
2526
# {x-version-update-end}
2627

2728
# Download the java formatter
28-
RUN mvn -pl gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
29+
RUN mvn -pl sdk-platform-java/gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version
2930
RUN cat /java-formatter-version
3031
RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar"
3132

3233
# Compile and install packages
33-
RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip
34+
RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make
3435
RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \
3536
"./gapic-generator-java.jar"
3637

0 commit comments

Comments
 (0)