Skip to content

Commit f394932

Browse files
frantumafrantuma
committed
bump jackson to 2.9.9 in cxf and jersey1
1 parent 51ab012 commit f394932

File tree

19 files changed

+787
-793
lines changed

19 files changed

+787
-793
lines changed

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>com.fasterxml.jackson.jaxrs</groupId>
6969
<artifactId>jackson-jaxrs-json-provider</artifactId>
70-
<version>[2.8.3,3)</version>
70+
<version>2.9.9</version>
7171
</dependency>
7272

7373
<!-- Swagger annotations -->

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
199199
{{/useBeanValidation}}
200200
<cxf-version>3.2.1</cxf-version>
201-
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
201+
<jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
202202
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
203203
</properties>
204204
</project>

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@
255255
<spring.boot-version>1.5.9.RELEASE</spring.boot-version>
256256
{{/generateSpringBootApplication}}
257257
<cxf-version>3.2.1</cxf-version>
258-
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
258+
<jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
259259
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
260260
</properties>
261261
</project>

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@
174174
<groupId>javax.validation</groupId>
175175
<artifactId>validation-api</artifactId>
176176
<version>1.1.0.Final</version>
177-
<scope>provided</scope>
178177
</dependency>
179178
{{/useBeanValidation}}
180179
</dependencies>
@@ -194,7 +193,7 @@
194193
<swagger-core-version>1.5.18</swagger-core-version>
195194
<jetty-version>9.2.9.v20150224</jetty-version>
196195
<jersey-version>1.19.1</jersey-version>
197-
<jackson-version>2.8.9</jackson-version>
196+
<jackson-version>2.9.9</jackson-version>
198197
<slf4j-version>1.7.21</slf4j-version>
199198
<junit-version>4.12</junit-version>
200199
<servlet-api-version>2.5</servlet-api-version>

‎samples/client/petstore/jaxrs-cxf-client/.swagger-codegen/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.4.3-SNAPSHOT
1+
2.4.8-SNAPSHOT

‎samples/client/petstore/jaxrs-cxf-client/pom.xml

