Skip to content

Commit 7c33b01

Browse files
authored
Merge pull request swagger-api#4925 from jfiala/cxf_swagger-core_4924
[Jaxrs-cxf] Fix compile errors after update of swagger-core / add jackson dependencies to pom swagger-api#4924
2 parents dbd513c + b369a9f commit 7c33b01

File tree

2 files changed

+35
-1
lines changed
  • modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server
  • samples/server/petstore/jaxrs-cxf

2 files changed

+35
-1
lines changed

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,18 @@
160160
<version>${cxf-version}</version>
161161
<scope>compile</scope>
162162
</dependency>
163+
<dependency>
164+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
165+
<artifactId>jackson-jaxrs-json-provider</artifactId>
166+
<version>${jackson-jaxrs-version}</version>
167+
<scope>compile</scope>
168+
</dependency>
169+
<dependency>
170+
<groupId>com.fasterxml.jackson.datatype</groupId>
171+
<artifactId>jackson-datatype-joda</artifactId>
172+
<version>${jackson-jaxrs-version}</version>
173+
<scope>compile</scope>
174+
</dependency>
163175
{{#generateSpringApplication}}
164176
<!-- Spring -->
165177
<dependency>
@@ -233,6 +245,7 @@
233245
<spring.boot-version>1.3.3.RELEASE</spring.boot-version>
234246
{{/generateSpringBootApplication}}
235247
<cxf-version>3.1.8</cxf-version>
248+
<jackson-jaxrs-version>2.8.4</jackson-jaxrs-version>
236249
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
237250
</properties>
238251
</project>

samples/server/petstore/jaxrs-cxf/pom.xml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,13 @@
112112
<version>${junit-version}</version>
113113
<scope>test</scope>
114114
</dependency>
115+
<!-- Bean Validation API support -->
116+
<dependency>
117+
<groupId>javax.validation</groupId>
118+
<artifactId>validation-api</artifactId>
119+
<version>${beanvalidation-version}</version>
120+
<scope>provided</scope>
121+
</dependency>
115122
<!-- CXF Client -->
116123
<dependency>
117124
<groupId>org.apache.cxf</groupId>
@@ -151,6 +158,18 @@
151158
<version>${cxf-version}</version>
152159
<scope>compile</scope>
153160
</dependency>
161+
<dependency>
162+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
163+
<artifactId>jackson-jaxrs-json-provider</artifactId>
164+
<version>${jackson-jaxrs-version}</version>
165+
<scope>compile</scope>
166+
</dependency>
167+
<dependency>
168+
<groupId>com.fasterxml.jackson.datatype</groupId>
169+
<artifactId>jackson-datatype-joda</artifactId>
170+
<version>${jackson-jaxrs-version}</version>
171+
<scope>compile</scope>
172+
</dependency>
154173
</dependencies>
155174
<repositories>
156175
<repository>
@@ -165,13 +184,15 @@
165184
<java.version>1.7</java.version>
166185
<maven.compiler.source>${java.version}</maven.compiler.source>
167186
<maven.compiler.target>${java.version}</maven.compiler.target>
168-
<swagger-core-version>1.5.10</swagger-core-version>
187+
<swagger-core-version>1.5.12</swagger-core-version>
169188
<jetty-version>9.2.9.v20150224</jetty-version>
170189
<jersey2-version>2.22.2</jersey2-version>
171190
<junit-version>4.12</junit-version>
172191
<logback-version>1.1.7</logback-version>
173192
<servlet-api-version>2.5</servlet-api-version>
193+
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
174194
<cxf-version>3.1.8</cxf-version>
195+
<jackson-jaxrs-version>2.8.4</jackson-jaxrs-version>
175196
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
176197
</properties>
177198
</project>

0 commit comments

Comments
 (0)