From 1200d613bbd63d33a678951a28f1107e9c672b5b Mon Sep 17 00:00:00 2001 From: rschoene <rene.schoene@tu-dresden.de> Date: Fri, 3 May 2019 14:56:17 +0200 Subject: [PATCH] Update most Gradle dependencies to latest version. - Do not update junit and jastadd-gradle yet - Also use consistent long-form dependency specification --- commons.color/build.gradle | 6 +++--- eraser-base/build.gradle | 12 ++++++------ eraser.rest/build.gradle | 8 ++++---- eraser.spark/build.gradle | 10 +++++----- eraser.starter/build.gradle | 10 +++++----- feedbackloop.analyze/build.gradle | 4 ++-- feedbackloop.api/build.gradle | 10 +++++----- feedbackloop.execute/build.gradle | 4 ++-- feedbackloop.learner/build.gradle | 6 +++--- feedbackloop.main/build.gradle | 4 ++-- feedbackloop.monitor/build.gradle | 4 ++-- feedbackloop.plan/build.gradle | 4 ++-- influx_test/build.gradle | 6 +++--- integration/build.gradle | 4 ++-- ml_test/build.gradle | 4 ++-- openhab-mock/build.gradle | 8 ++++---- org.openhab.action.machinelearn/build.gradle | 11 ----------- .../build.gradle | 2 +- project-template/build.gradle | 4 ++-- skywriter-hue-integration/build.gradle | 4 ++-- .../build.gradle | 4 ++-- 21 files changed, 59 insertions(+), 70 deletions(-) diff --git a/commons.color/build.gradle b/commons.color/build.gradle index 135a0194..63aaa8c2 100644 --- a/commons.color/build.gradle +++ b/commons.color/build.gradle @@ -8,9 +8,9 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' - compile 'org.apache.commons:commons-math3:3.6.1' + 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' } diff --git a/eraser-base/build.gradle b/eraser-base/build.gradle index 37edda92..e189105a 100644 --- a/eraser-base/build.gradle +++ b/eraser-base/build.gradle @@ -10,22 +10,22 @@ apply plugin: 'idea' 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' - compile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.14' + 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.14' + 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.1' + testCompile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.2' } buildscript { repositories.mavenLocal() repositories.mavenCentral() dependencies { - classpath 'org.jastadd:jastaddgradle:1.13.2' + classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.2' } } diff --git a/eraser.rest/build.gradle b/eraser.rest/build.gradle index 0f7c52ef..6aabf056 100644 --- a/eraser.rest/build.gradle +++ b/eraser.rest/build.gradle @@ -24,11 +24,11 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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 'io.springfox:springfox-swagger2:2.9.2' - compile 'io.springfox:springfox-swagger-ui:2.9.2' + 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' diff --git a/eraser.spark/build.gradle b/eraser.spark/build.gradle index c5bdd901..cfa295ac 100644 --- a/eraser.spark/build.gradle +++ b/eraser.spark/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'application' - id 'io.franzbecker.gradle-lombok' version '1.14' + id 'io.franzbecker.gradle-lombok' version '3.0.0' } repositories { @@ -13,10 +13,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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' - compile 'com.sparkjava:spark-core:2.8.0' + 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' } diff --git a/eraser.starter/build.gradle b/eraser.starter/build.gradle index d334bedd..ed867e49 100644 --- a/eraser.starter/build.gradle +++ b/eraser.starter/build.gradle @@ -18,12 +18,12 @@ dependencies { compile project(':feedbackloop.plan') compile project(':feedbackloop.execute') compile project(':feedbackloop.learner') - compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8' - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.8' + 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: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' - compile 'net.sourceforge.argparse4j:argparse4j:0.8.1' + 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' } diff --git a/feedbackloop.analyze/build.gradle b/feedbackloop.analyze/build.gradle index b59641cf..001e4fb5 100644 --- a/feedbackloop.analyze/build.gradle +++ b/feedbackloop.analyze/build.gradle @@ -10,8 +10,8 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/feedbackloop.api/build.gradle b/feedbackloop.api/build.gradle index 2e986c3c..30e40689 100644 --- a/feedbackloop.api/build.gradle +++ b/feedbackloop.api/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'io.franzbecker.gradle-lombok' version '1.14' + id 'io.franzbecker.gradle-lombok' version '3.0.0' } repositories { @@ -11,13 +11,13 @@ sourceCompatibility = 1.8 dependencies { compile project(':eraser-base') - compile project(':commons.color:') + 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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 'org.encog:encog-core:3.4' + compile group: 'org.encog', name: 'encog-core', version: '3.4' } sourceSets { diff --git a/feedbackloop.execute/build.gradle b/feedbackloop.execute/build.gradle index b59641cf..001e4fb5 100644 --- a/feedbackloop.execute/build.gradle +++ b/feedbackloop.execute/build.gradle @@ -10,8 +10,8 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/feedbackloop.learner/build.gradle b/feedbackloop.learner/build.gradle index c3303f2d..10a45023 100644 --- a/feedbackloop.learner/build.gradle +++ b/feedbackloop.learner/build.gradle @@ -11,11 +11,11 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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 'org.encog:encog-core:3.4' + compile group: 'org.encog', name: 'encog-core', version: '3.4' } run { diff --git a/feedbackloop.main/build.gradle b/feedbackloop.main/build.gradle index 2287b7b9..727c0414 100644 --- a/feedbackloop.main/build.gradle +++ b/feedbackloop.main/build.gradle @@ -15,8 +15,8 @@ dependencies { 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/feedbackloop.monitor/build.gradle b/feedbackloop.monitor/build.gradle index 77b95130..168ec568 100644 --- a/feedbackloop.monitor/build.gradle +++ b/feedbackloop.monitor/build.gradle @@ -11,8 +11,8 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/feedbackloop.plan/build.gradle b/feedbackloop.plan/build.gradle index 2a9ac05f..b7a1c8a0 100644 --- a/feedbackloop.plan/build.gradle +++ b/feedbackloop.plan/build.gradle @@ -11,8 +11,8 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/influx_test/build.gradle b/influx_test/build.gradle index fcb387f5..34bbab8d 100644 --- a/influx_test/build.gradle +++ b/influx_test/build.gradle @@ -10,9 +10,9 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' - compile 'org.influxdb:influxdb-java:2.14' + 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' diff --git a/integration/build.gradle b/integration/build.gradle index 47be6319..b58d34a3 100644 --- a/integration/build.gradle +++ b/integration/build.gradle @@ -19,7 +19,7 @@ run { dependencies { compile project(':eraser-base') compile project(':openhab-mock') - compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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 241f8538..f6f854ec 100644 --- a/ml_test/build.gradle +++ b/ml_test/build.gradle @@ -10,8 +10,8 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/openhab-mock/build.gradle b/openhab-mock/build.gradle index 94017c3d..cb46c791 100644 --- a/openhab-mock/build.gradle +++ b/openhab-mock/build.gradle @@ -19,9 +19,9 @@ run { dependencies { compile project(':eraser-base') compile project(':commons.color') - compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' - compile 'com.opencsv:opencsv:3.8' - compile 'org.apache.commons:commons-math3:3.6.1' + 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 12d6d1e8..f81fc93d 100644 --- a/org.openhab.action.machinelearn/build.gradle +++ b/org.openhab.action.machinelearn/build.gradle @@ -5,13 +5,10 @@ repositories { sourceCompatibility = 1.8 apply plugin: 'java' -//apply plugin: 'application' dependencies { compile files('lib/weka.jar') compile project(':stub.org.openhab.core.scriptengine.action') -// compile 'org.apache.commons:commons-lang3:3.8.1' -// compile group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.0.0' // compile 'org.openhab.core.library.types' // compile 'org.openhab.core.scriptengine.action' compile group: 'org.osgi', name: 'org.osgi.framework', version: '1.9.0' @@ -22,14 +19,6 @@ dependencies { testCompile group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0' } -//run { -// mainClassName = 'de.tudresden.inf.st.eraser.skywriter_hue_integration.Main' -// standardInput = System.in -// if (project.hasProperty("appArgs")) { -// args Eval.me(appArgs) -// } -//} - sourceSets { main { java { diff --git a/org.openlicht.action.reinforcementlearning/build.gradle b/org.openlicht.action.reinforcementlearning/build.gradle index 54e1daf9..c54f5fa4 100644 --- a/org.openlicht.action.reinforcementlearning/build.gradle +++ b/org.openlicht.action.reinforcementlearning/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'java' dependencies { compile files('lib/encog-core-3.4.jar') compile project(':stub.org.openhab.core.scriptengine.action') - compile 'org.apache.commons:commons-lang3:3.8.1' + 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' diff --git a/project-template/build.gradle b/project-template/build.gradle index 9cb094bf..09e63423 100644 --- a/project-template/build.gradle +++ b/project-template/build.gradle @@ -10,8 +10,8 @@ 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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/skywriter-hue-integration/build.gradle b/skywriter-hue-integration/build.gradle index ab64e3d7..c09d8b24 100644 --- a/skywriter-hue-integration/build.gradle +++ b/skywriter-hue-integration/build.gradle @@ -11,8 +11,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.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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/stub.org.openhab.core.scriptengine.action/build.gradle b/stub.org.openhab.core.scriptengine.action/build.gradle index e2b54c7a..807b03f2 100644 --- a/stub.org.openhab.core.scriptengine.action/build.gradle +++ b/stub.org.openhab.core.scriptengine.action/build.gradle @@ -7,8 +7,8 @@ sourceCompatibility = 1.8 apply plugin: 'java' dependencies { - compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.1' - compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.1' + 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' } -- GitLab