Skip to content

Commit 145c532

Browse files
hmiguimhmiguim
committed
Remove unused dependency
1 parent eae2b99 commit 145c532

File tree

14 files changed

+13
-169
lines changed

14 files changed

+13
-169
lines changed

‎dev/codeserver/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@
7474
<artifactId>restygwt</artifactId>
7575
<version>2.2.12-keeps</version>
7676
</dependency>
77-
<dependency>
78-
<groupId>org.glassfish.jersey.media</groupId>
79-
<artifactId>jersey-media-multipart</artifactId>
80-
<version>3.1.5</version>
81-
</dependency>
8277
<dependency>
8378
<groupId>jakarta.ws.rs</groupId>
8479
<artifactId>jakarta.ws.rs-api</artifactId>

‎pom.xml

+1-67
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<java_version>21</java_version>
123123
<gwt.version>2.12.2</gwt.version>
124124
<cas.client.version>4.0.4</cas.client.version>
125-
<jersey.version>3.1.7</jersey.version>
125+
<jersey.version>3.1.9</jersey.version>
126126
<swagger.version>2.2.22</swagger.version>
127127
<jackson.version>2.17.1</jackson.version>
128128
<spring.version>6.2.0</spring.version>
@@ -796,77 +796,11 @@
796796
<scope>test</scope>
797797
</dependency>
798798
<!-- REST API related dependencies - start -->
799-
<dependency>
800-
<groupId>org.glassfish.jersey</groupId>
801-
<artifactId>jersey-bom</artifactId>
802-
<version>${jersey.version}</version>
803-
<type>pom</type>
804-
<scope>import</scope>
805-
</dependency>
806-
<dependency>
807-
<groupId>org.glassfish.jersey.bundles</groupId>
808-
<artifactId>jaxrs-ri</artifactId>
809-
<version>${jersey.version}</version>
810-
</dependency>
811-
<dependency>
812-
<groupId>org.glassfish.jersey.ext</groupId>
813-
<artifactId>jersey-spring6</artifactId>
814-
<version>3.1.7</version>
815-
<exclusions>
816-
<exclusion>
817-
<groupId>org.springframework</groupId>
818-
<artifactId>spring-context</artifactId>
819-
</exclusion>
820-
</exclusions>
821-
</dependency>
822-
<!-- https://mvnrepository.com/artifact/jakarta.ws.rs/jakarta.ws.rs-api -->
823799
<dependency>
824800
<groupId>jakarta.ws.rs</groupId>
825801
<artifactId>jakarta.ws.rs-api</artifactId>
826802
<version>3.1.0</version>
827803
</dependency>
828-
<dependency>
829-
<groupId>org.glassfish.jersey.core</groupId>
830-
<artifactId>jersey-server</artifactId>
831-
<version>${jersey.version}</version>
832-
</dependency>
833-
<dependency>
834-
<groupId>org.glassfish.jersey.containers</groupId>
835-
<artifactId>jersey-container-servlet-core</artifactId>
836-
<version>${jersey.version}</version>
837-
</dependency>
838-
<dependency>
839-
<groupId>org.glassfish.jersey.media</groupId>
840-
<artifactId>jersey-media-moxy</artifactId>
841-
<version>${jersey.version}</version>
842-
</dependency>
843-
<dependency>
844-
<groupId>org.glassfish.jersey.media</groupId>
845-
<artifactId>jersey-media-multipart</artifactId>
846-
<version>${jersey.version}</version>
847-
</dependency>
848-
<dependency>
849-
<groupId>org.glassfish.jersey.core</groupId>
850-
<artifactId>jersey-client</artifactId>
851-
<version>${jersey.version}</version>
852-
</dependency>
853-
<dependency>
854-
<groupId>org.glassfish.hk2</groupId>
855-
<artifactId>osgi-resource-locator</artifactId>
856-
<version>1.0.3</version>
857-
</dependency>
858-
<dependency>
859-
<groupId>org.glassfish.jersey.test-framework</groupId>
860-
<artifactId>jersey-test-framework-core</artifactId>
861-
<version>${jersey.version}</version>
862-
<scope>test</scope>
863-
</dependency>
864-
<dependency>
865-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
866-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
867-
<version>${jersey.version}</version>
868-
<scope>test</scope>
869-
</dependency>
870804
<dependency>
871805
<groupId>io.swagger.core.v3</groupId>
872806
<artifactId>swagger-jaxrs2-jakarta</artifactId>

