From fb54c7c00164ba973ed4b49954e0e63328912c82 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Sun, 21 Nov 2021 21:03:30 +0100
Subject: [PATCH] Cleanup some unused dependencies (#4315)

* Remove rhino-runtime dependency, for #4314

* Remove more unused dependencies

* Restore some Jena dependencies

* Trim dependencies further

* Restore jetty-servlets
---
 main/pom.xml   | 37 ++-----------------------------------
 server/pom.xml |  5 -----
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 1159da986..b245bbc3e 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -19,9 +19,6 @@
     <jee.port>3333</jee.port>
     <refine.data>/tmp/refine</refine.data>
     <powermock.version>2.0.9</powermock.version>
-    <!-- org.odftoolkit:odfdom-java:jar:0.9.0-RC1 bundles Jena 3.9.0 so we should match that
-         Jena 3.15.0 doesn't work. Versions through 3.14.0 appear to, but we'll be conservative
-    -->
     <jena.version>4.2.0</jena.version>
     <okhttp.version>4.9.2</okhttp.version>
     <poi.version>5.1.0</poi.version>
@@ -181,11 +178,6 @@
       <artifactId>butterfly</artifactId>
       <version>${butterfly.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mozilla</groupId>
-      <artifactId>rhino-runtime</artifactId>
-      <version>1.7.13</version>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -305,11 +297,6 @@
       <artifactId>httpclient5</artifactId>
       <version>5.1.2</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <version>4.5.13</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
@@ -320,27 +307,12 @@
       <artifactId>swc-parser-lazy</artifactId>
       <version>3.1.9</version>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.10.13</version>
-    </dependency>
 
-    <dependency>
+    <dependency> <!-- reported as unused by dependency:analyze, but tests fail without -->
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-arq</artifactId>
       <version>${jena.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-base</artifactId>
-      <version>${jena.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jena</groupId>
-      <artifactId>jena-cmds</artifactId>
-      <version>${jena.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-core</artifactId>
@@ -357,11 +329,6 @@
       <artifactId>commons-io</artifactId>
       <version>2.11.0</version>
     </dependency>
-    <dependency>
-      <groupId>com.metaweb</groupId>
-      <artifactId>lessen</artifactId>
-      <version>1.0</version>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -377,7 +344,7 @@
       <artifactId>juniversalchardet</artifactId>
       <version>2.4.0</version>
     </dependency>
-    <dependency>
+    <dependency> <!-- reported as unused by dependency:analyze, but broken without it -->
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
       <version>${jetty.version}</version>
diff --git a/server/pom.xml b/server/pom.xml
index 04743e34b..b62649a54 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -177,11 +177,6 @@
       <artifactId>butterfly</artifactId>
       <version>${butterfly.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mozilla</groupId>
-      <artifactId>rhino-runtime</artifactId>
-      <version>1.7.13</version>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>