From 6fdb23b857e6d001df29982acd3fdf3d758a3210 Mon Sep 17 00:00:00 2001 From: Gavin Date: Thu, 28 Mar 2024 09:40:44 -0700 Subject: [PATCH] Alphabetize deps & update syslog4j comment --- build.gradle | 69 +++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/build.gradle b/build.gradle index 0765939c..bb720a04 100644 --- a/build.gradle +++ b/build.gradle @@ -148,6 +148,10 @@ dependencies { // ### General application dependencies ### + implementation fromURL( + 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/handle/AbstractHandleClient-1.0.0.jar', + 'AbstractHandleClient-1.0.0' + ) implementation fromURL( 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/auth/kbase-auth-0.4.4.jar', 'kbase-auth-0.4.4' @@ -156,31 +160,27 @@ dependencies { 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/kidl/kbase-kidl-parser-1409261812-7863aef.jar', 'kbase-kidl-parser-1409261812-7863aef' ) + implementation fromURL( + 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/sample/SampleServiceClient-0.1.1.jar', + 'SampleServiceClient-0.1.1' + ) + implementation 'ch.qos.logback:logback-classic:1.1.2' + implementation 'com.google.guava:guava:14.0.1' + implementation 'com.github.ben-manes.caffeine:caffeine:2.9.3' + implementation 'commons-codec:commons-codec:1.8' + implementation 'commons-io:commons-io:2.4' implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.9' implementation 'com.fasterxml.jackson.core:jackson-core:2.9.9' implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.9' - implementation 'org.ini4j:ini4j:0.5.2' - implementation 'commons-io:commons-io:2.4' - implementation 'org.apache.commons:commons-lang3:3.1' - implementation 'commons-codec:commons-codec:1.8' implementation 'info.picocli:picocli:4.6.1' + implementation 'org.apache.commons:commons-lang3:3.1' + implementation 'org.apache.kafka:kafka-clients:2.1.0' + implementation 'org.ini4j:ini4j:0.5.2' + implementation 'org.mongodb:bson:4.11.1' + implementation 'org.mongodb:bson-record-codec:4.11.1' implementation 'org.mongodb:mongodb-driver-core:4.11.1' implementation 'org.mongodb:mongodb-driver-sync:4.11.1' - implementation 'org.mongodb:bson-record-codec:4.11.1' - implementation 'org.mongodb:bson:4.11.1' implementation 'org.slf4j:slf4j-api:1.7.30' - implementation 'ch.qos.logback:logback-classic:1.1.2' - implementation 'com.google.guava:guava:14.0.1' - implementation 'com.github.ben-manes.caffeine:caffeine:2.9.3' - implementation 'org.apache.kafka:kafka-clients:2.1.0' - implementation fromURL( - 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/handle/AbstractHandleClient-1.0.0.jar', - 'AbstractHandleClient-1.0.0' - ) - implementation fromURL( - 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/sample/SampleServiceClient-0.1.1.jar', - 'SampleServiceClient-0.1.1' - ) // ### Server dependencies, specifically for java_common JsonServerServlet ### @@ -188,24 +188,21 @@ dependencies { 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/common/kbase-common-0.2.0.jar', 'kbase-common-0.2.0' ) - // joda-time is required for kbase-common and syslog4j - implementation 'joda-time:joda-time:2.2' - // this is OOOOOOLD. But that probably means updating java_common - implementation 'org.eclipse.jetty.aggregate:jetty-all:7.0.0.v20091005' - implementation 'javax.servlet:servlet-api:2.5' - implementation 'javax.annotation:javax.annotation-api:1.3.2' - // Syslog4j 0.9.46 doesn't appear to be available on Maven. It apparently lives in - // a JetBrains artifact server, but that's too much trouble and there's only one version there - // anyway. - // https://mvnrepository.com/artifact/org.jetbrains/syslog4j/0.9.46 + // Pull from jars repo vs a maven repository to avoid the JNA dependency // Need to rework the java common logger to not use syslog4j at all since it's abandonware // and has a ton of CVEs, even in the newer versions. implementation fromURL( 'https://github.com/kbase/jars/raw/master/lib/jars/syslog4j/syslog4j-0.9.46.jar', 'syslog4j-0.9.46' ) + implementation 'javax.annotation:javax.annotation-api:1.3.2' + implementation 'javax.servlet:servlet-api:2.5' + // joda-time is required for kbase-common and syslog4j + implementation 'joda-time:joda-time:2.2' // needed for syslog4j implementation 'net.java.dev.jna:jna:3.4.0' + // this is OOOOOOLD. But that probably means updating java_common + implementation 'org.eclipse.jetty.aggregate:jetty-all:7.0.0.v20091005' // ### Blobstore / Shock client and dependencies ### @@ -226,18 +223,18 @@ dependencies { // ### Test ### - testImplementation 'junit:junit:4.12' - testImplementation 'org.hamcrest:hamcrest-core:1.3' - testImplementation 'com.github.zafarkhaja:java-semver:0.9.0' - testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.10' - testImplementation 'com.arangodb:arangodb-java-driver:6.7.2' - testImplementation 'org.mockito:mockito-core:3.0.0' - - testImplementation 'commons-lang:commons-lang:2.4' testImplementation fromURL( 'https://github.com/kbase/jars/raw/master/lib/jars/kbase/auth2/kbase-auth2-test-shadow-all-0.7.0.jar', 'kbase-auth2-test-shadow-all-0.7.0' ) + testImplementation 'com.arangodb:arangodb-java-driver:6.7.2' + testImplementation 'com.github.zafarkhaja:java-semver:0.9.0' + testImplementation 'org.hamcrest:hamcrest-core:1.3' + testImplementation 'commons-lang:commons-lang:2.4' + testImplementation 'junit:junit:4.12' + testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.1.10' + testImplementation 'org.mockito:mockito-core:3.0.0' + } task showTestClassPath {