[flink-training] branch master updated: [FLINK-23334][gradle] let the subprojects decide whether they implement an application

[nkruber]

This is an automated email from the ASF dual-hosted git repository.

nkruber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-training.git


The following commit(s) were added to refs/heads/master by this push:
     new 63d360e  [FLINK-23334][gradle] let the subprojects decide whether they 
implement an application
63d360e is described below

commit 63d360e49368041a4bbdd320a5c4b3600961dab2
Author: Nico Kruber <n...@ververica.com>
AuthorDate: Fri Jul 2 11:37:19 2021 +0200

    [FLINK-23334][gradle] let the subprojects decide whether they implement an 
application
    
    This gives a cleaner gradle project file layout.
---
 build.gradle                  | 7 -------
 hourly-tips/build.gradle      | 2 ++
 long-ride-alerts/build.gradle | 2 ++
 ride-cleansing/build.gradle   | 2 ++
 rides-and-fares/build.gradle  | 2 ++
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7697737..5d0c8e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,9 +29,6 @@ allprojects {
 subprojects {
     apply plugin: 'java'
     apply plugin: 'scala' // optional; uncomment if needed
-    if (project != project(":common")) {
-        apply plugin: 'application'
-    }
     apply plugin: 'com.github.johnrengelman.shadow'
     apply plugin: 'checkstyle'
     apply plugin: 'eclipse'
@@ -120,10 +117,6 @@ subprojects {
         }
     }
 
-    if (plugins.findPlugin('application')) {
-        applicationDefaultJvmArgs = ["-Dlog4j.configuration=log4j.properties"]
-        run.classpath = sourceSets.main.runtimeClasspath
-    }
 
     jar {
         manifest {
diff --git a/hourly-tips/build.gradle b/hourly-tips/build.gradle
index 11df511..75e3e60 100644
--- a/hourly-tips/build.gradle
+++ b/hourly-tips/build.gradle
@@ -1 +1,3 @@
+apply plugin: 'application'
+
 mainClassName = 
'org.apache.flink.training.exercises.hourlytips.HourlyTipsExercise'
diff --git a/long-ride-alerts/build.gradle b/long-ride-alerts/build.gradle
index 62e4ffd..59b9448 100644
--- a/long-ride-alerts/build.gradle
+++ b/long-ride-alerts/build.gradle
@@ -1 +1,3 @@
+apply plugin: 'application'
+
 mainClassName = 
'org.apache.flink.training.exercises.longrides.LongRidesExercise'
diff --git a/ride-cleansing/build.gradle b/ride-cleansing/build.gradle
index 106e3b9..1f03917 100644
--- a/ride-cleansing/build.gradle
+++ b/ride-cleansing/build.gradle
@@ -1 +1,3 @@
+apply plugin: 'application'
+
 mainClassName = 
'org.apache.flink.training.exercises.ridecleansing.RideCleansingExercise'
diff --git a/rides-and-fares/build.gradle b/rides-and-fares/build.gradle
index 18366af..565aec6 100644
--- a/rides-and-fares/build.gradle
+++ b/rides-and-fares/build.gradle
@@ -1 +1,3 @@
+apply plugin: 'application'
+
 mainClassName = 
'org.apache.flink.training.exercises.ridesandfares.RidesAndFaresExercise'