From cda581bf2899360ba6e6dd27ad292a8f8d16bde0 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Sat, 15 Oct 2022 23:45:58 -0400
Subject: [PATCH] gradle clean-up

---
 java_console/autoupdate/build.gradle |  2 +-
 java_console/io/build.gradle         |  2 +-
 java_tools/dependencies.gradle       |  1 +
 java_tools/proxy_server/build.gradle | 11 +++++------
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java_console/autoupdate/build.gradle b/java_console/autoupdate/build.gradle
index b9a73a47d6..a834342cbe 100644
--- a/java_console/autoupdate/build.gradle
+++ b/java_console/autoupdate/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     api project(':core_ui')
     api project(':core_io')
 
-    api group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
+    api global_libs.jcip
     api global_libs.json
     // not 'api' since Android would use own implementation
     implementation ts_plugin_libs.httpclient
diff --git a/java_console/io/build.gradle b/java_console/io/build.gradle
index 7833a51d2a..729bd59174 100644
--- a/java_console/io/build.gradle
+++ b/java_console/io/build.gradle
@@ -16,13 +16,13 @@ tasks.withType(Test) {
 
 dependencies {
     implementation global_libs.javaxJson
+    api global_libs.jcip
     api project(':models')
     api project(':core_io')
     api project(':logging')
 
     implementation group: 'com.fazecast', name: 'jSerialComm', version: '2.9.2'
     implementation group: 'tel.schich', name: 'javacan-core', version: '3.2.0'
-    implementation group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
     implementation global_libs.json
     implementation ts_plugin_libs.httpclient
 
diff --git a/java_tools/dependencies.gradle b/java_tools/dependencies.gradle
index da07b08247..5a1340e5b9 100644
--- a/java_tools/dependencies.gradle
+++ b/java_tools/dependencies.gradle
@@ -9,6 +9,7 @@ ext {
           javaxJson      : "javax.json:javax.json-api:1.1.4",
           snakeyaml      : "org.yaml:snakeyaml:1.26",
           commons_logging: "commons-logging:commons-logging:1.2",
+          jcip           : 'net.jcip:jcip-annotations:1.0',
   ]
 
   ts_plugin_libs = [
diff --git a/java_tools/proxy_server/build.gradle b/java_tools/proxy_server/build.gradle
index df3d027e4e..80051d76c1 100644
--- a/java_tools/proxy_server/build.gradle
+++ b/java_tools/proxy_server/build.gradle
@@ -6,14 +6,13 @@ dependencies {
     implementation project(':logging-api')
     implementation project(':ecu_io')
 
-    compileOnly 'net.jcip:jcip-annotations:1.0'
+    implementation global_libs.javaxJson
     implementation 'org.takes:takes:1.20'
-    implementation 'org.glassfish:javax.json:1.1.4'
-
-    testImplementation testFixtures(project(':ecu_io'))
-    testImplementation ts_plugin_libs.httpcore
 
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
-    implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
+    implementation global_libs.jsr305
+
+    testImplementation testFixtures(project(':ecu_io'))
+    testImplementation ts_plugin_libs.httpcore
 }
\ No newline at end of file