‎roda-core/roda-core-tests/pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@
8888
<artifactId>jakarta.ws.rs-api</artifactId>
8989
</dependency>
9090

91-
<dependency>
92-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
93-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
94-
</dependency>
9591
<dependency>
9692
<groupId>org.springframework</groupId>
9793
<artifactId>spring-core</artifactId>
@@ -118,18 +114,6 @@
118114
<groupId>org.springframework.boot</groupId>
119115
<artifactId>spring-boot-starter-test</artifactId>
120116
</dependency>
121-
<dependency>
122-
<groupId>org.glassfish.jersey.ext</groupId>
123-
<artifactId>jersey-spring6</artifactId>
124-
</dependency>
125-
<dependency>
126-
<groupId>org.glassfish.jersey.core</groupId>
127-
<artifactId>jersey-common</artifactId>
128-
</dependency>
129-
<dependency>
130-
<groupId>org.glassfish.jersey.media</groupId>
131-
<artifactId>jersey-media-multipart</artifactId>
132-
</dependency>
133117
<dependency>
134118
<groupId>org.hamcrest</groupId>
135119
<artifactId>hamcrest-all</artifactId>

‎roda-core/roda-core-tests/src/main/java/org/roda/core/model/ModelServiceTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.stream.Collectors;
3636
import java.util.stream.StreamSupport;
3737

38+
import com.google.common.collect.Lists;
3839
import org.apache.commons.io.IOUtils;
3940
import org.hamcrest.MatcherAssert;
4041
import org.hamcrest.Matchers;
@@ -86,7 +87,6 @@
8687
import gov.loc.premis.v3.EventComplexType;
8788
import gov.loc.premis.v3.ObjectCharacteristicsComplexType;
8889
import gov.loc.premis.v3.ObjectIdentifierComplexType;
89-
import jersey.repackaged.com.google.common.collect.Lists;
9090

9191
/**
9292
* Unit tests for ModelService

‎roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/BagitSIPPluginsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import java.util.Map;
1919
import java.util.stream.Collectors;
2020

21+
import com.google.common.collect.Lists;
2122
import org.roda.core.CorporaConstants;
2223
import org.roda.core.RodaCoreFactory;
2324
import org.roda.core.TestsHelper;
@@ -58,8 +59,6 @@
5859

5960
import com.google.common.collect.Iterables;
6061

61-
import jersey.repackaged.com.google.common.collect.Lists;
62-
6362
@Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
6463
public class BagitSIPPluginsTest {
6564

‎roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/EARKSIPPluginsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.Optional;
2121
import java.util.stream.Stream;
2222

23+
import com.google.common.collect.Lists;
2324
import org.roda.core.CorporaConstants;
2425
import org.roda.core.RodaCoreFactory;
2526
import org.roda.core.TestsHelper;
@@ -70,8 +71,6 @@
7071

7172
import com.google.common.collect.Iterables;
7273

73-
import jersey.repackaged.com.google.common.collect.Lists;
74-
7574
@Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
7675
public class EARKSIPPluginsTest {
7776
private static final Logger LOGGER = LoggerFactory.getLogger(EARKSIPPluginsTest.class);

‎roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/FailureIngestPluginTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.List;
1818
import java.util.stream.Collectors;
1919

20+
import com.google.common.collect.Lists;
2021
import org.roda.core.RodaCoreFactory;
2122
import org.roda.core.TestsHelper;
2223
import org.roda.core.common.iterables.CloseableIterable;
@@ -61,8 +62,6 @@
6162

6263
import com.google.common.collect.Iterables;
6364

64-
import jersey.repackaged.com.google.common.collect.Lists;
65-
6665
@Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
6766
public class FailureIngestPluginTest {
6867
private static final Logger LOGGER = LoggerFactory.getLogger(FailureIngestPluginTest.class);

‎roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/InternalPluginsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* The contents of this file are subject to the license and copyright
33
* detailed in the LICENSE file at the root of the source
44
* tree and available online at
5-
*
5+
* <p>
66
* https://github.com/keeps/roda
77
*/
88
package org.roda.core.plugins;
@@ -29,6 +29,7 @@
2929
import java.util.Map;
3030
import java.util.stream.Collectors;
3131

