Skip to content

Commit 2abb660

Browse files
committed
Merge pull request #359 from UNC-Libraries/fix-woodstox-dependency
Fix that fcrepo-* have a transitive dependency on wstx-asl with the wrong groupId.
2 parents 7550bb5 + df4cbf9 commit 2abb660

File tree

3 files changed

+29
-1
lines changed

3 files changed

+29
-1
lines changed

fcrepo-cdr-fesl/pom.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@
8484
<groupId>org.slf4j</groupId>
8585
<artifactId>log4j-over-slf4j</artifactId>
8686
</exclusion>
87+
<exclusion>
88+
<groupId>woodstox</groupId>
89+
<artifactId>wstx-asl</artifactId>
90+
</exclusion>
8791
</exclusions>
8892
</dependency>
8993
<dependency>
@@ -92,6 +96,12 @@
9296
<version>${fcrepo.version}</version>
9397
<type>jar</type>
9498
<scope>compile</scope>
99+
<exclusions>
100+
<exclusion>
101+
<groupId>woodstox</groupId>
102+
<artifactId>wstx-asl</artifactId>
103+
</exclusion>
104+
</exclusions>
95105
</dependency>
96106
<dependency>
97107
<groupId>org.fcrepo</groupId>
@@ -104,6 +114,10 @@
104114
<groupId>org.slf4j</groupId>
105115
<artifactId>log4j-over-slf4j</artifactId>
106116
</exclusion>
117+
<exclusion>
118+
<groupId>woodstox</groupId>
119+
<artifactId>wstx-asl</artifactId>
120+
</exclusion>
107121
</exclusions>
108122
</dependency>
109123
<dependency>
@@ -151,5 +165,10 @@
151165
<artifactId>concurrentlinkedhashmap-lru</artifactId>
152166
<version>1.3.2</version>
153167
</dependency>
168+
<dependency>
169+
<groupId>org.codehaus.woodstox</groupId>
170+
<artifactId>wstx-asl</artifactId>
171+
<version>3.0.0</version>
172+
</dependency>
154173
</dependencies>
155174
</project>

fcrepo-irods-storage/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,10 @@
103103
<groupId>org.slf4j</groupId>
104104
<artifactId>log4j-over-slf4j</artifactId>
105105
</exclusion>
106+
<exclusion>
107+
<groupId>woodstox</groupId>
108+
<artifactId>wstx-asl</artifactId>
109+
</exclusion>
106110
</exclusions>
107111
</dependency>
108112
<dependency>
@@ -136,5 +140,10 @@
136140
<artifactId>staging-areas</artifactId>
137141
<version>0.0.1-SNAPSHOT</version>
138142
</dependency>
143+
<dependency>
144+
<groupId>org.codehaus.woodstox</groupId>
145+
<artifactId>wstx-asl</artifactId>
146+
<version>3.0.0</version>
147+
</dependency>
139148
</dependencies>
140149
</project>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<properties>
7474
<cdr.version>3.4-SNAPSHOT</cdr.version>
7575
<spring.version>3.2.13.RELEASE</spring.version>
76-
<fcrepo.version>3.8.0</fcrepo.version>
76+
<fcrepo.version>3.8.1</fcrepo.version>
7777
<spring.security.version>3.2.13.RELEASE</spring.security.version>
7878
<spring.ws.version>2.1.4.RELEASE</spring.ws.version>
7979
<spring.tiger.ws.version>1.5.10</spring.tiger.ws.version>

0 commit comments

Comments
 (0)