Skip to content

Commit ef28827

Browse files
webronwebron
committed
Merge pull request #1291 from swagger-api/feature/jackson-upgrade
updated jackson versions, added maven enforcer plugin
2 parents 32f7398 + 3440da6 commit ef28827

File tree

4 files changed

+87
-13
lines changed

4 files changed

+87
-13
lines changed

‎modules/swagger-core/pom.xml‎

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>org.apache.commons</groupId>
5353
<artifactId>commons-lang3</artifactId>
54-
<scope>compile</scope>
5554
</dependency>
5655
<dependency>
5756
<groupId>org.scalatest</groupId>
@@ -71,12 +70,32 @@
7170
<groupId>com.fasterxml.jackson.core</groupId>
7271
<artifactId>jackson-annotations</artifactId>
7372
<version>${jackson-version}</version>
74-
<scope>compile</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.core</groupId>
76+
<artifactId>jackson-databind</artifactId>
77+
<version>${jackson-version}</version>
78+
<exclusions>
79+
<exclusion>
80+
<groupId>com.fasterxml.jackson.core</groupId>
81+
<artifactId>jackson-annotations</artifactId>
82+
</exclusion>
83+
</exclusions>
7584
</dependency>
7685
<dependency>
7786
<groupId>com.fasterxml.jackson.datatype</groupId>
7887
<artifactId>jackson-datatype-joda</artifactId>
7988
<version>${jackson-version}</version>
89+
<exclusions>
90+
<exclusion>
91+
<groupId>com.fasterxml.jackson.core</groupId>
92+
<artifactId>jackson-databind</artifactId>
93+
</exclusion>
94+
<exclusion>
95+
<groupId>com.fasterxml.jackson.core</groupId>
96+
<artifactId>jackson-annotations</artifactId>
97+
</exclusion>
98+
</exclusions>
8099
</dependency>
81100
<dependency>
82101
<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -87,14 +106,27 @@
87106
<groupId>io.swagger</groupId>
88107
<artifactId>swagger-models</artifactId>
89108
<version>${project.parent.version}</version>
90-
<scope>compile</scope>
91109
</dependency>
92110

93111
<dependency>
94112
<groupId>com.fasterxml.jackson.module</groupId>
95113
<artifactId>jackson-module-scala_2.10</artifactId>
96-
<version>${jackson-version}</version>
114+
<version>${jackson-scala-version}</version>
97115
<scope>test</scope>
116+
<exclusions>
117+
<exclusion>
118+
<groupId>com.fasterxml.jackson.core</groupId>
119+
<artifactId>jackson-databind</artifactId>
120+
</exclusion>
121+
<exclusion>
122+
<groupId>com.fasterxml.jackson.core</groupId>
123+
<artifactId>jackson-annotations</artifactId>
124+
</exclusion>
125+
<exclusion>
126+
<groupId>com.google.guava</groupId>
127+
<artifactId>guava</artifactId>
128+
</exclusion>
129+
</exclusions>
98130
</dependency>
99131
<dependency>
100132
<groupId>joda-time</groupId>
@@ -106,7 +138,6 @@
106138
<groupId>com.google.guava</groupId>
107139
<artifactId>guava</artifactId>
108140
<version>18.0</version>
109-
<scope>test</scope>
110141
</dependency>
111142
<dependency>
112143
<groupId>org.joda</groupId>
@@ -118,6 +149,16 @@
118149
<groupId>com.fasterxml.jackson.datatype</groupId>
119150
<artifactId>jackson-datatype-guava</artifactId>
120151
<version>${jackson-guava-version}</version>
152+
<exclusions>
153+
<exclusion>
154+
<groupId>com.fasterxml.jackson.core</groupId>
155+
<artifactId>jackson-databind</artifactId>
156+
</exclusion>
157+
<exclusion>
158+
<groupId>com.google.guava</groupId>
159+
<artifactId>guava</artifactId>
160+
</exclusion>
161+
</exclusions>
121162
<scope>test</scope>
122163
</dependency>
123164
<dependency>

