From 3bad0e5194719229f83ffcac94696f6d444fc228 Mon Sep 17 00:00:00 2001 From: hvarg Date: Tue, 13 Aug 2024 17:50:50 -0400 Subject: [PATCH] Remove unused and update vulnerable dependencies --- pom.xml.versionsBackup | 4 +- server/pom.xml | 316 +++++----------------------------- server/pom.xml.versionsBackup | 61 ++++--- shared/pom.xml | 19 +- shared/pom.xml.versionsBackup | 12 +- 5 files changed, 96 insertions(+), 316 deletions(-) diff --git a/pom.xml.versionsBackup b/pom.xml.versionsBackup index f0a52f2..c156528 100644 --- a/pom.xml.versionsBackup +++ b/pom.xml.versionsBackup @@ -4,7 +4,7 @@ 4.0.0 org.disk-project disk-project - 2.5.2 + 3.0.0 Disk pom @@ -21,7 +21,7 @@ github GitHub OWNER Apache Maven Packages - https://maven.pkg.github.com/KnowledgeCaptureAndDiscovery/DISK-WEB + https://maven.pkg.github.com/KnowledgeCaptureAndDiscovery/DISK-API diff --git a/server/pom.xml b/server/pom.xml index 171072c..cbc267a 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -16,9 +16,9 @@ - 2.36 2.0.1 2.13.3 + 2.36 2.6.2 1.10 1.3.4 @@ -51,7 +51,24 @@ ${javax.rs-api.version} + + javax.servlet + servlet-api + 2.5 + + + + javax.inject + javax.inject + 1 + + + + org.glassfish.jersey.core + jersey-server + ${jersey.version} + org.glassfish.jersey.containers jersey-container-servlet-core @@ -62,169 +79,54 @@ jersey-hk2 ${jersey.version} - - - org.apache.derby - derby - 10.16.1.1 - - - org.glassfish.jersey.media jersey-media-json-jackson ${jersey.version} + - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - ${jackson.version} + org.apache.httpcomponents + httpcore-osgi + 4.4.14 - - com.sun.mail - javax.mail - 1.6.2 + org.apache.httpcomponents + httpclient-osgi + 4.5.13 - - - com.google.api-client - google-api-client - 1.24.1 - - - - com.google.api-client - google-api-client-android - 1.24.1 - - - com.google.api-client - google-api-client-appengine - 1.24.1 - - - - com.google.api-client - google-api-client-gson - 1.19.1 - - - - com.google.api-client - google-api-client-jackson2 - 1.24.1 - - - - com.google.api-client - google-api-client-java6 - 1.24.1 - - - - com.google.api-client - google-api-client-servlet - 1.24.1 - - - - com.google.http-client - google-http-client - 1.24.1 - - - - com.google.http-client - google-http-client-android - 1.24.1 - - - - com.google.http-client - google-http-client-appengine - 1.24.1 + com.fasterxml.jackson.core + jackson-annotations + 2.13.3 - + - com.google.http-client - google-http-client-gson - 1.24.1 + commons-io + commons-io + 2.16.1 - + - com.google.http-client - google-http-client-jackson2 - 1.24.1 + jakarta.annotation + jakarta.annotation-api + 1.3.5 - + - com.google.http-client - google-http-client-jdo - 1.24.1 + org.apache.jena + jena-arq + 3.7.0 + com.google.code.gson gson - 2.1 - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} + 2.11.0 - - - javax.jdo - jdo2-api - 2.3-eb - - - - org.mortbay.jetty - jetty - 6.1.26 - - - - org.mortbay.jetty - jetty-util - 6.1.26 - - - - com.google.code.findbugs - jsr305 - 3.0.2 - - - - javax.transaction - transaction-api - 1.1 - provided - - - - com.google.apis - google-api-services-gmail - v1-rev93-1.24.1 - - - - - - com.google.guava - guava - 23.0 - - - com.auth0 @@ -237,146 +139,12 @@ jwks-rsa 0.21.1 - - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - org.jsoup - jsoup - 1.8.1 - - - - - - commons-codec - commons-codec - 1.10 - - - - org.apache.commons - commons-lang3 - 3.7 - - - - commons-logging - commons-logging - 1.2 - - - - net.sourceforge.htmlunit - htmlunit - 2.37.0 - - - - net.sourceforge.htmlunit - htmlunit-core-js - 2.31 - - - - net.sourceforge.htmlunit - htmlunit-cssparser - 1.0.0 - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - - org.apache.httpcomponents - httpcore - 4.4.9 - - - - org.apache.httpcomponents - httpmime - 4.5.5 - - - - org.eclipse.jetty - jetty-util - 9.4.11.v20180605 - - - - - net.sourceforge.htmlunit - neko-htmlunit - 2.31 - - - - org.eclipse.jetty.websocket - websocket-api - 9.4.10.v20180503 - - - - org.eclipse.jetty.websocket - websocket-client - 9.4.10.v20180503 - - - - org.eclipse.jetty.websocket - websocket-common - 9.4.10.v20180503 - - - - xalan - xalan - 2.7.2 - - - - xerces - xercesImpl - 2.12.0 - - - - xml-apis - xml-apis - 1.4.01 - - commons-configuration commons-configuration ${commons-configuration.version} - - - - org.mindrot - jbcrypt - ${jbcrypt.version} - - - - org.codehaus.jackson - jackson-mapper-asl - 1.5.0 - - io.minio diff --git a/server/pom.xml.versionsBackup b/server/pom.xml.versionsBackup index 459eaa3..171072c 100644 --- a/server/pom.xml.versionsBackup +++ b/server/pom.xml.versionsBackup @@ -1,6 +1,5 @@ - + 4.0.0 @@ -9,20 +8,20 @@ Disk server Disk REST server war - - org.disk-project - 2.5.0 - disk-project - ../pom.xml - + + org.disk-project + 3.0.0 + disk-project + ../pom.xml + - 2.22.2 + 2.36 2.0.1 - 2.4.6 + 2.13.3 2.6.2 1.10 - 1.2.4 + 1.3.4 0.3m 1.8 4.5.2 @@ -30,14 +29,6 @@ UTF-8 - - - github - Github - https://maven.pkg.github.com/KnowledgeCaptureAndDiscovery/ontapi - - - @@ -66,12 +57,16 @@ jersey-container-servlet-core ${jersey.version} - + + org.glassfish.jersey.inject + jersey-hk2 + ${jersey.version} + org.apache.derby derby - 10.11.1.1 + 10.16.1.1 @@ -181,7 +176,7 @@ com.fasterxml.jackson.core jackson-core - 2.9.2 + ${jackson.version} @@ -230,6 +225,18 @@ + + + com.auth0 + java-jwt + 3.19.1 + + + + com.auth0 + jwks-rsa + 0.21.1 + @@ -304,7 +311,7 @@ org.eclipse.jetty jetty-util - 9.4.10.v20180503 + 9.4.11.v20180605 @@ -370,6 +377,12 @@ 1.5.0 + + + io.minio + minio + 8.5.3 + @@ -392,4 +405,4 @@ - + \ No newline at end of file diff --git a/shared/pom.xml b/shared/pom.xml index f531ad8..90e9a2b 100644 --- a/shared/pom.xml +++ b/shared/pom.xml @@ -32,28 +32,35 @@ javax.ws.rs-api ${javax.rs-api.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + - + - + - + diff --git a/shared/pom.xml.versionsBackup b/shared/pom.xml.versionsBackup index 3f9ea86..f531ad8 100644 --- a/shared/pom.xml.versionsBackup +++ b/shared/pom.xml.versionsBackup @@ -12,15 +12,14 @@ org.disk-project disk-project - 2.5.0 + 3.0.0 ../pom.xml 2.0.1 - 2.1.1 3.1.0 - 2.4.6 + 2.13.3 ${project.build.directory}/${project.build.finalName} UTF-8 @@ -34,13 +33,6 @@ ${javax.rs-api.version} - - - org.fusesource.restygwt - restygwt - ${restygwt.version} - - javax.servlet