Remove unused libraries
backport, asm, common-collections
Change-Id: I65e85fb77303e37e1711967fab1f02fbebaa753c
diff --git a/pom.xml b/pom.xml
index 8418ec7..5844781 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,13 +250,62 @@
</build>
<dependencies>
- <!-- backport -->
<dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- <version>3.1</version>
+ <groupId>de.ids_mannheim.korap</groupId>
+ <artifactId>Krill</artifactId>
+ <version>${krill.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-grizzly2-http</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
+
+ <dependency>
+ <groupId>de.ids_mannheim.korap</groupId>
+ <artifactId>Koral</artifactId>
+ <version>${koral.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-jul</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
@@ -271,7 +320,7 @@
<!-- as long as we set spring6.version property transitive deps are ok
-->
</dependency>
-
+
<!-- JSON -->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
@@ -287,13 +336,6 @@
<version>2.5.0</version>
</dependency>
- <!-- Flyway -->
- <dependency>
- <groupId>org.flywaydb</groupId>
- <artifactId>flyway-core</artifactId>
- <version>${flyway.version}</version>
- </dependency>
-
<!-- Logging -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -340,122 +382,13 @@
<version>3.30.2-GA</version>
</dependency>
- <!-- EM:done -->
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.12.5</version>
- </dependency>
- <dependency>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Koral</artifactId>
- <version>${koral.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guava</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jul</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.42.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-dbcp2</artifactId>
- <version>2.9.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.8.0</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+ <!-- Encryption -->
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
<version>0.4</version>
</dependency>
- <dependency>
- <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Krill</artifactId>
- <version>${krill.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-grizzly2-http</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jul-to-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>0.10.2</version>
- </dependency>
-
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -473,11 +406,6 @@
<version>${spring.version}</version>
</dependency>
- <!-- <dependency> <groupId>org.springframework.security</groupId> <artifactId>spring-security-core</artifactId>
- <version>${spring.version}</version> </dependency> <dependency> <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId> <version>${spring.version}</version>
- </dependency> -->
- <!-- EM: done -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
@@ -508,14 +436,6 @@
<version>${spring.version}</version>
</dependency>
- <!-- end copy -->
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
-
<!-- jetty -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -533,12 +453,6 @@
<version>${jetty.version}</version>
</dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.3.1</version>
- </dependency>
-
<!-- not part of public release <dependency> <groupId>KorAP-graphDB</groupId>
<artifactId>KorAP-graphDB</artifactId> <version>1.0-SNAPSHOT</version> <exclusions>
<exclusion> <groupId>org.antlr</groupId> <artifactId>antlr4-runtime</artifactId>
@@ -559,12 +473,40 @@
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Database -->
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.15.1</version>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.42.0.0</version>
+ </dependency>
+
+ <!-- MySql -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>8.0.30</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-dbcp2</artifactId>
+ <version>2.9.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Flyway -->
+ <dependency>
+ <groupId>org.flywaydb</groupId>
+ <artifactId>flyway-core</artifactId>
+ <version>${flyway.version}</version>
+ </dependency>
+
<!-- Hibernate -->
<dependency>
<groupId>org.hibernate.orm</groupId>
@@ -599,6 +541,7 @@
<version>${hibernate.version}</version>
</dependency>
+
<!-- Validation -->
<dependency>
<groupId>org.hibernate.validator</groupId>
@@ -619,7 +562,6 @@
<version>3.1.0</version>
</dependency>
- <!-- servlet -->
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
@@ -627,16 +569,33 @@
<scope>provided</scope>
</dependency>
+ <!-- Utilities -->
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.12.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.15.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.8.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.11.0</version>
</dependency>
- <!--<dependency> <groupId>de.ids_mannheim.korap</groupId> <artifactId>Kustvakt-core</artifactId>
- <version>${project.version}</version> </dependency> <dependency> <groupId>de.ids_mannheim.korap</groupId>
- <artifactId>Kustvakt-core</artifactId> <version>${project.version}</version>
- <classifier>tests</classifier> <type>test-jar</type> <scope>test</scope>
- </dependency> -->
<!-- LDAP -->
<dependency>
@@ -650,28 +609,6 @@
<version>6.0.11</version>
</dependency>
-
- <!-- MySql -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>8.0.30</version>
- </dependency>
-
- <!-- Jersey -->
- <dependency>
- <groupId>org.glassfish.jersey.test-framework</groupId>
- <artifactId>jersey-test-framework-core</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.test-framework.providers</groupId>
- <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
- <version>${jersey.version}</version>
- <scope>test</scope>
- </dependency>
-
<!-- velocity -->
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -716,8 +653,8 @@
<artifactId>lombok</artifactId>
<version>1.18.30</version>
</dependency>
-
- <!-- Mockserver -->
+
+ <!-- Test -->
<dependency>
<groupId>org.mock-server</groupId>
<artifactId>mockserver-netty</artifactId>
@@ -730,5 +667,26 @@
<version>5.10.1</version>
<scope>test</scope>
</dependency>
+ <!-- Jersey Test -->
+ <dependency>
+ <groupId>org.glassfish.jersey.test-framework</groupId>
+ <artifactId>jersey-test-framework-core</artifactId>
+ <version>${jersey.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.test-framework.providers</groupId>
+ <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
+ <version>${jersey.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+
+ <!-- Used in KustvaktClassLoader.java-->
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>0.10.2</version>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
index f827871..5aacdd5 100644
--- a/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
+++ b/src/main/java/de/ids_mannheim/korap/rewrite/CollectionCleanRewrite.java
@@ -1,5 +1,6 @@
package de.ids_mannheim.korap.rewrite;
+import java.util.Arrays;
import java.util.Iterator;
import com.fasterxml.jackson.databind.JsonNode;
@@ -7,7 +8,6 @@
import de.ids_mannheim.korap.config.KustvaktConfiguration;
import de.ids_mannheim.korap.user.User;
-import edu.emory.mathcs.backport.java.util.Arrays;
/**
* EM: not used anymore. This rewrite was to remove an empty koral:doc
diff --git a/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java b/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
index 7dd99ad..28e75e9 100644
--- a/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
+++ b/src/main/java/de/ids_mannheim/korap/utils/KoralCollectionQueryBuilder.java
@@ -1,5 +1,6 @@
package de.ids_mannheim.korap.utils;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -12,7 +13,6 @@
import de.ids_mannheim.korap.exceptions.StatusCodes;
import de.ids_mannheim.korap.query.serialize.CollectionQueryProcessor;
import de.ids_mannheim.korap.response.Notifications;
-import edu.emory.mathcs.backport.java.util.Arrays;
/**
* convenience builder class for collection query
diff --git a/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java b/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
index 1ee65bf..c698321 100644
--- a/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
+++ b/src/test/java/de/ids_mannheim/korap/dao/UserGroupDaoTest.java
@@ -5,6 +5,7 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -28,7 +29,6 @@
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.exceptions.StatusCodes;
import de.ids_mannheim.korap.user.User.CorpusAccess;
-import edu.emory.mathcs.backport.java.util.Collections;
@ExtendWith(SpringExtension.class)
@ContextConfiguration("classpath:test-config.xml")
diff --git a/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java b/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
index 4d59790..bf389db 100644
--- a/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
+++ b/src/test/java/de/ids_mannheim/korap/misc/MapUtilsTest.java
@@ -2,11 +2,12 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
+import java.util.Arrays;
import java.util.Map;
import org.junit.jupiter.api.Test;
+
import de.ids_mannheim.korap.web.utils.MapUtils;
-import edu.emory.mathcs.backport.java.util.Arrays;
import jakarta.ws.rs.core.MultivaluedHashMap;
import jakarta.ws.rs.core.MultivaluedMap;
diff --git a/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java b/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
index 0e99a7f..499208f 100644
--- a/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
+++ b/src/test/java/de/ids_mannheim/korap/user/UserdataTest.java
@@ -3,21 +3,22 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.junit.jupiter.api.Test;
+
import com.fasterxml.jackson.databind.node.ArrayNode;
+
import de.ids_mannheim.korap.config.Attributes;
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.utils.JsonUtils;
import de.ids_mannheim.korap.validator.ApacheValidator;
-import edu.emory.mathcs.backport.java.util.Arrays;
-
-import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* @author hanl, margaretha