32+
import com.google.common.collect.Lists;
3233
import org.apache.commons.lang3.RandomStringUtils;
3334
import org.hamcrest.MatcherAssert;
3435
import org.hamcrest.core.Is;
@@ -96,7 +97,6 @@
9697
import gov.loc.premis.v3.LinkingAgentIdentifierComplexType;
9798
import gov.loc.premis.v3.ObjectCharacteristicsComplexType;
9899
import gov.loc.premis.v3.Representation;
99-
import jersey.repackaged.com.google.common.collect.Lists;
100100

101101
@Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
102102
public class InternalPluginsTest {

‎roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/MinimalIngestPluginTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.List;
1818
import java.util.stream.Collectors;
1919

20+
import com.google.common.collect.Lists;
2021
import org.roda.core.RodaCoreFactory;
2122
import org.roda.core.TestsHelper;
2223
import org.roda.core.common.PremisV3Utils;
@@ -67,7 +68,6 @@
6768
import com.google.common.collect.Iterables;
6869

6970
import gov.loc.premis.v3.EventComplexType;
70-
import jersey.repackaged.com.google.common.collect.Lists;
7171

7272
@Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
7373
public class MinimalIngestPluginTest {

‎roda-core/roda-core-tests/src/main/java/org/roda/core/plugins/PartialSuccessIngestPluginTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.List;
1818
import java.util.stream.Collectors;
1919

20+
import com.google.common.collect.Lists;
2021
import org.roda.core.RodaCoreFactory;
2122
import org.roda.core.TestsHelper;
2223
import org.roda.core.common.iterables.CloseableIterable;
@@ -61,8 +62,6 @@
6162

6263
import com.google.common.collect.Iterables;
6364

64-
import jersey.repackaged.com.google.common.collect.Lists;
65-
6665
@Test(groups = {RodaConstants.TEST_GROUP_ALL, RodaConstants.TEST_GROUP_DEV, RodaConstants.TEST_GROUP_TRAVIS})
6766
public class PartialSuccessIngestPluginTest {
6867
private static final Logger LOGGER = LoggerFactory.getLogger(PartialSuccessIngestPluginTest.class);

‎roda-core/roda-core-tests/src/main/java/org/roda/core/storage/AbstractStorageServiceTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import org.testng.annotations.AfterMethod;
4242
import org.testng.annotations.Test;
4343

44-
import jersey.repackaged.com.google.common.collect.Iterables;
45-
4644
/**
4745
*
4846
* @author Luis Faria <[email protected]>
@@ -913,7 +911,9 @@ public void testBinaryVersions() throws RODAException, IOException {
913911
// 6) list binary versions
914912
CloseableIterable<BinaryVersion> binaryVersions = getStorage().listBinaryVersions(binaryStoragePath);
915913
List<BinaryVersion> reusableBinaryVersions = new ArrayList<>();
916-
Iterables.addAll(reusableBinaryVersions, binaryVersions);
914+
//Iterables.addAll(reusableBinaryVersions, binaryVersions);
915+
916+
binaryVersions.forEach(reusableBinaryVersions::add);
917917

918918
assertEquals(3, reusableBinaryVersions.size());
919919

‎roda-core/roda-core/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,6 @@
189189
<groupId>com.fasterxml.jackson.datatype</groupId>
190190
<artifactId>jackson-datatype-jsr310</artifactId>
191191
</dependency>
192-
193-
<dependency>
194-
<groupId>org.glassfish.jersey.bundles.repackaged</groupId>
195-
<artifactId>jersey-guava</artifactId>
196-
<version>2.26-b03</version>
197-
</dependency>
198-
199192
<!-- Akka related dependencies - start -->
200193
<dependency>
201194
<groupId>org.apache.pekko</groupId>
@@ -253,10 +246,6 @@
253246
<groupId>org.eclipse.angus</groupId>
254247
<artifactId>angus-mail</artifactId>
255248
</dependency>
256-
<dependency>
257-
<groupId>org.glassfish.jersey.bundles</groupId>
258-
<artifactId>jaxrs-ri</artifactId>
259-
</dependency>
260249

261250
<dependency>
262251
<groupId>io.dropwizard.metrics</groupId>

‎roda-core/roda-core/src/main/java/org/roda/core/common/MetadataUtils.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
import java.io.StringWriter;
1414
import java.nio.charset.StandardCharsets;
1515
import java.util.ArrayList;
16-
import java.util.Collections;
1716
import java.util.List;
18-
import java.util.Map;
1917

20-
import org.glassfish.jaxb.runtime.api.JAXBRIContext;
2118
import org.roda.core.data.v2.validation.ValidationException;
2219
import org.roda.core.data.v2.validation.ValidationIssue;
2320
import org.roda.core.data.v2.validation.ValidationReport;
@@ -41,8 +38,6 @@
4138
public final class MetadataUtils {
4239
private static final Logger LOGGER = LoggerFactory.getLogger(MetadataUtils.class);
4340

44-
private static List<Class<?>> additionalClasses = new ArrayList<>();
45-
4641
/** Private empty constructor */
4742
private MetadataUtils() {
4843

@@ -63,8 +58,7 @@ public static InputStream createInputStream(final JAXBElement<?> object, final C
6358
try {
6459
StringWriter writer = new StringWriter();
6560

66-
final Map<String, String> props = Collections.singletonMap(JAXBRIContext.DEFAULT_NAMESPACE_REMAP, "http://www.loc.gov/premis/v3");
67-
final JAXBContext jaxbContext = JAXBContext.newInstance(tClass, props);
61+
final JAXBContext jaxbContext = JAXBContext.newInstance(tClass);
6862
Marshaller marshaller = jaxbContext.createMarshaller();
6963
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
7064
marshaller.marshal(object, writer);

‎roda-ui/roda-wui/pom.xml

-48
Original file line numberDiff line numberDiff line change
@@ -415,14 +415,6 @@
415415
<artifactId>saxon-dom</artifactId>
416416
<groupId>net.sf.saxon</groupId>
417417
</exclusion>
418-
<exclusion>
419-
<artifactId>
420-
jersey-test-framework-provider-grizzly2
421-
</artifactId>
422-
<groupId>
423-
org.glassfish.jersey.test-framework.providers
424-
</groupId>
425-
</exclusion>
426418
<exclusion>
427419
<artifactId>javax.servlet-api</artifactId>
428420
<groupId>javax.servlet</groupId>
@@ -434,28 +426,6 @@
434426
</exclusions>
435427
</dependency>
436428
<!-- REST API related dependencies - start -->
437-
<dependency>
438-
<groupId>org.glassfish.jersey.bundles</groupId>
439-
<artifactId>jaxrs-ri</artifactId>
440-
<exclusions>
441-
<exclusion>
442-
<groupId>org.glassfish.jersey.media</groupId>
443-
<artifactId>jersey-media-json-binding</artifactId>
444-
</exclusion>
445-
</exclusions>
446-
</dependency>
447-
<dependency>
448-
<groupId>org.glassfish.jersey.core</groupId>
449-
<artifactId>jersey-server</artifactId>
450-
</dependency>
451-
<dependency>
452-
<groupId>org.glassfish.jersey.containers</groupId>
453-
<artifactId>jersey-container-servlet-core</artifactId>
454-
</dependency>
455-
<dependency>
456-
<groupId>org.glassfish.jersey.media</groupId>
457-
<artifactId>jersey-media-json-jackson</artifactId>
458-
</dependency>
459429
<dependency>
460430
<groupId>com.fasterxml.jackson.core</groupId>
461431
<artifactId>jackson-core</artifactId>
@@ -468,24 +438,6 @@
468438
<groupId>com.fasterxml.jackson.core</groupId>
469439
<artifactId>jackson-annotations</artifactId>
470440
</dependency>
471-
<dependency>
472-
<groupId>org.glassfish.jersey.media</groupId>
473-
<artifactId>jersey-media-moxy</artifactId>
474-
</dependency>
475-
<dependency>
476-
<groupId>org.glassfish.jersey.media</groupId>
477-
<artifactId>jersey-media-multipart</artifactId>
478-
</dependency>
479-
<dependency>
480-
<groupId>org.glassfish.jersey.test-framework</groupId>
481-
<artifactId>jersey-test-framework-core</artifactId>
482-
<scope>test</scope>
483-
</dependency>
484-
<dependency>
485-
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
486-
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
487-
<scope>test</scope>
488-
</dependency>
489441
<dependency>
490442
<groupId>io.swagger.core.v3</groupId>
491443
<artifactId>swagger-jaxrs2-jakarta</artifactId>

0 commit comments

Comments
 (0)