hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2050 from Georgetown-University-Libraries/ds3903m

Browse Source 
[DS-3903] Port to master, Legacy Rest Jar Resolution
This commit is contained in:
Tim Donohue
2018-05-08 11:01:00 -05:00
committed by GitHub
parent d64ebe2788 a5a3dda2fd
commit 598f35b267
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dspace-rest/pom.xml
View File

@@ -64,10 +64,21 @@
<artifactId>jersey-media-json-jackson</artifactId> <artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version> <version>${jersey.version}</version>
<exclusions> <exclusions>
<!-- Pinned to 2.5.4 below, this is because the current version number includes both 2.5.4 AND 2.5.0 jackson-annotations-->
<exclusion> <exclusion>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-module-jaxb-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@@ -75,7 +86,22 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId> <artifactId>jackson-annotations</artifactId>
<version>2.5.4</version> <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson.version}</version>
</dependency> </dependency>
<!-- Spring 3 dependencies --> <!-- Spring 3 dependencies -->

2
pom.xml
View File

@@ -29,7 +29,7 @@
<solr.version>4.10.4</solr.version> <solr.version>4.10.4</solr.version>
<jena.version>2.13.0</jena.version> <jena.version>2.13.0</jena.version>
<slf4j.version>1.7.22</slf4j.version> <slf4j.version>1.7.22</slf4j.version>
<jackson.version>2.8.6</jackson.version> <jackson.version>2.8.11</jackson.version>
<jersey.version>2.26</jersey.version> <jersey.version>2.26</jersey.version>
<hibernate.version>5.2.8.Final</hibernate.version> <hibernate.version>5.2.8.Final</hibernate.version>
<hibernate-validator.version>5.4.2.Final</hibernate-validator.version> <hibernate-validator.version>5.4.2.Final</hibernate-validator.version>