‎modules/swagger-jaxrs/pom.xml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,19 +68,22 @@
6868
<groupId>com.fasterxml.jackson.dataformat</groupId>
6969
<artifactId>jackson-dataformat-yaml</artifactId>
7070
<version>${jackson-version}</version>
71-
<scope>compile</scope>
7271
</dependency>
7372
<dependency>
7473
<groupId>com.fasterxml.jackson.dataformat</groupId>
7574
<artifactId>jackson-dataformat-xml</artifactId>
7675
<version>${jackson-version}</version>
77-
<scope>compile</scope>
76+
<exclusions>
77+
<exclusion>
78+
<groupId>com.fasterxml.jackson.core</groupId>
79+
<artifactId>jackson-annotations</artifactId>
80+
</exclusion>
81+
</exclusions>
7882
</dependency>
7983
<dependency>
8084
<groupId>io.swagger</groupId>
8185
<artifactId>swagger-core</artifactId>
8286
<version>${project.parent.version}</version>
83-
<scope>compile</scope>
8487
</dependency>
8588
<dependency>
8689
<groupId>javax.servlet</groupId>
@@ -90,18 +93,28 @@
9093
<groupId>javax.ws.rs</groupId>
9194
<artifactId>jsr311-api</artifactId>
9295
<version>1.1.1</version>
93-
<scope>compile</scope>
9496
</dependency>
9597
<dependency>
9698
<groupId>org.reflections</groupId>
9799
<artifactId>reflections</artifactId>
98100
<version>0.9.9</version>
101+
<exclusions>
102+
<exclusion>
103+
<groupId>com.google.guava</groupId>
104+
<artifactId>guava</artifactId>
105+
</exclusion>
106+
</exclusions>
99107
</dependency>
108+
<dependency>
109+
<groupId>com.google.guava</groupId>
110+
<artifactId>guava</artifactId>
111+
<version>18.0</version>
112+
</dependency>
113+
100114
<dependency>
101115
<groupId>com.fasterxml.jackson.jaxrs</groupId>
102116
<artifactId>jackson-jaxrs-json-provider</artifactId>
103117
<version>${jackson-version}</version>
104-
<scope>compile</scope>
105118
</dependency>
106119
<dependency>
107120
<groupId>ch.qos.logback</groupId>

‎modules/swagger-jersey2-jaxrs/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
<groupId>org.glassfish.jersey.containers</groupId>
8686
<artifactId>jersey-container-servlet-core</artifactId>
8787
<version>${jersey2-version}</version>
88+
<exclusions>
89+
<exclusion>
90+
<groupId>com.google.guava</groupId>
91+
<artifactId>guava</artifactId>
92+
</exclusion>
93+
</exclusions>
8894
</dependency>
8995
<dependency>
9096
<groupId>org.glassfish.jersey.media</groupId>

‎pom.xml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@
7878
<directory>target</directory>
7979
<finalName>${project.artifactId}-${project.version}</finalName>
8080
<plugins>
81+
<plugin>
82+
<groupId>org.apache.maven.plugins</groupId>
83+
<artifactId>maven-enforcer-plugin</artifactId>
84+
<version>1.4</version>
85+
<executions>
86+
<execution>
87+
<id>enforce-versions</id>
88+
<goals>
89+
<goal>enforce</goal>
90+
</goals>
91+
</execution>
92+
</executions>
93+
</plugin>
8194
<plugin>
8295
<artifactId>maven-dependency-plugin</artifactId>
8396
<executions>
@@ -538,8 +551,9 @@
538551
<servlet-api-version>2.5</servlet-api-version>
539552
<jersey-version>1.13</jersey-version>
540553
<jersey2-version>2.1</jersey2-version>
541-
<jackson-version>2.4.2</jackson-version>
542-
<jackson-guava-version>2.4.2</jackson-guava-version>
554+
<jackson-version>2.4.5</jackson-version>
555+
<jackson-scala-version>2.4.5-1</jackson-scala-version>
556+
<jackson-guava-version>2.4.5</jackson-guava-version>
543557
<logback-version>1.0.1</logback-version>
544558

545559
<junit-version>4.8.2</junit-version>
@@ -548,7 +562,7 @@
548562
<maven-plugin-version>1.0.0</maven-plugin-version>
549563
<commons-lang-version>3.2.1</commons-lang-version>
550564
<slf4j-version>1.6.3</slf4j-version>
551-
<scala-test-version>2.1.3</scala-test-version>
565+
<scala-test-version>2.2.2</scala-test-version>
552566
<jetty-version>8.1.11.v20130520</jetty-version>
553567
<servlet-api-version>2.5</servlet-api-version>
554568
<scala-maven-plugin-version>3.1.5</scala-maven-plugin-version>

0 commit comments

Comments
 (0)