Lines changed: 172 additions & 172 deletions
Original file line numberDiff line numberDiff line change
@@ -1,174 +1,174 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2-
<modelVersion>4.0.0</modelVersion>
3-
<groupId>io.swagger</groupId>
4-
<artifactId>jaxrs-cxf-petstore-client</artifactId>
5-
<packaging>jar</packaging>
6-
<name>jaxrs-cxf-petstore-client</name>
7-
<description>This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.</description>
8-
<version>1.0.0</version>
9-
<build>
10-
<sourceDirectory>src/main/java</sourceDirectory>
11-
<plugins>
12-
<plugin>
13-
<artifactId>maven-failsafe-plugin</artifactId>
14-
<version>2.6</version>
15-
<executions>
16-
<execution>
17-
<goals>
18-
<goal>integration-test</goal>
19-
<goal>verify</goal>
20-
</goals>
21-
</execution>
22-
</executions>
23-
</plugin>
24-
<!--plugin>
25-
<groupId>org.eclipse.jetty</groupId>
26-
<artifactId>jetty-maven-plugin</artifactId>
27-
<version>${jetty-version}</version>
28-
<configuration>
29-
<webApp>
30-
<contextPath>/</contextPath>
31-
</webApp>
32-
<webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
33-
<stopPort>8079</stopPort>
34-
<stopKey>stopit</stopKey>
35-
<httpConnector>
36-
<port></port>
37-
<idleTimeout>60000</idleTimeout>
38-
</httpConnector>
39-
</configuration>
40-
<executions>
41-
<execution>
42-
<id>start-jetty</id>
43-
<phase>pre-integration-test</phase>
44-
<goals>
45-
<goal>start</goal>
46-
</goals>
47-
<configuration>
48-
<scanIntervalSeconds>0</scanIntervalSeconds>
49-
<daemon>true</daemon>
50-
</configuration>
51-
</execution>
52-
<execution>
53-
<id>stop-jetty</id>
54-
<phase>post-integration-test</phase>
55-
<goals>
56-
<goal>stop</goal>
57-
</goals>
58-
</execution>
59-
</executions>
60-
</plugin-->
61-
<plugin>
62-
<groupId>org.codehaus.mojo</groupId>
63-
<artifactId>build-helper-maven-plugin</artifactId>
64-
<version>1.9.1</version>
65-
<executions>
66-
<execution>
67-
<id>add-source</id>
68-
<phase>generate-sources</phase>
69-
<goals>
70-
<goal>add-source</goal>
71-
</goals>
72-
<configuration>
73-
<sources>
74-
<source>src/gen/java</source>
75-
</sources>
76-
</configuration>
77-
</execution>
78-
</executions>
79-
</plugin>
80-
</plugins>
81-
</build>
82-
<dependencies>
83-
<dependency>
84-
<groupId>io.swagger</groupId>
85-
<artifactId>swagger-jaxrs</artifactId>
86-
<scope>compile</scope>
87-
<version>${swagger-core-version}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>ch.qos.logback</groupId>
91-
<artifactId>logback-classic</artifactId>
92-
<version>${logback-version}</version>
93-
<scope>compile</scope>
94-
</dependency>
95-
<dependency>
96-
<groupId>ch.qos.logback</groupId>
97-
<artifactId>logback-core</artifactId>
98-
<version>${logback-version}</version>
99-
<scope>compile</scope>
100-
</dependency>
101-
<dependency>
102-
<groupId>junit</groupId>
103-
<artifactId>junit</artifactId>
104-
<version>${junit-version}</version>
105-
<scope>test</scope>
106-
</dependency>
107-
<!-- CXF Client -->
108-
<dependency>
109-
<groupId>org.apache.cxf</groupId>
110-
<artifactId>cxf-rt-rs-client</artifactId>
111-
<version>${cxf-version}</version>
112-
<scope>test</scope>
113-
</dependency>
114-
115-
<!-- CXF server -->
116-
<dependency>
117-
<groupId>org.apache.cxf</groupId>
118-
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
119-
<version>${cxf-version}</version>
120-
<scope>compile</scope>
121-
</dependency>
122-
<dependency>
123-
<groupId>org.apache.cxf</groupId>
124-
<artifactId>cxf-rt-rs-service-description</artifactId>
125-
<version>${cxf-version}</version>
126-
<scope>compile</scope>
127-
</dependency>
128-
<dependency>
129-
<groupId>org.apache.cxf</groupId>
130-
<artifactId>cxf-rt-ws-policy</artifactId>
131-
<version>${cxf-version}</version>
132-
<scope>compile</scope>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.apache.cxf</groupId>
136-
<artifactId>cxf-rt-wsdl</artifactId>
137-
<version>${cxf-version}</version>
138-
<scope>compile</scope>
139-
</dependency>
140-
<dependency>
141-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
142-
<artifactId>jackson-jaxrs-json-provider</artifactId>
143-
<version>${jackson-jaxrs-version}</version>
144-
<scope>compile</scope>
145-
</dependency>
146-
<dependency>
147-
<groupId>com.fasterxml.jackson.datatype</groupId>
148-
<artifactId>jackson-datatype-joda</artifactId>
149-
<version>${jackson-jaxrs-version}</version>
150-
</dependency>
151-
</dependencies>
152-
<repositories>
153-
<repository>
154-
<id>sonatype-snapshots</id>
155-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
156-
<snapshots>
157-
<enabled>true</enabled>
158-
</snapshots>
159-
</repository>
160-
</repositories>
161-
<properties>
162-
<java.version>1.7</java.version>
163-
<maven.compiler.source>${java.version}</maven.compiler.source>
164-
<maven.compiler.target>${java.version}</maven.compiler.target>
165-
<swagger-core-version>1.5.18</swagger-core-version>
166-
<jetty-version>9.2.9.v20150224</jetty-version>
167-
<junit-version>4.12</junit-version>
168-
<logback-version>1.1.7</logback-version>
169-
<servlet-api-version>2.5</servlet-api-version>
170-
<cxf-version>3.2.1</cxf-version>
171-
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
172-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
173-
</properties>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>io.swagger</groupId>
4+
<artifactId>jaxrs-cxf-petstore-client</artifactId>
5+
<packaging>jar</packaging>
6+
<name>jaxrs-cxf-petstore-client</name>
7+
<description>This is a sample server Petstore server. You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/). For this sample, you can use the api key &#x60;special-key&#x60; to test the authorization filters.</description>
8+
<version>1.0.0</version>
9+
<build>
10+
<sourceDirectory>src/main/java</sourceDirectory>
11+
<plugins>
12+
<plugin>
13+
<artifactId>maven-failsafe-plugin</artifactId>
14+
<version>2.6</version>
15+
<executions>
16+
<execution>
17+
<goals>
18+
<goal>integration-test</goal>
19+
<goal>verify</goal>
20+
</goals>
21+
</execution>
22+
</executions>
23+
</plugin>
24+
<!--plugin>
25+
<groupId>org.eclipse.jetty</groupId>
26+
<artifactId>jetty-maven-plugin</artifactId>
27+
<version>${jetty-version}</version>
28+
<configuration>
29+
<webApp>
30+
<contextPath>/</contextPath>
31+
</webApp>
32+
<webAppSourceDirectory>target/${project.artifactId}-${project.version}</webAppSourceDirectory>
33+
<stopPort>8079</stopPort>
34+
<stopKey>stopit</stopKey>
35+
<httpConnector>
36+
<port></port>
37+
<idleTimeout>60000</idleTimeout>
38+
</httpConnector>
39+
</configuration>
40+
<executions>
41+
<execution>
42+
<id>start-jetty</id>
43+
<phase>pre-integration-test</phase>
44+
<goals>
45+
<goal>start</goal>
46+
</goals>
47+
<configuration>
48+
<scanIntervalSeconds>0</scanIntervalSeconds>
49+
<daemon>true</daemon>
50+
</configuration>
51+
</execution>
52+
<execution>
53+
<id>stop-jetty</id>
54+
<phase>post-integration-test</phase>
55+
<goals>
56+
<goal>stop</goal>
57+
</goals>
58+
</execution>
59+
</executions>
60+
</plugin-->
61+
<plugin>
62+
<groupId>org.codehaus.mojo</groupId>
63+
<artifactId>build-helper-maven-plugin</artifactId>
64+
<version>1.9.1</version>
65+
<executions>
66+
<execution>
67+
<id>add-source</id>
68+
<phase>generate-sources</phase>
69+
<goals>
70+
<goal>add-source</goal>
71+
</goals>
72+
<configuration>
73+
<sources>
74+
<source>src/gen/java</source>
75+
</sources>
76+
</configuration>
77+
</execution>
78+
</executions>
79+
</plugin>
80+
</plugins>
81+
</build>
82+
<dependencies>
83+
<dependency>
84+
<groupId>io.swagger</groupId>
85+
<artifactId>swagger-jaxrs</artifactId>
86+
<scope>compile</scope>
87+
<version>${swagger-core-version}</version>
88+
</dependency>
89+
<dependency>
90+
<groupId>ch.qos.logback</groupId>
91+
<artifactId>logback-classic</artifactId>
92+
<version>${logback-version}</version>
93+
<scope>compile</scope>
94+
</dependency>
95+
<dependency>
96+
<groupId>ch.qos.logback</groupId>
97+
<artifactId>logback-core</artifactId>
98+
<version>${logback-version}</version>
99+
<scope>compile</scope>
100+
</dependency>
101+
<dependency>
102+
<groupId>junit</groupId>
103+
<artifactId>junit</artifactId>
104+
<version>${junit-version}</version>
105+
<scope>test</scope>
106+
</dependency>
107+
<!-- CXF Client -->
108+
<dependency>
109+
<groupId>org.apache.cxf</groupId>
110+
<artifactId>cxf-rt-rs-client</artifactId>
111+
<version>${cxf-version}</version>
112+
<scope>test</scope>
113+
</dependency>
114+
115+
<!-- CXF server -->
116+
<dependency>
117+
<groupId>org.apache.cxf</groupId>
118+
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
119+
<version>${cxf-version}</version>
120+
<scope>compile</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.apache.cxf</groupId>
124+
<artifactId>cxf-rt-rs-service-description</artifactId>
125+
<version>${cxf-version}</version>
126+
<scope>compile</scope>
127+
</dependency>
128+
<dependency>
129+
<groupId>org.apache.cxf</groupId>
130+
<artifactId>cxf-rt-ws-policy</artifactId>
131+
<version>${cxf-version}</version>
132+
<scope>compile</scope>
133+
</dependency>
134+
<dependency>
135+
<groupId>org.apache.cxf</groupId>
136+
<artifactId>cxf-rt-wsdl</artifactId>
137+
<version>${cxf-version}</version>
138+
<scope>compile</scope>
139+
</dependency>
140+
<dependency>
141+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
142+
<artifactId>jackson-jaxrs-json-provider</artifactId>
143+
<version>${jackson-jaxrs-version}</version>
144+
<scope>compile</scope>
145+
</dependency>
146+
<dependency>
147+
<groupId>com.fasterxml.jackson.datatype</groupId>
148+
<artifactId>jackson-datatype-joda</artifactId>
149+
<version>${jackson-jaxrs-version}</version>
150+
</dependency>
151+
</dependencies>
152+
<repositories>
153+
<repository>
154+
<id>sonatype-snapshots</id>
155+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
156+
<snapshots>
157+
<enabled>true</enabled>
158+
</snapshots>
159+
</repository>
160+
</repositories>
161+
<properties>
162+
<java.version>1.7</java.version>
163+
<maven.compiler.source>${java.version}</maven.compiler.source>
164+
<maven.compiler.target>${java.version}</maven.compiler.target>
165+
<swagger-core-version>1.5.18</swagger-core-version>
166+
<jetty-version>9.2.9.v20150224</jetty-version>
167+
<junit-version>4.12</junit-version>
168+
<logback-version>1.1.7</logback-version>
169+
<servlet-api-version>2.5</servlet-api-version>
170+
<cxf-version>3.2.1</cxf-version>
171+
<jackson-jaxrs-version>2.9.9</jackson-jaxrs-version>
172+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
173+
</properties>
174174
</project>

0 commit comments

Comments
 (0)