You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by sc...@apache.org on 2019/01/25 17:00:13 UTC
[beam] branch master updated: [Dependency Update] upgrade to shadow
plugin 4.0.4
This is an automated email from the ASF dual-hosted git repository.
scott 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 db6a490 [Dependency Update] upgrade to shadow plugin 4.0.4
new 00be31e Merge pull request #7622: [Dependency Update] upgrade to shadow plugin 4.0.4
db6a490 is described below
commit db6a4903ea44ab3684de4c84064781375ad03e28
Author: Michael Luckey <25...@users.noreply.github.com>
AuthorDate: Fri Jan 25 02:11:56 2019 +0100
[Dependency Update] upgrade to shadow plugin 4.0.4
---
build.gradle | 2 +-
runners/flink/job-server/flink_job_server.gradle | 7 ++++---
runners/reference/job-server/build.gradle | 8 ++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/build.gradle b/build.gradle
index bb9de48..98856c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ buildscript {
classpath "gradle.plugin.com.github.blindpirate:gogradle:0.10" // Enable Go code compilation
classpath "gradle.plugin.com.palantir.gradle.docker:gradle-docker:0.20.1" // Enable building Docker containers
classpath "cz.malohlava:visteg:1.0.3" // Enable generating Gradle task dependencies as ".dot" files
- classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4" // Enable shading Java dependencies
+ classpath "com.github.jengelman.gradle.plugins:shadow:4.0.4" // Enable shading Java dependencies
classpath "ca.coglinc:javacc-gradle-plugin:2.4.0" // Enable the JavaCC parser generator
classpath "gradle.plugin.io.pry.gradle.offline_dependencies:gradle-offline-dependencies-plugin:0.3" // Enable creating an offline repository
classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13" // Enable errorprone Java static analysis
diff --git a/runners/flink/job-server/flink_job_server.gradle b/runners/flink/job-server/flink_job_server.gradle
index 7620bb6..dd114bc 100644
--- a/runners/flink/job-server/flink_job_server.gradle
+++ b/runners/flink/job-server/flink_job_server.gradle
@@ -25,6 +25,10 @@ import org.apache.beam.gradle.BeamModulePlugin
*/
apply plugin: org.apache.beam.gradle.BeamModulePlugin
+apply plugin: "application"
+// we need to set mainClassName before applying shadow plugin
+mainClassName = "org.apache.beam.runners.flink.FlinkJobServerDriver"
+
applyJavaNature(
validateShadowJar: false,
exportJavadoc: false,
@@ -32,7 +36,6 @@ applyJavaNature(
append "reference.conf"
},
)
-apply plugin: "application"
// Resolve the Flink project name (and version) the job-server is based on
def flinkRunnerProject = ":${project.name.replace("-job-server", "")}"
@@ -62,8 +65,6 @@ sourceSets {
}
}
-mainClassName = "org.apache.beam.runners.flink.FlinkJobServerDriver"
-
configurations {
validatesPortableRunner
}
diff --git a/runners/reference/job-server/build.gradle b/runners/reference/job-server/build.gradle
index 6e713bc..e476d6a 100644
--- a/runners/reference/job-server/build.gradle
+++ b/runners/reference/job-server/build.gradle
@@ -16,6 +16,10 @@
* limitations under the License.
*/
apply plugin: org.apache.beam.gradle.BeamModulePlugin
+apply plugin: "application"
+// we need to set mainClassName before applying shadow plugin
+mainClassName = "org.apache.beam.runners.direct.portable.job.ReferenceRunnerJobServer"
+
applyJavaNature(
exportJavadoc: false,
validateShadowJar: false,
@@ -25,10 +29,6 @@ applyJavaNature(
description = "Apache Beam :: Runners :: Reference :: Job Server"
-apply plugin: "application"
-
-mainClassName = "org.apache.beam.runners.direct.portable.job.ReferenceRunnerJobServer"
-
dependencies {
compile project(path: ":beam-runners-direct-java", configuration: "shadow")
compile project(path: ":beam-runners-java-fn-execution", configuration: "shadow")