Skip to content

Commit 3a8620f

Browse files
sapessisapessi
committed
Cleaned up dependencies to address issues #50. Also added maven-enforcer-plugin to root pom.xml to avoid dependency convergence in the future
1 parent ccdb65c commit 3a8620f

File tree

6 files changed

+34
-72
lines changed

6 files changed

+34
-72
lines changed

‎aws-serverless-java-container-core/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
<dependency>
3434
<groupId>javax.ws.rs</groupId>
3535
<artifactId>javax.ws.rs-api</artifactId>
36-
<version>2.1-m01</version>
36+
<version>2.0.1</version>
3737
</dependency>
3838

3939
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
4040
<dependency>
4141
<groupId>com.fasterxml.jackson.core</groupId>
4242
<artifactId>jackson-databind</artifactId>
43-
<version>2.8.4</version>
43+
<version>${jackson.version}</version>
4444
</dependency>
4545

4646
<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->

‎aws-serverless-java-container-jersey/pom.xml‎

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
</parent>
1616

1717
<properties>
18-
<jackson.version>2.8.4</jackson.version>
19-
<jersey.version>2.24</jersey.version>
18+
<jersey.version>2.25.1</jersey.version>
2019
</properties>
2120

2221
<dependencies>
@@ -34,27 +33,6 @@
3433
<version>${jersey.version}</version>
3534
</dependency>
3635

37-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
38-
<dependency>
39-
<groupId>com.fasterxml.jackson.core</groupId>
40-
<artifactId>jackson-core</artifactId>
41-
<version>${jackson.version}</version>
42-
</dependency>
43-
44-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
45-
<dependency>
46-
<groupId>com.fasterxml.jackson.core</groupId>
47-
<artifactId>jackson-databind</artifactId>
48-
<version>${jackson.version}</version>
49-
</dependency>
50-
51-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
52-
<dependency>
53-
<groupId>com.fasterxml.jackson.core</groupId>
54-
<artifactId>jackson-annotations</artifactId>
55-
<version>${jackson.version}</version>
56-
</dependency>
57-
5836
<!-- https://mvnrepository.com/artifact/junit/junit -->
5937
<dependency>
6038
<groupId>junit</groupId>
@@ -71,20 +49,19 @@
7149
<scope>test</scope>
7250
</dependency>
7351

74-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider -->
75-
<dependency>
76-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
77-
<artifactId>jackson-jaxrs-json-provider</artifactId>
78-
<version>2.8.4</version>
79-
<scope>test</scope>
80-
</dependency>
81-
8252
<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.media/jersey-media-json-jackson -->
8353
<dependency>
8454
<groupId>org.glassfish.jersey.media</groupId>
8555
<artifactId>jersey-media-json-jackson</artifactId>
86-
<version>2.24</version>
56+
<version>${jersey.version}</version>
8757
<scope>test</scope>
58+
<!-- excluding to resolve a dependency convergence with jackson-annotations -->
59+
<exclusions>
60+
<exclusion>
61+
<groupId>com.fasterxml.jackson.core</groupId>
62+
<artifactId>jackson-annotations</artifactId>
63+
</exclusion>
64+
</exclusions>
8865
</dependency>
8966

9067
</dependencies>

‎aws-serverless-java-container-spark/pom.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</parent>
1616

1717
<properties>
18-
<jackson.version>2.8.4</jackson.version>
1918
<spark.version>2.5.3</spark.version>
2019
</properties>
2120

@@ -34,27 +33,6 @@
3433
<version>${spark.version}</version>
3534
</dependency>
3635

37-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
38-
<dependency>
39-
<groupId>com.fasterxml.jackson.core</groupId>
40-
<artifactId>jackson-core</artifactId>
41-
<version>${jackson.version}</version>
42-
</dependency>
43-
44-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
45-
<dependency>
46-
<groupId>com.fasterxml.jackson.core</groupId>
47-
<artifactId>jackson-databind</artifactId>
48-
<version>${jackson.version}</version>
49-
</dependency>
50-
51-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations -->
52-
<dependency>
53-
<groupId>com.fasterxml.jackson.core</groupId>
54-
<artifactId>jackson-annotations</artifactId>
55-
<version>${jackson.version}</version>
56-
</dependency>
57-
5836
<!-- https://mvnrepository.com/artifact/junit/junit -->
5937
<dependency>
6038
<groupId>junit</groupId>

‎aws-serverless-java-container-spring/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
<properties>
1818
<spring.version>4.3.4.RELEASE</spring.version>
19-
<jackson.version>2.8.4</jackson.version>
2019
</properties>
2120

2221
<dependencies>
@@ -58,20 +57,6 @@
5857
<scope>test</scope>
5958
</dependency>
6059

61-
<dependency>
62-
<groupId>com.fasterxml.jackson.core</groupId>
63-
<artifactId>jackson-annotations</artifactId>
64-
<version>${jackson.version}</version>
65-
<scope>test</scope>
66-
</dependency>
67-
68-
<dependency>
69-
<groupId>com.fasterxml.jackson.core</groupId>
70-
<artifactId>jackson-core</artifactId>
71-
<version>${jackson.version}</version>
72-
<scope>test</scope>
73-
</dependency>
74-
7560
<dependency>
7661
<groupId>com.fasterxml.jackson.core</groupId>
7762
<artifactId>jackson-databind</artifactId>

‎pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,31 @@
3535
</license>
3636
</licenses>
3737

38+
<properties>
39+
<jackson.version>2.8.4</jackson.version>
40+
</properties>
41+
3842
<build>
3943
<pluginManagement>
4044
<plugins>
45+
<plugin>
46+
<groupId>org.apache.maven.plugins</groupId>
47+
<artifactId>maven-enforcer-plugin</artifactId>
48+
<version>3.0.0-M1</version>
49+
<executions>
50+
<execution>
51+
<id>enforce</id>
52+
<configuration>
53+
<rules>
54+
<dependencyConvergence/>
55+
</rules>
56+
</configuration>
57+
<goals>
58+
<goal>enforce</goal>
59+
</goals>
60+
</execution>
61+
</executions>
62+
</plugin>
4163
<plugin>
4264
<groupId>org.apache.maven.plugins</groupId>
4365
<artifactId>maven-compiler-plugin</artifactId>

‎samples/jersey/pet-store/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<properties>
2727
<maven.compiler.source>1.8</maven.compiler.source>
2828
<maven.compiler.target>1.8</maven.compiler.target>
29-
<jersey.version>2.24</jersey.version>
29+
<jersey.version>2.25.1</jersey.version>
3030
<jackson.version>2.8.5</jackson.version>
3131
</properties>
3232

0 commit comments

Comments
 (0)