This is an automated email from the ASF dual-hosted git repository.
ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 4774ac7 [BEAM-13430] Upgrade beam to gradle 7.3.2 (#16319)
4774ac7 is described below
commit 4774ac713f427fefb38114f661516faef26d8207
Author: dpcollins-google <40498610+dpcollins-goo...@users.noreply.github.com>
AuthorDate: Thu Dec 23 12:32:17 2021 -0500
[BEAM-13430] Upgrade beam to gradle 7.3.2 (#16319)
* [BEAM-13430] Upgrade beam to gradle 7.3.2
* [BEAM-13430] Clean up tests that override the time of the JVM
* [BEAM-13430] Remove shadow override
---
buildSrc/build.gradle.kts | 15 +-
.../jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar | Bin 5628292 -> 0 bytes
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 11 +-
gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew | 257 ++++++++++++---------
ownership/JAVA_DEPENDENCY_OWNERS.yaml | 5 -
runners/flink/job-server/flink_job_server.gradle | 1 +
runners/samza/job-server/build.gradle | 1 +
runners/spark/job-server/spark_job_server.gradle | 5 +-
runners/spark/spark_runner.gradle | 2 +-
.../SubscriptionPartitionProcessorImplTest.java | 4 +
12 files changed, 172 insertions(+), 131 deletions(-)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 3339eba..0f3b42d 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -31,31 +31,28 @@ repositories {
url = uri("https://repo.spring.io/plugins-release/";)
content { includeGroup("io.spring.gradle") }
}
- flatDir { dirs("jarlibs") }
}
// Dependencies on other plugins used when this plugin is invoked
dependencies {
implementation(gradleApi())
implementation(localGroovy())
-
implementation("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT")
-
implementation("gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0")
+ implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
+ implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.3")
- runtimeOnly("net.ltgt.gradle:gradle-apt-plugin:0.21")
// Enable a Java annotation processor
runtimeOnly("com.google.protobuf:protobuf-gradle-plugin:0.8.13")
// Enable proto code generation
runtimeOnly("com.commercehub.gradle.plugin:gradle-avro-plugin:0.11.0")
// Enable Avro code generation
runtimeOnly("com.diffplug.spotless:spotless-plugin-gradle:5.6.1")
// Enable a code formatting plugin
- runtimeOnly("gradle.plugin.com.github.blindpirate:gogradle:0.11.4")
// Enable Go code compilation
runtimeOnly("gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.22.0")
// Enable building Docker containers
runtimeOnly("gradle.plugin.com.dorongold.plugins:task-tree:1.5")
// Adds a 'taskTree' task to print task dependency
tree
-
runtimeOnly("com.github.jengelman.gradle.plugins:shadow:6.1.0-log4jfix-SNAPSHOT")
// Enable shading Java dependencies
+ runtimeOnly("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
// Enable shading Java dependencies
runtimeOnly("ca.coglinc:javacc-gradle-plugin:2.4.0")
// Enable the JavaCC parser generator
runtimeOnly("net.linguica.gradle:maven-settings-plugin:0.5")
runtimeOnly("gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.5.0")
// Enable creating an offline repository
runtimeOnly("net.ltgt.gradle:gradle-errorprone-plugin:1.2.1")
// Enable errorprone Java static analysis
- runtimeOnly("org.ajoberstar.grgit:grgit-gradle:4.0.2")
// Enable website git publish to asf-site branch
- runtimeOnly("com.avast.gradle:gradle-docker-compose-plugin:0.13.2")
// Enable docker compose tasks
- runtimeOnly("ca.cutterslade.gradle:gradle-dependency-analyze:1.4.3")
// Enable dep analysis
+ runtimeOnly("org.ajoberstar.grgit:grgit-gradle:4.1.1")
// Enable website git publish to asf-site branch
+ runtimeOnly("com.avast.gradle:gradle-docker-compose-plugin:0.14.12")
// Enable docker compose tasks
+ runtimeOnly("ca.cutterslade.gradle:gradle-dependency-analyze:1.8.3")
// Enable dep analysis
runtimeOnly("gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.4.11")
// Enable dep vulnerability analysis
runtimeOnly("org.checkerframework:checkerframework-gradle-plugin:0.5.16")
// Enable enhanced static checking plugin
}
diff --git a/buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar
b/buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar
deleted file mode 100644
index 8ebd239..0000000
Binary files a/buildSrc/jarlibs/shadow-6.1.0-log4jfix-SNAPSHOT.jar and
/dev/null differ
diff --git
a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 63727b4..76d7b47 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -965,12 +965,6 @@ class BeamModulePlugin implements Plugin<Project> {
project.artifacts.archives project.packageTests
}
- // Configures annotation processing for commonly used annotation
processors
- // across all Java projects.
- project.apply plugin: "net.ltgt.apt"
- // let idea apt plugin handle the ide integration
- project.apply plugin: "net.ltgt.apt-idea"
-
// Note that these plugins specifically use the compileOnly and
testCompileOnly
// configurations because they are never required to be shaded or become
a
// dependency of the output.
@@ -1050,12 +1044,11 @@ class BeamModulePlugin implements Plugin<Project> {
}
project.check.dependsOn project.javadoc
- // Apply the eclipse and apt-eclipse plugins. This adds the "eclipse"
task and
+ // Apply the eclipse plugins. This adds the "eclipse" task and
// connects the apt-eclipse plugin to update the eclipse project files
// with the instructions needed to run apt within eclipse to handle the
AutoValue
// and additional annotations
project.apply plugin: 'eclipse'
- project.apply plugin: "net.ltgt.apt-eclipse"
// Enables a plugin which can apply code formatting to source.
project.apply plugin: "com.diffplug.spotless"
@@ -1244,7 +1237,7 @@ class BeamModulePlugin implements Plugin<Project> {
project.dependencies {
shadowTestRuntimeClasspath it.project(path: project.path,
configuration: "shadowTest")
- shadowTestRuntimeClasspath it.project(path: project.path,
configuration: "compileOnly")
+ shadowTestRuntimeClasspath it.project(path: project.path)
}
project.test { classpath =
project.configurations.shadowTestRuntimeClasspath }
diff --git a/gradle/wrapper/gradle-wrapper.jar
b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..7454180 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and
b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 3ab0b72..d2880ba 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..1b6c787 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+#
https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no
leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to
pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to
match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no
'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ;
then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\"
\"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ###
Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ###
Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with
options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX
filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5"
"$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ;
done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes
removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
-# Collect all arguments for the java command, following the shell quoting and
substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
"\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\""
org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/ownership/JAVA_DEPENDENCY_OWNERS.yaml
b/ownership/JAVA_DEPENDENCY_OWNERS.yaml
index ad117f2..063b2bcc 100644
--- a/ownership/JAVA_DEPENDENCY_OWNERS.yaml
+++ b/ownership/JAVA_DEPENDENCY_OWNERS.yaml
@@ -544,11 +544,6 @@ deps:
artifact: jna
owners:
- net.ltgt.gradle:gradle-apt-plugin:
- group: net.ltgt.gradle
- artifact: gradle-apt-plugin
- owners:
-
net.ltgt.gradle:gradle-errorprone-plugin:
group: net.ltgt.gradle
artifact: gradle-errorprone-plugin
diff --git a/runners/flink/job-server/flink_job_server.gradle
b/runners/flink/job-server/flink_job_server.gradle
index 3dd07bc..07ce308 100644
--- a/runners/flink/job-server/flink_job_server.gradle
+++ b/runners/flink/job-server/flink_job_server.gradle
@@ -83,6 +83,7 @@ dependencies {
validatesPortableRunner project(path: flinkRunnerProject, configuration:
"testRuntimeMigration")
validatesPortableRunner project(path: ":sdks:java:core", configuration:
"shadowTest")
validatesPortableRunner project(path: ":runners:core-java", configuration:
"testRuntimeMigration")
+ validatesPortableRunner project(path: ":runners:portability:java")
validatesPortableRunner project(path: ":runners:portability:java",
configuration: "testRuntimeMigration")
runtimeOnly project(":sdks:java:extensions:google-cloud-platform-core")
runtimeOnly library.java.slf4j_simple
diff --git a/runners/samza/job-server/build.gradle
b/runners/samza/job-server/build.gradle
index a2f3362..e4b5b47 100644
--- a/runners/samza/job-server/build.gradle
+++ b/runners/samza/job-server/build.gradle
@@ -48,6 +48,7 @@ dependencies {
validatesPortableRunner project(path: samzaRunnerProject, configuration:
"testRuntimeMigration")
validatesPortableRunner project(path: ":sdks:java:core", configuration:
"shadowTest")
validatesPortableRunner project(path: ":runners:core-java", configuration:
"testRuntimeMigration")
+ validatesPortableRunner project(path: ":runners:portability:java")
validatesPortableRunner project(path: ":runners:portability:java",
configuration: "testRuntimeMigration")
runtimeOnly library.java.slf4j_simple
}
diff --git a/runners/spark/job-server/spark_job_server.gradle
b/runners/spark/job-server/spark_job_server.gradle
index 0959094..80f0839 100644
--- a/runners/spark/job-server/spark_job_server.gradle
+++ b/runners/spark/job-server/spark_job_server.gradle
@@ -52,11 +52,12 @@ configurations.all {
dependencies {
implementation project(sparkRunnerProject)
permitUnusedDeclared project(sparkRunnerProject)
- implementation project(path: sparkRunnerProject, configuration:
"compileOnly")
+ implementation project(sparkRunnerProject)
validatesPortableRunner project(path: sparkRunnerProject, configuration:
"testRuntimeMigration")
- validatesPortableRunner project(path: sparkRunnerProject, configuration:
"compileOnly")
+ validatesPortableRunner project(sparkRunnerProject)
validatesPortableRunner project(path: ":sdks:java:core", configuration:
"shadowTest")
validatesPortableRunner project(path: ":runners:core-java", configuration:
"testRuntimeMigration")
+ validatesPortableRunner project(path: ":runners:portability:java")
validatesPortableRunner project(path: ":runners:portability:java",
configuration: "testRuntimeMigration")
runtimeOnly project(":sdks:java:extensions:google-cloud-platform-core")
runtimeOnly project(":sdks:java:io:amazon-web-services2")
diff --git a/runners/spark/spark_runner.gradle
b/runners/spark/spark_runner.gradle
index 1c70a59..a7093fb 100644
--- a/runners/spark/spark_runner.gradle
+++ b/runners/spark/spark_runner.gradle
@@ -205,7 +205,7 @@ dependencies {
validatesRunner project(path: ":examples:java", configuration:
"testRuntimeMigration")
validatesRunner project(path: project.path, configuration:
"testRuntimeMigration")
validatesRunner project(project.path)
- validatesRunner project(path: project.path, configuration: "compileOnly")
+ validatesRunner project(path: project.path, configuration:
"compileClasspath")
hadoopVersions.each {kv ->
"hadoopVersion$kv.key" "org.apache.hadoop:hadoop-common:$kv.value"
}
diff --git
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsublite/internal/SubscriptionPartitionProcessorImplTest.java
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsublite/internal/SubscriptionPartitionProcessorImplTest.java
index 4d39872..5977560 100644
---
a/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsublite/internal/SubscriptionPartitionProcessorImplTest.java
+++
b/sdks/java/io/google-cloud-platform/src/test/java/org/apache/beam/sdk/io/gcp/pubsublite/internal/SubscriptionPartitionProcessorImplTest.java
@@ -55,7 +55,9 @@ import
org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.Immutabl
import org.joda.time.Duration;
import org.joda.time.Instant;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.InOrder;
@@ -70,6 +72,8 @@ public class SubscriptionPartitionProcessorImplTest {
@Mock OutputReceiver<SequencedMessage> receiver;
@Mock Function<Consumer<List<SequencedMessage>>, Subscriber>
subscriberFactory;
+ @Rule public Timeout globalTimeout = Timeout.seconds(30);
+
abstract static class FakeSubscriber extends FakeApiService implements
Subscriber {}
@Spy FakeSubscriber subscriber;
