Skip to content

Commit

Permalink
Merge pull request DSpace#9997 from tdonohue/dependency_cleanup
Browse files Browse the repository at this point in the history 
Minor Dependency cleanup in POMs
  • Loading branch information
@tdonohue
tdonohue authored Nov 14, 2024
2 parents 34a1b53 + 9cc078a commit 78bf61d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 92 deletions.
73 changes: 2 additions & 71 deletions dspace-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,11 +793,13 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>

<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.10.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -873,75 +875,4 @@
</exclusions>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<!-- for mockserver -->
<!-- Solve dependency convergence issues related to Solr and
'mockserver-junit-rule' by selecting the versions we want to use. -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.114.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.114.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.114.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.114.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.114.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.114.Final</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-core</artifactId>
<version>2.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.java-json-tools</groupId>
<artifactId>json-schema-validator</artifactId>
<version>2.2.14</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>2.13.11</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

</project>
36 changes: 15 additions & 21 deletions dspace/modules/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<id>unpack-additions</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
Expand All @@ -42,6 +42,20 @@
<excludes>META-INF/**</excludes>
</configuration>
</execution>
<execution>
<id>unpack-server</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<includeGroupIds>org.dspace</includeGroupIds>
<includeArtifactIds>dspace-server-webapp</includeArtifactIds>
<includes>**/static/**,**/*.properties</includes>
<outputDirectory>${project.build.directory}/additions</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand All @@ -68,26 +82,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>prepare-package</phase>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<includeScope>runtime</includeScope>
<includeGroupIds>org.dspace</includeGroupIds>
<includeArtifactIds>dspace-server-webapp</includeArtifactIds>
<includes>**/static/**,**/*.properties</includes>
<outputDirectory>${project.build.directory}/additions</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<!-- This plugin allows us to run a Groovy script in our Maven POM
(see: https://groovy.github.io/gmaven/groovy-maven-plugin/execute.html )
We are generating a OS-agnostic version (agnostic.build.dir) of
Expand Down

0 comments on commit 78bf61d

Please sign in to comment.