Skip to content

Commit 9d089da

Browse files
committed
(commit 2) Adjust maven dependencies to avoid multiple versions of libraries
1 parent c6b0128 commit 9d089da

File tree

4 files changed

+12
-21
lines changed

4 files changed

+12
-21
lines changed

grouper-misc/grouper-messaging-aws/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>xerces</groupId>
3838
<artifactId>xercesImpl</artifactId>
39-
<version>2.10.0</version>
39+
<version>2.11.0</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.apache.commons</groupId>

grouper-misc/grouper-messaging-rabbitmq/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>xerces</groupId>
3939
<artifactId>xercesImpl</artifactId>
40-
<version>2.10.0</version>
40+
<version>2.11.0</version>
4141
</dependency>
4242

4343
<dependency>

grouper-parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@
166166
<xml.apis.version>1.4.01</xml.apis.version>
167167
<aws.java.sdk.core>1.11.529</aws.java.sdk.core>
168168
<aws.java.sdk.s3>1.11.529</aws.java.sdk.s3>
169-
<aws.java.sdk.sqs>1.11.567</aws.java.sdk.sqs>
170-
<aws.java.sdk.sns>1.11.567</aws.java.sdk.sns>
169+
<aws.java.sdk.sqs>1.11.529</aws.java.sdk.sqs>
170+
<aws.java.sdk.sns>1.11.529</aws.java.sdk.sns>
171171
<httpclient>4.5.8</httpclient>
172172
<httpcore>4.4.11</httpcore>
173173
<jackson.annotations>2.9.8</jackson.annotations>

grouper-ws/grouper-ws-scim/pom.xml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@
5858
<groupId>edu.psu.swe.scim</groupId>
5959
<artifactId>scim-server-common</artifactId>
6060
<version>2.22</version>
61+
<exclusions>
62+
<!-- swagger-jaxrs has dependency on jackson-dataformat-xml 2.4.2, which has a dependency
63+
on stax2-api 3.1.4. This is a different version than axis2-kernel needs -->
64+
<exclusion>
65+
<groupId>com.fasterxml.jackson.dataformat</groupId>
66+
<artifactId>jackson-dataformat-xml</artifactId>
67+
</exclusion>
68+
</exclusions>
6169
</dependency>
6270

6371
<dependency>
@@ -119,23 +127,6 @@
119127
<artifactId>lombok</artifactId>
120128
<version>1.14.8</version>
121129
</dependency>
122-
123-
<dependency>
124-
<groupId>org.hibernate</groupId>
125-
<artifactId>hibernate-core</artifactId>
126-
<exclusions>
127-
<exclusion>
128-
<groupId>org.dom4j</groupId>
129-
<artifactId>dom4j</artifactId>
130-
</exclusion>
131-
</exclusions>
132-
</dependency>
133-
134-
<dependency>
135-
<groupId>org.hibernate</groupId>
136-
<artifactId>hibernate-ehcache</artifactId>
137-
</dependency>
138-
139130
<dependency>
140131
<groupId>javax</groupId>
141132
<artifactId>javaee-api</artifactId>

0 commit comments

Comments
 (0)