Skip to content

Commit b107b46

Browse files
author
ant3
committed
Rebuilt jersey2-java8 sample
1 parent 4ef10aa commit b107b46

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

samples/client/petstore/java/jersey2-java8/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ if(hasProperty('target') && target == 'android') {
9494

9595
ext {
9696
swagger_annotations_version = "1.5.8"
97-
jackson_version = "2.7.0"
97+
jackson_version = "2.7.5"
9898
jersey_version = "2.22.2"
9999
junit_version = "4.12"
100100
}
@@ -103,7 +103,7 @@ dependencies {
103103
compile "io.swagger:swagger-annotations:$swagger_annotations_version"
104104
compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
105105
compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
106-
compile "org.glassfish.jersey.media:jersey-media-json-jackson:2.22.1"
106+
compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
107107
compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
108108
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
109109
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"

samples/client/petstore/java/jersey2-java8/build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ lazy val root = (project in file(".")).
1212
"io.swagger" % "swagger-annotations" % "1.5.8",
1313
"org.glassfish.jersey.core" % "jersey-client" % "2.22.2",
1414
"org.glassfish.jersey.media" % "jersey-media-multipart" % "2.22.2",
15-
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.1",
16-
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.0",
17-
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0",
18-
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0",
19-
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.0",
15+
"org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.22.2",
16+
"com.fasterxml.jackson.core" % "jackson-core" % "2.7.5",
17+
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5",
18+
"com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5",
19+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.7.5",
2020
"com.brsanthu" % "migbase64" % "2.2",
2121
"junit" % "junit" % "4.12" % "test",
2222
"com.novocode" % "junit-interface" % "0.10" % "test"
52.4 KB
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Tue May 17 23:08:05 CST 2016
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip

samples/client/petstore/java/jersey2-java8/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-jar-plugin</artifactId>
55-
<version>2.2</version>
55+
<version>2.6</version>
5656
<executions>
5757
<execution>
5858
<goals>
@@ -98,7 +98,7 @@
9898
<plugin>
9999
<groupId>org.apache.maven.plugins</groupId>
100100
<artifactId>maven-compiler-plugin</artifactId>
101-
<version>2.3.2</version>
101+
<version>2.5.1</version>
102102
<configuration>
103103
<source>1.8</source>
104104
<target>1.8</target>
@@ -127,7 +127,7 @@
127127
<dependency>
128128
<groupId>org.glassfish.jersey.media</groupId>
129129
<artifactId>jersey-media-json-jackson</artifactId>
130-
<version>2.22.1</version>
130+
<version>${jersey-version}</version>
131131
</dependency>
132132

133133
<!-- JSON processing: jackson -->
@@ -170,7 +170,7 @@
170170
<properties>
171171
<swagger-core-version>1.5.8</swagger-core-version>
172172
<jersey-version>2.22.2</jersey-version>
173-
<jackson-version>2.7.0</jackson-version>
173+
<jackson-version>2.7.5</jackson-version>
174174
<maven-plugin-version>1.0.0</maven-plugin-version>
175175
<junit-version>4.12</junit-version>
176176
</properties>

samples/client/petstore/java/jersey2-java8/src/main/java/io/swagger/client/JSON.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public JSON() {
1919
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
2020
mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
2121
mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
22-
mapper.registerModule(new JSR310Module());
22+
mapper.registerModule(new JavaTimeModule());
2323
}
2424

2525
/**

0 commit comments

Comments
 (0)