diff --git a/build.gradle b/build.gradle index 60b72b700ec5d34db48006da121885e5adc6b4d4..f1f3b408f121f388615eca5d85cd3f128128f17c 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 b94df8ebb2332f7ee82611202e287541a285d86b..30ce209c40610e390f709d9ec5a36c7324543c23 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 78903e66d8d681ff431c671c6e17c75145bfdce4..2d0b1f8e78a2333cf594e8732e9ba30657a78db2 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 27a715637cd813a03182c27d332abedab4a02af0..0ac26261047eacbcc2b97709e7a5b4c1bc927b3b 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 fc14267292c11e5920e2bc3b7609a45a98d6ec6c..5a577d15400aab9d58ac2fec4fae8589b0995020 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 c6d86dcf9977de6e043e469e17726aa87224fb75..ddb56ddf0b9a90f815f09b20d117485c48300c70 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 077136f33bd04ccde2acb2cce23df7ba22c69c7a..361f5c1429190208b8a70cbb889bf6c1cbd56993 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 0039b3d515db9d781cbbdc37c25ab42fa23fa855..ba194086c7c858a3435af764a8783f38231d2c69 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 077136f33bd04ccde2acb2cce23df7ba22c69c7a..361f5c1429190208b8a70cbb889bf6c1cbd56993 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 ea041e50cc38e90c333527bf039567860b29f7a8..3ad295bf3c112d55e31fb6d185cef21ead1da66d 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 838c9754b06a894feec77003cf424ff258cb4b4b..d0cf7913f010772f11df428d587fc351d8df634a 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 c5a11eda0213af9b519a5c8df62de30e8dc6b059..7e66daa3efddb2ef62735abc2fe6e57bab91d053 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 6b73819fad70219d9bb7465e0b3c903352bc76d7..e3f4c6e283e32e73a0a54ffe1f03d019c81c6d8a 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 81156210881de5442bc7d1f79e3dcefdf51c042a..13b20cf6cff29796338f0ac62dd71723fd5ff467 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 ead9dcee7f559d5c2ae9a472c8c09096692af3b2..50fdeee4c477c0d43ad4ce73436630531a423a32 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 584eb25249ba3c44c928d77ac7a9368d0890daad..219d9424d1b27114d05fc74ff704f6e7ce02937b 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 2d500200789d52e56de89a77d453c6af7ae6d49b..a9e198eb94876643269b680a0de267e69724100f 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 4de21c3b36c9d837c46aaf3245c86ad2b717d91a..d4197d59aacaebd8d31ff349c2ed78007f0bfb2d 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 0ca194823aeeff40aa1de7f6da6c61896ff63e5b..7360d4c8b932a5805e9bd29f21960d3c67b9851e 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 66417e5da744784dfcb590357db19eaa1ce14bd6..572c87ea95295ba93b68e1f8bae5bed2dcc0149d 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 09e63423457a9994046774fcc0d5bf657b04db01..3bae16225ca01a6fea919d36be3a383c6a62507f 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 59db3af92a329827411cb89a18dc3ea4ab833020..50f834da9ece7f0ba9ba3ed51c2adedbfbe318eb 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 37bb2da071e8fe7cce1f769168cf33cddced3e32..410a39b582bd8ea9316289b95c1f7f0083de6576 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 2f5043786a9064ac0c84ffe10ab32a6d01940398..128c3aa9c93c8dc9dd4aff8a245930bfb21b555a 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 {