From d367b818e754d920a18eef66daea07521ad9ba41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Vonheiden?= <bjoern.vonheiden@hotmail.de> Date: Wed, 13 May 2020 18:20:22 +0200 Subject: [PATCH] Remove eclipse plugin from gradle subprojects and configure in root --- build.gradle | 39 ++++++++++++++++++----------- uc1-application/build.gradle | 10 +------- uc1-workload-generator/build.gradle | 10 +------- uc2-application/build.gradle | 10 +------- uc2-workload-generator/build.gradle | 10 +------- uc3-application/build.gradle | 12 ++------- uc3-workload-generator/build.gradle | 10 +------- uc4-application/build.gradle | 12 ++------- uc4-workload-generator/build.gradle | 10 +------- 9 files changed, 34 insertions(+), 89 deletions(-) diff --git a/build.gradle b/build.gradle index c73a8582d..a38ff1ad3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,4 @@ -apply plugin: 'java-library' -apply plugin: 'pmd' -apply plugin: 'checkstyle' -apply plugin: 'com.github.spotbugs' -apply plugin: 'eclipse' - +// Inherited to all subprojects buildscript { repositories { maven { @@ -15,6 +10,18 @@ buildscript { } } +allprojects { + apply plugin: 'eclipse' +} + +apply plugin: 'java-library' +apply plugin: 'pmd' +apply plugin: 'checkstyle' +apply plugin: 'com.github.spotbugs' + + + + sourceCompatibility = "1.11" targetCompatibility = "1.11" @@ -23,7 +30,7 @@ configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' } -allprojects { +allprojects { repositories { jcenter() maven { @@ -83,7 +90,7 @@ tasks.withType(com.github.spotbugs.SpotBugsTask) { task checkstyle { group 'Quality Assurance' description 'Run Checkstyle' - + dependsOn 'checkstyleMain' dependsOn 'checkstyleTest' } @@ -99,14 +106,16 @@ task pmd { task spotbugs { group 'Quality Assurance' description 'Run SpotBugs' - + dependsOn 'spotbugsMain' dependsOn 'spotbugsTest' } -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file +allprojects { + eclipse { + classpath { + downloadSources=true + downloadJavadoc=true + } + } +} diff --git a/uc1-application/build.gradle b/uc1-application/build.gradle index 3fe880374..06eb22109 100644 --- a/uc1-application/build.gradle +++ b/uc1-application/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -14,7 +13,7 @@ targetCompatibility = "1.11" dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' // Use JUnit test framework @@ -22,10 +21,3 @@ dependencies { } mainClassName = "uc1.application.HistoryService" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file diff --git a/uc1-workload-generator/build.gradle b/uc1-workload-generator/build.gradle index 824566a24..77042baff 100644 --- a/uc1-workload-generator/build.gradle +++ b/uc1-workload-generator/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -14,7 +13,7 @@ targetCompatibility = "1.11" dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' // Use JUnit test framework @@ -22,10 +21,3 @@ dependencies { } mainClassName = "uc1.workloadGenerator.LoadGenerator" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file diff --git a/uc2-application/build.gradle b/uc2-application/build.gradle index 42bc3e077..4b6e7fd92 100644 --- a/uc2-application/build.gradle +++ b/uc2-application/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -14,7 +13,7 @@ targetCompatibility = "1.11" dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' // Use JUnit test framework @@ -22,10 +21,3 @@ dependencies { } mainClassName = "uc2.application.AggregationService" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file diff --git a/uc2-workload-generator/build.gradle b/uc2-workload-generator/build.gradle index 833291011..a4961a1be 100644 --- a/uc2-workload-generator/build.gradle +++ b/uc2-workload-generator/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -14,7 +13,7 @@ targetCompatibility = "1.11" dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' // Use JUnit test framework @@ -22,10 +21,3 @@ dependencies { } mainClassName = "uc2.workloadGenerator.LoadGenerator" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file diff --git a/uc3-application/build.gradle b/uc3-application/build.gradle index 01f47ffbc..6b082fd8d 100644 --- a/uc3-application/build.gradle +++ b/uc3-application/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -12,7 +11,7 @@ buildscript { sourceCompatibility = "1.11" targetCompatibility = "1.11" -allprojects { +allprojects { repositories { jcenter() maven { @@ -26,7 +25,7 @@ allprojects { dependencies { compile project(':') - + compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') compile 'org.slf4j:slf4j-simple:1.6.1' @@ -35,10 +34,3 @@ dependencies { } mainClassName = "uc3.application.HistoryService" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file diff --git a/uc3-workload-generator/build.gradle b/uc3-workload-generator/build.gradle index 5cb1fdfcc..7e9b736af 100644 --- a/uc3-workload-generator/build.gradle +++ b/uc3-workload-generator/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -14,7 +13,7 @@ targetCompatibility = "1.11" dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' // Use JUnit test framework @@ -22,10 +21,3 @@ dependencies { } mainClassName = "uc3.workloadGenerator.LoadGenerator" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file diff --git a/uc4-application/build.gradle b/uc4-application/build.gradle index 009c083e1..c465bb8b2 100644 --- a/uc4-application/build.gradle +++ b/uc4-application/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -12,7 +11,7 @@ buildscript { sourceCompatibility = "1.11" targetCompatibility = "1.11" -allprojects { +allprojects { repositories { jcenter() maven { @@ -26,7 +25,7 @@ allprojects { dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' compile('org.industrial-devops:titan-ccp-common-kafka:0.1.0-SNAPSHOT') @@ -35,10 +34,3 @@ dependencies { } mainClassName = "uc4.application.HistoryService" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} diff --git a/uc4-workload-generator/build.gradle b/uc4-workload-generator/build.gradle index 5902b6307..05d321cdd 100644 --- a/uc4-workload-generator/build.gradle +++ b/uc4-workload-generator/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'application' -apply plugin: 'eclipse' buildscript { repositories { @@ -14,7 +13,7 @@ targetCompatibility = "1.11" dependencies { compile project(':') - + compile 'org.slf4j:slf4j-simple:1.6.1' // Use JUnit test framework @@ -22,10 +21,3 @@ dependencies { } mainClassName = "uc4.workloadGenerator.LoadGenerator" - -eclipse { - classpath { - downloadSources=true - downloadJavadoc=true - } -} \ No newline at end of file -- GitLab