From efe007c06137e77f0f8dde4206b055b55fb389c9 Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Mon, 6 Jul 2020 14:14:41 +0200
Subject: [PATCH] Clean up gradle dependencies.

---
 build.gradle                      |  1 -
 ros2rag.base/build.gradle         |  7 ++-----
 ros2rag.receiverstub/build.gradle |  4 ++--
 ros2rag.senderstub/build.gradle   |  4 ++--
 ros2rag.starter/build.gradle      |  4 ++--
 ros2rag.tests/build.gradle        | 11 ++++++-----
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4f57507..5f86f7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,6 @@ subprojects {
     dependencies {
         implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2'
         implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
-        testImplementation group: 'junit', name: 'junit', version: '4.12'
         testImplementation group: 'org.hamcrest', name: 'hamcrest-junit', version: '2.0.0.0'
     }
 
diff --git a/ros2rag.base/build.gradle b/ros2rag.base/build.gradle
index 7208baf..a6a7882 100644
--- a/ros2rag.base/build.gradle
+++ b/ros2rag.base/build.gradle
@@ -17,12 +17,9 @@ buildscript {
 }
 
 dependencies {
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.8'
-    implementation 'com.github.spullara.mustache.java:compiler:0.9.6'
+    implementation group: 'com.github.spullara.mustache.java', name: 'compiler', version: '0.9.6'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-jul', version: '2.11.2'
-//    api 'org.jastadd:jastadd:2.3.4'
-    runtime 'org.jastadd:jastadd:2.3.4'
+    runtime group: 'org.jastadd', name: 'jastadd', version: '2.3.4'
     api group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
 }
 
diff --git a/ros2rag.receiverstub/build.gradle b/ros2rag.receiverstub/build.gradle
index 0fe6ce1..59f2bcc 100644
--- a/ros2rag.receiverstub/build.gradle
+++ b/ros2rag.receiverstub/build.gradle
@@ -25,8 +25,8 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}"
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
     implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
-    compile 'com.google.protobuf:protobuf-java:3.0.0'
-    compile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0'
+    implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
 
     protobuf files("$projectDir/../ros2rag.example/src/main/proto")
 }
diff --git a/ros2rag.senderstub/build.gradle b/ros2rag.senderstub/build.gradle
index 362a729..a7900a9 100644
--- a/ros2rag.senderstub/build.gradle
+++ b/ros2rag.senderstub/build.gradle
@@ -25,8 +25,8 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}"
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
     implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
-    compile 'com.google.protobuf:protobuf-java:3.0.0'
-    compile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0'
+    implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
 
     protobuf files("$projectDir/../ros2rag.example/src/main/proto")
 }
diff --git a/ros2rag.starter/build.gradle b/ros2rag.starter/build.gradle
index 42aa7ec..9a29c6d 100644
--- a/ros2rag.starter/build.gradle
+++ b/ros2rag.starter/build.gradle
@@ -31,8 +31,8 @@ dependencies {
     implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-xml', version: "${jackson_version}"
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "${jackson_version}"
     implementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
-    compile 'com.google.protobuf:protobuf-java:3.0.0'
-    compile group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
+    implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0'
+    implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
 
     jastadd2 "org.jastadd:jastadd:2.3.4"
 }
diff --git a/ros2rag.tests/build.gradle b/ros2rag.tests/build.gradle
index 568f441..add5c20 100644
--- a/ros2rag.tests/build.gradle
+++ b/ros2rag.tests/build.gradle
@@ -19,14 +19,15 @@ buildscript {
 }
 
 dependencies {
-    runtime 'org.jastadd:jastadd:2.3.4'
     implementation project(':ros2rag.base')
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
-    testImplementation 'org.assertj:assertj-core:3.12.1'
+
+    runtime group: 'org.jastadd', name: 'jastadd', version: '2.3.4'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.4.0'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.4.0'
+    testImplementation group: 'org.assertj', name: 'assertj-core', version: '3.12.1'
     testImplementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15'
     testImplementation group: 'net.sf.beaver', name: 'beaver-rt', version: '0.9.11'
-    testImplementation 'com.google.protobuf:protobuf-java:3.0.0'
+    testImplementation group: 'com.google.protobuf', name: 'protobuf-java', version: '3.0.0'
 }
 
 test {
-- 
GitLab