From 66fb1fac38262f4c20084c00386b76ea734e5b3f Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Mon, 6 May 2019 15:02:35 +0200
Subject: [PATCH] Move Gradle dependencies up.
---
build.gradle | 8 +++++
commons.color/build.gradle | 5 ---
eraser-base/build.gradle | 5 +--
.../java/de/tudresden/inf/st/eraser/Main.java | 31 -------------------
eraser.rest/build.gradle | 5 ---
eraser.spark/build.gradle | 5 ---
eraser.starter/build.gradle | 16 +++++++---
feedbackloop.analyze/build.gradle | 5 ---
feedbackloop.api/build.gradle | 5 ---
feedbackloop.execute/build.gradle | 5 ---
feedbackloop.learner/build.gradle | 5 ---
feedbackloop.main/build.gradle | 5 ---
feedbackloop.monitor/build.gradle | 5 ---
feedbackloop.plan/build.gradle | 5 ---
influx_test/build.gradle | 6 ----
integration/build.gradle | 3 --
ml_test/build.gradle | 5 ---
openhab-mock/build.gradle | 4 ---
org.openhab.action.machinelearn/build.gradle | 4 ---
.../build.gradle | 5 ---
skywriter-hue-integration/build.gradle | 5 ---
.../build.gradle | 7 -----
22 files changed, 20 insertions(+), 129 deletions(-)
diff --git a/build.gradle b/build.gradle
index 7348f513..60b72b70 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,4 +31,12 @@ subprojects {
artifacts {
testArtifacts testJar
}
+
+ 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'
+ testCompile group: 'junit', name: 'junit', version: '4.12'
+ testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
+ }
+
}
diff --git a/commons.color/build.gradle b/commons.color/build.gradle
index 63aaa8c2..b94df8eb 100644
--- a/commons.color/build.gradle
+++ b/commons.color/build.gradle
@@ -7,12 +7,7 @@ apply plugin: 'java'
sourceCompatibility = 1.8
dependencies {
- 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'
compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
sourceSets {
diff --git a/eraser-base/build.gradle b/eraser-base/build.gradle
index e189105a..78903e66 100644
--- a/eraser-base/build.gradle
+++ b/eraser-base/build.gradle
@@ -6,16 +6,13 @@ apply plugin: 'jastadd'
apply plugin: 'application'
apply plugin: 'jacoco'
apply plugin: 'idea'
+apply plugin: 'distribution'
dependencies {
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
compile group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
- 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'
compile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
- compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
compile group: 'org.influxdb', name: 'influxdb-java', version: '2.15'
- testCompile group: 'junit', name: 'junit', version: '4.12'
testCompile group: 'org.testcontainers', name: 'testcontainers', version: '1.11.2'
testCompile group: 'org.testcontainers', name: 'influxdb', version: '1.11.2'
testCompile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
diff --git a/eraser-base/src/main/java/de/tudresden/inf/st/eraser/Main.java b/eraser-base/src/main/java/de/tudresden/inf/st/eraser/Main.java
index 40b84e5a..9b9aaba5 100644
--- a/eraser-base/src/main/java/de/tudresden/inf/st/eraser/Main.java
+++ b/eraser-base/src/main/java/de/tudresden/inf/st/eraser/Main.java
@@ -6,8 +6,6 @@ import de.tudresden.inf.st.eraser.jastadd.model.Root;
import de.tudresden.inf.st.eraser.openhab2.OpenHab2Importer;
import de.tudresden.inf.st.eraser.openhab2.mqtt.MQTTUpdater;
import de.tudresden.inf.st.eraser.util.ParserUtils;
-import org.apache.commons.math3.linear.MatrixUtils;
-import org.apache.commons.math3.linear.RealMatrix;
import org.apache.logging.log4j.LogManager;
import java.io.*;
@@ -25,35 +23,6 @@ public class Main {
// Root model = importFromOpenHab();
// testPrinterWith(model);
// testUpdaterWith(model);
- testXY_to_RGB();
- }
-
- private static void testXY_to_RGB() {
- /*
- XYZ to RGB [M]-1
- 2.0413690 -0.5649464 -0.3446944
- -0.9692660 1.8760108 0.0415560
- 0.0134474 -0.1183897 1.0154096
- */
- double[][] matrixData = { { 2.0413690, -0.5649464, -0.3446944},
- {-0.9692660, 1.8760108, 0.0415560},
- { 0.0134474, -0.1183897, 1.0154096}};
- RealMatrix mInverted = MatrixUtils.createRealMatrix(matrixData);
- BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
-
- while (true) {
- try {
- double x = readFromSystemIn(in, "x:");
- double y = readFromSystemIn(in, "y:");
- double z = 1;
- RealMatrix xyz = MatrixUtils.createColumnRealMatrix(new double[] {x,y,z});
- RealMatrix result = mInverted.multiply(xyz);
- System.out.println(result);
- } catch (IOException | NumberFormatException e) {
- e.printStackTrace();
- break;
- }
- }
}
private static double readFromSystemIn(BufferedReader in, String prompt) throws IOException {
diff --git a/eraser.rest/build.gradle b/eraser.rest/build.gradle
index 6aabf056..27a71563 100644
--- a/eraser.rest/build.gradle
+++ b/eraser.rest/build.gradle
@@ -23,15 +23,10 @@ sourceCompatibility = 1.8
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'
compile 'org.springframework.boot:spring-boot-starter-web'
compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.9.2'
compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.9.2'
testCompile 'org.springframework.boot:spring-boot-starter-test'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
sourceSets {
diff --git a/eraser.spark/build.gradle b/eraser.spark/build.gradle
index cfa295ac..fc142672 100644
--- a/eraser.spark/build.gradle
+++ b/eraser.spark/build.gradle
@@ -12,13 +12,8 @@ sourceCompatibility = 1.8
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'
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2'
compile group: 'com.sparkjava', name: 'spark-core', version: '2.9.0'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
run {
diff --git a/eraser.starter/build.gradle b/eraser.starter/build.gradle
index ed867e49..c6d86dcf 100644
--- a/eraser.starter/build.gradle
+++ b/eraser.starter/build.gradle
@@ -1,6 +1,7 @@
plugins {
id 'java'
id 'application'
+ id 'distribution'
id 'io.github.http-builder-ng.http-plugin' version '0.1.1'
}
@@ -20,12 +21,7 @@ dependencies {
compile project(':feedbackloop.learner')
compile group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.8'
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
- 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'
compile group: 'net.sourceforge.argparse4j', name: 'argparse4j', version: '0.8.1'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
run {
@@ -54,3 +50,13 @@ sourceSets {
}
}
}
+
+distributions {
+ main {
+ contents {
+ from {
+ 'src/main/resources/starter.eraser'
+ }
+ }
+ }
+}
diff --git a/feedbackloop.analyze/build.gradle b/feedbackloop.analyze/build.gradle
index 001e4fb5..077136f3 100644
--- a/feedbackloop.analyze/build.gradle
+++ b/feedbackloop.analyze/build.gradle
@@ -9,11 +9,6 @@ apply plugin: 'java'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
- 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'
}
sourceSets {
diff --git a/feedbackloop.api/build.gradle b/feedbackloop.api/build.gradle
index 30e40689..0039b3d5 100644
--- a/feedbackloop.api/build.gradle
+++ b/feedbackloop.api/build.gradle
@@ -12,11 +12,6 @@ sourceCompatibility = 1.8
dependencies {
compile project(':eraser-base')
compile project(':commons.color')
- 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'
compile group: 'org.encog', name: 'encog-core', version: '3.4'
}
diff --git a/feedbackloop.execute/build.gradle b/feedbackloop.execute/build.gradle
index 001e4fb5..077136f3 100644
--- a/feedbackloop.execute/build.gradle
+++ b/feedbackloop.execute/build.gradle
@@ -9,11 +9,6 @@ apply plugin: 'java'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
- 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'
}
sourceSets {
diff --git a/feedbackloop.learner/build.gradle b/feedbackloop.learner/build.gradle
index 10a45023..ea041e50 100644
--- a/feedbackloop.learner/build.gradle
+++ b/feedbackloop.learner/build.gradle
@@ -10,11 +10,6 @@ apply plugin: 'application'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
- 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'
compile group: 'org.encog', name: 'encog-core', version: '3.4'
}
diff --git a/feedbackloop.main/build.gradle b/feedbackloop.main/build.gradle
index 727c0414..c5a11eda 100644
--- a/feedbackloop.main/build.gradle
+++ b/feedbackloop.main/build.gradle
@@ -14,11 +14,6 @@ dependencies {
compile project(':feedbackloop.analyze')
compile project(':feedbackloop.plan')
compile project(':feedbackloop.execute')
- 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/feedbackloop.monitor/build.gradle b/feedbackloop.monitor/build.gradle
index 168ec568..6b73819f 100644
--- a/feedbackloop.monitor/build.gradle
+++ b/feedbackloop.monitor/build.gradle
@@ -10,11 +10,6 @@ apply plugin: 'application'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
- 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/feedbackloop.plan/build.gradle b/feedbackloop.plan/build.gradle
index b7a1c8a0..81156210 100644
--- a/feedbackloop.plan/build.gradle
+++ b/feedbackloop.plan/build.gradle
@@ -10,11 +10,6 @@ apply plugin: 'application'
dependencies {
compile project(':eraser-base')
compile project(':feedbackloop.api')
- 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/influx_test/build.gradle b/influx_test/build.gradle
index 34bbab8d..ead9dcee 100644
--- a/influx_test/build.gradle
+++ b/influx_test/build.gradle
@@ -9,13 +9,7 @@ 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'
compile group: 'org.influxdb', name: 'influxdb-java', version: '2.15'
-
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
run {
diff --git a/integration/build.gradle b/integration/build.gradle
index b58d34a3..584eb252 100644
--- a/integration/build.gradle
+++ b/integration/build.gradle
@@ -19,7 +19,4 @@ run {
dependencies {
compile project(':eraser-base')
compile project(':openhab-mock')
- 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'
}
diff --git a/ml_test/build.gradle b/ml_test/build.gradle
index f6f854ec..2d500200 100644
--- a/ml_test/build.gradle
+++ b/ml_test/build.gradle
@@ -9,11 +9,6 @@ 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/openhab-mock/build.gradle b/openhab-mock/build.gradle
index cb46c791..4de21c3b 100644
--- a/openhab-mock/build.gradle
+++ b/openhab-mock/build.gradle
@@ -19,9 +19,5 @@ run {
dependencies {
compile project(':eraser-base')
compile project(':commons.color')
- 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'
compile group: 'com.opencsv', name: 'opencsv', version: '3.8'
- compile group: 'org.apache.commons', name: 'commons-math3', version: '3.6.1'
- testCompile group: 'junit', name: 'junit', version: '4.12'
}
diff --git a/org.openhab.action.machinelearn/build.gradle b/org.openhab.action.machinelearn/build.gradle
index f81fc93d..0ca19482 100644
--- a/org.openhab.action.machinelearn/build.gradle
+++ b/org.openhab.action.machinelearn/build.gradle
@@ -9,14 +9,10 @@ apply plugin: 'java'
dependencies {
compile files('lib/weka.jar')
compile project(':stub.org.openhab.core.scriptengine.action')
-// compile 'org.openhab.core.library.types'
-// compile 'org.openhab.core.scriptengine.action'
compile group: 'org.osgi', name: 'org.osgi.framework', version: '1.9.0'
compile group: 'org.osgi', name: 'org.osgi.service.cm', version: '1.6.0'
compile group: 'org.osgi', name: 'org.osgi.service.component', version: '1.4.0'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
sourceSets {
diff --git a/org.openlicht.action.reinforcementlearning/build.gradle b/org.openlicht.action.reinforcementlearning/build.gradle
index c54f5fa4..66417e5d 100644
--- a/org.openlicht.action.reinforcementlearning/build.gradle
+++ b/org.openlicht.action.reinforcementlearning/build.gradle
@@ -10,16 +10,11 @@ apply plugin: 'java'
dependencies {
compile files('lib/encog-core-3.4.jar')
compile project(':stub.org.openhab.core.scriptengine.action')
- compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
compile group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.2.200'
-// compile 'org.openhab.core.library.types'
-// compile 'org.openhab.core.scriptengine.action'
compile group: 'org.osgi', name: 'org.osgi.framework', version: '1.9.0'
compile group: 'org.osgi', name: 'org.osgi.service.cm', version: '1.6.0'
compile group: 'org.osgi', name: 'org.osgi.service.component', version: '1.4.0'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
}
sourceSets {
diff --git a/skywriter-hue-integration/build.gradle b/skywriter-hue-integration/build.gradle
index c09d8b24..37bb2da0 100644
--- a/skywriter-hue-integration/build.gradle
+++ b/skywriter-hue-integration/build.gradle
@@ -10,11 +10,6 @@ apply plugin: 'application'
dependencies {
compile project(':eraser-base')
compile project(':commons.color')
- 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/stub.org.openhab.core.scriptengine.action/build.gradle b/stub.org.openhab.core.scriptengine.action/build.gradle
index 807b03f2..2f504378 100644
--- a/stub.org.openhab.core.scriptengine.action/build.gradle
+++ b/stub.org.openhab.core.scriptengine.action/build.gradle
@@ -6,13 +6,6 @@ sourceCompatibility = 1.8
apply plugin: 'java'
-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'
- testCompile group: 'junit', name: 'junit', version: '4.12'
- testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
-}
-
sourceSets {
main {
java {
--
GitLab