Skip to content

Commit

Permalink
Merge pull request DSpace#10034 from tdonohue/port_10032_to_7x
Browse files Browse the repository at this point in the history
[Port dspace-7_x] Remove unused dependencies from several modules
  • Loading branch information
tdonohue authored Nov 21, 2024
2 parents 888332a + 9f82409 commit bbf9ccf
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 41 deletions.
5 changes: 0 additions & 5 deletions dspace-services/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@
<version>6.1.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
Expand All @@ -159,6 +155,5 @@
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>${spring-boot.version}</version>
</dependency>

</dependencies>
</project>
18 changes: 0 additions & 18 deletions dspace-sword/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,6 @@
</properties>

<dependencies>

<!-- Leave this out for the moment, as the source is in the tree -->
<!--
<dependency>
<groupId>org.dspace</groupId>
<artifactId>sword-common</artifactId>
<version>1.0.0</version>
</dependency>-->

<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-api</artifactId>
Expand Down Expand Up @@ -68,11 +59,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</dependency>

<!-- additional dependencies for the sword-common code -->
<dependency>
<groupId>commons-fileupload</groupId>
Expand Down Expand Up @@ -107,10 +93,6 @@
<artifactId>xom</artifactId>
<version>1.3.9</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependencies>

</project>
5 changes: 0 additions & 5 deletions dspace/modules/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,6 @@ just adding new jar in the classloader</description>
<artifactId>dspace-server-webapp</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.client.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
Expand Down
14 changes: 1 addition & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1179,11 +1179,7 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.swordapp</groupId>
<artifactId>sword-common</artifactId>
<version>1.1</version>
</dependency>

<!-- Explicitly Specify Latest Version of Spring -->
<dependency>
<artifactId>spring-core</artifactId>
Expand Down Expand Up @@ -1484,14 +1480,6 @@
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
<!-- commons-collections v3 is still required by commons-beanutils,
which is required by commons-configuration. Once those are
upgraded, we should remove this dependency -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-configuration2</artifactId>
Expand Down

0 comments on commit bbf9ccf

Please sign in to comment.