Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions buildscripts/kokoro/unix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,17 @@ if [[ -z "${SKIP_TESTS:-}" ]]; then
# --batch-mode reduces log spam
mvn verify --batch-mode
popd
pushd examples/example-alts
../gradlew build $GRADLE_FLAGS
popd
pushd examples/example-hostname
../gradlew build $GRADLE_FLAGS
mvn verify --batch-mode
popd
pushd examples/example-tls
../gradlew build $GRADLE_FLAGS
mvn verify --batch-mode
popd
pushd examples/example-jwt-auth
../gradlew build $GRADLE_FLAGS
mvn verify --batch-mode
popd
pushd examples/example-xds
../gradlew build $GRADLE_FLAGS
popd
for f in examples/example-*
do
pushd "$f"
../gradlew build $GRADLE_FLAGS
if [ -f "pom.xml" ]; then
# --batch-mode reduces log spam
mvn verify --batch-mode
fi
popd
done
# TODO(zpencer): also build the GAE examples
pushd examples/example-orca
../gradlew build $GRADLE_FLAGS
popd
fi

LOCAL_MVN_TEMP=$(mktemp -d)
Expand Down
2 changes: 1 addition & 1 deletion examples/example-servlet/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
"io.grpc:grpc-servlet:${grpcVersion}",
"io.grpc:grpc-stub:${grpcVersion}"

providedImplementation "javax.servlet:javax.servlet-api:4.0.1",
compileOnly "javax.servlet:javax.servlet-api:4.0.1",
"org.apache.tomcat:annotations-api:6.0.53"
}

Expand Down