From 051b33d41317d4d2b0dff8a4fc674a1107de9b91 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Tue, 4 Jun 2019 14:42:42 +0200
Subject: [PATCH] Simplified gradle files.
---
build.gradle | 6 ++++-
commons.color/build.gradle | 8 -------
eraser-base/build.gradle | 10 +--------
eraser.rest/build.gradle | 10 ---------
eraser.spark/build.gradle | 7 ------
eraser.starter/build.gradle | 22 ++++++++++++-------
feedbackloop.analyze/build.gradle | 8 -------
feedbackloop.api/build.gradle | 7 ------
feedbackloop.execute/build.gradle | 8 -------
feedbackloop.learner/build.gradle | 7 ------
feedbackloop.learner_backup/build.gradle | 7 ------
feedbackloop.main/build.gradle | 7 ------
feedbackloop.monitor/build.gradle | 7 ------
feedbackloop.plan/build.gradle | 7 ------
influx_test/build.gradle | 7 ------
integration/build.gradle | 8 -------
ml_test/build.gradle | 7 ------
openhab-mock/build.gradle | 8 -------
org.openhab.action.machinelearn/build.gradle | 8 -------
.../build.gradle | 9 --------
project-template/build.gradle | 12 ----------
.../inf/st/eraser/projectName/ATest.java | 2 +-
skywriter-hue-integration/build.gradle | 7 ------
.../build.gradle | 8 -------
24 files changed, 21 insertions(+), 176 deletions(-)
diff --git a/build.gradle b/build.gradle
index 60b72b70..f1f3b408 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
allprojects {
group = 'de.tudresden.inf.st'
- version = '1.0.0-SNAPSHOT'
+ version = '0.1'
}
subprojects {
@@ -32,6 +32,10 @@ subprojects {
testArtifacts testJar
}
+ repositories {
+ mavenCentral()
+ }
+
dependencies {
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
diff --git a/commons.color/build.gradle b/commons.color/build.gradle
index b94df8eb..30ce209c 100644
--- a/commons.color/build.gradle
+++ b/commons.color/build.gradle
@@ -1,11 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-apply plugin: 'java'
-
-sourceCompatibility = 1.8
-
dependencies {
compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
}
diff --git a/eraser-base/build.gradle b/eraser-base/build.gradle
index 78903e66..2d0b1f8e 100644
--- a/eraser-base/build.gradle
+++ b/eraser-base/build.gradle
@@ -1,7 +1,3 @@
-repositories {
- mavenCentral()
-}
-
apply plugin: 'jastadd'
apply plugin: 'application'
apply plugin: 'jacoco'
@@ -84,11 +80,7 @@ jastadd {
parser.genDir = "src/gen/java/de/tudresden/inf/st/eraser/jastadd/parser"
}
-idea {
- module {
- generatedSourceDirs += file('src/gen/java')
- }
-}
+idea.module.generatedSourceDirs += file('src/gen/java')
sourceSets.main {
java {
diff --git a/eraser.rest/build.gradle b/eraser.rest/build.gradle
index 27a71563..0ac26261 100644
--- a/eraser.rest/build.gradle
+++ b/eraser.rest/build.gradle
@@ -1,26 +1,16 @@
buildscript {
- repositories {
- mavenCentral()
- }
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:2.1.2.RELEASE")
}
}
plugins {
- id 'java'
id 'io.franzbecker.gradle-lombok' version '1.14'
}
-repositories {
- mavenCentral()
-}
-
apply plugin: 'org.springframework.boot'
apply plugin: 'io.spring.dependency-management'
-sourceCompatibility = 1.8
-
dependencies {
compile project(':eraser-base')
compile 'org.springframework.boot:spring-boot-starter-web'
diff --git a/eraser.spark/build.gradle b/eraser.spark/build.gradle
index fc142672..5a577d15 100644
--- a/eraser.spark/build.gradle
+++ b/eraser.spark/build.gradle
@@ -1,15 +1,8 @@
plugins {
- id 'java'
id 'application'
id 'io.franzbecker.gradle-lombok' version '3.0.0'
}
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
dependencies {
compile project(':eraser-base')
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
diff --git a/eraser.starter/build.gradle b/eraser.starter/build.gradle
index c6d86dcf..ddb56ddf 100644
--- a/eraser.starter/build.gradle
+++ b/eraser.starter/build.gradle
@@ -51,12 +51,18 @@ sourceSets {
}
}
-distributions {
- main {
- contents {
- from {
- 'src/main/resources/starter.eraser'
- }
- }
- }
+//distributions {
+// main {
+// contents {
+// from {
+// 'src/main/resources/starter.eraser'
+// }
+// }
+// }
+//}
+applicationDistribution.from("src/main/resources") {
+ include "starter.eraser"
+}
+applicationDistribution.from(".") {
+ include "starter-setting.yaml"
}
diff --git a/feedbackloop.analyze/build.gradle b/feedbackloop.analyze/build.gradle
index 077136f3..361f5c14 100644
--- a/feedbackloop.analyze/build.gradle
+++ b/feedbackloop.analyze/build.gradle
@@ -1,11 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
-
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
diff --git a/feedbackloop.api/build.gradle b/feedbackloop.api/build.gradle
index 0039b3d5..ba194086 100644
--- a/feedbackloop.api/build.gradle
+++ b/feedbackloop.api/build.gradle
@@ -1,14 +1,7 @@
plugins {
- id 'java'
id 'io.franzbecker.gradle-lombok' version '3.0.0'
}
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
dependencies {
compile project(':eraser-base')
compile project(':commons.color')
diff --git a/feedbackloop.execute/build.gradle b/feedbackloop.execute/build.gradle
index 077136f3..361f5c14 100644
--- a/feedbackloop.execute/build.gradle
+++ b/feedbackloop.execute/build.gradle
@@ -1,11 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
-
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
diff --git a/feedbackloop.learner/build.gradle b/feedbackloop.learner/build.gradle
index ea041e50..3ad295bf 100644
--- a/feedbackloop.learner/build.gradle
+++ b/feedbackloop.learner/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/feedbackloop.learner_backup/build.gradle b/feedbackloop.learner_backup/build.gradle
index 838c9754..d0cf7913 100644
--- a/feedbackloop.learner_backup/build.gradle
+++ b/feedbackloop.learner_backup/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/feedbackloop.main/build.gradle b/feedbackloop.main/build.gradle
index c5a11eda..7e66daa3 100644
--- a/feedbackloop.main/build.gradle
+++ b/feedbackloop.main/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/feedbackloop.monitor/build.gradle b/feedbackloop.monitor/build.gradle
index 6b73819f..e3f4c6e2 100644
--- a/feedbackloop.monitor/build.gradle
+++ b/feedbackloop.monitor/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/feedbackloop.plan/build.gradle b/feedbackloop.plan/build.gradle
index 81156210..13b20cf6 100644
--- a/feedbackloop.plan/build.gradle
+++ b/feedbackloop.plan/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/influx_test/build.gradle b/influx_test/build.gradle
index ead9dcee..50fdeee4 100644
--- a/influx_test/build.gradle
+++ b/influx_test/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/integration/build.gradle b/integration/build.gradle
index 584eb252..219d9424 100644
--- a/integration/build.gradle
+++ b/integration/build.gradle
@@ -1,13 +1,5 @@
-
-apply plugin: 'java'
apply plugin: 'application'
-sourceCompatibility = 1.8
-
-repositories {
- mavenCentral()
-}
-
run {
mainClassName = 'de.tudresden.inf.st.eraser.integration.IntegrationMain'
standardInput = System.in
diff --git a/ml_test/build.gradle b/ml_test/build.gradle
index 2d500200..a9e198eb 100644
--- a/ml_test/build.gradle
+++ b/ml_test/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/openhab-mock/build.gradle b/openhab-mock/build.gradle
index 4de21c3b..d4197d59 100644
--- a/openhab-mock/build.gradle
+++ b/openhab-mock/build.gradle
@@ -1,14 +1,6 @@
-apply plugin: 'java'
apply plugin: 'application'
-sourceCompatibility = 1.8
-
-repositories {
- mavenCentral()
-}
-
run {
-// mainClassName = 'de.tudresden.inf.st.eraser.openhab_mock.MockMain'
mainClassName = 'de.tudresden.inf.st.eraser.openhab_mock.HueMain'
standardInput = System.in
if (project.hasProperty("appArgs")) {
diff --git a/org.openhab.action.machinelearn/build.gradle b/org.openhab.action.machinelearn/build.gradle
index 0ca19482..7360d4c8 100644
--- a/org.openhab.action.machinelearn/build.gradle
+++ b/org.openhab.action.machinelearn/build.gradle
@@ -1,11 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
-
dependencies {
compile files('lib/weka.jar')
compile project(':stub.org.openhab.core.scriptengine.action')
diff --git a/org.openlicht.action.reinforcementlearning/build.gradle b/org.openlicht.action.reinforcementlearning/build.gradle
index 66417e5d..572c87ea 100644
--- a/org.openlicht.action.reinforcementlearning/build.gradle
+++ b/org.openlicht.action.reinforcementlearning/build.gradle
@@ -1,12 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
-//apply plugin: 'application'
-
dependencies {
compile files('lib/encog-core-3.4.jar')
compile project(':stub.org.openhab.core.scriptengine.action')
diff --git a/project-template/build.gradle b/project-template/build.gradle
index 09e63423..3bae1622 100644
--- a/project-template/build.gradle
+++ b/project-template/build.gradle
@@ -1,19 +1,7 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
compile project(':eraser-base')
- compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
- compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
- compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
run {
diff --git a/project-template/src/test/java/de/tudresden/inf/st/eraser/projectName/ATest.java b/project-template/src/test/java/de/tudresden/inf/st/eraser/projectName/ATest.java
index 59db3af9..50f834da 100644
--- a/project-template/src/test/java/de/tudresden/inf/st/eraser/projectName/ATest.java
+++ b/project-template/src/test/java/de/tudresden/inf/st/eraser/projectName/ATest.java
@@ -17,6 +17,6 @@ public class ATest {
@Test
public void test1() {
- fail();
+
}
}
diff --git a/skywriter-hue-integration/build.gradle b/skywriter-hue-integration/build.gradle
index 37bb2da0..410a39b5 100644
--- a/skywriter-hue-integration/build.gradle
+++ b/skywriter-hue-integration/build.gradle
@@ -1,10 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
apply plugin: 'application'
dependencies {
diff --git a/stub.org.openhab.core.scriptengine.action/build.gradle b/stub.org.openhab.core.scriptengine.action/build.gradle
index 2f504378..128c3aa9 100644
--- a/stub.org.openhab.core.scriptengine.action/build.gradle
+++ b/stub.org.openhab.core.scriptengine.action/build.gradle
@@ -1,11 +1,3 @@
-repositories {
- mavenCentral()
-}
-
-sourceCompatibility = 1.8
-
-apply plugin: 'java'
-
sourceSets {
main {
java {
--
GitLab