Skip to content

Commit 51ab012

Browse files
frantumafrantuma
committed
bump jackson to 2.9.9 in vertx
1 parent 2499b92 commit 51ab012

File tree

13 files changed

+59
-53
lines changed

13 files changed

+59
-53
lines changed

‎modules/swagger-codegen/src/main/resources/Java/libraries/vertx/build.gradle.mustache‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ task execute(type:JavaExec) {
2727

2828
ext {
2929
swagger_annotations_version = "1.5.17"
30-
jackson_version = "{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}"
30+
{{#threetenbp}}threetenbp_version = "2.6.4"{{/threetenbp}}
31+
jackson_version = "2.9.9"
3132
vertx_version = "3.4.2"
3233
junit_version = "4.12"
3334
}
@@ -46,7 +47,7 @@ dependencies {
4647
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
4748
{{/java8}}
4849
{{#threetenbp}}
49-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
50+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
5051
{{/threetenbp}}
5152
testCompile "junit:junit:$junit_version"
5253
testCompile "io.vertx:vertx-unit:$vertx_version"

‎modules/swagger-codegen/src/main/resources/Java/libraries/vertx/pom.mustache‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
<dependency>
251251
<groupId>com.github.joschi.jackson</groupId>
252252
<artifactId>jackson-datatype-threetenbp</artifactId>
253-
<version>${jackson-version}</version>
253+
<version>${threetenbp-version}</version>
254254
</dependency>
255255
{{/threetenbp}}
256256

@@ -273,7 +273,8 @@
273273
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
274274
<vertx-version>3.4.2</vertx-version>
275275
<swagger-core-version>1.5.18</swagger-core-version>
276-
<jackson-version>{{^threetenbp}}2.8.9{{/threetenbp}}{{#threetenbp}}2.6.4{{/threetenbp}}</jackson-version>
276+
{{#threetenbp}}<threetenbp-version>2.6.4</threetenbp-version>{{/threetenbp}}
277+
<jackson-version>2.9.9</jackson-version>
277278
<junit-version>4.12</junit-version>
278279
</properties>
279280
</project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
1818
<vertx-swagger-router.version>{{vertxSwaggerRouterVersion}}</vertx-swagger-router.version>
1919
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
20-
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
20+
<jackson-datatype-jsr310.version>2.9.9</jackson-datatype-jsr310.version>
2121
</properties>
2222

2323
<dependencies>

‎samples/client/petstore/java/vertx/.swagger-codegen/VERSION‎

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

‎samples/client/petstore/java/vertx/build.gradle‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ install {
2121
}
2222

2323
task execute(type:JavaExec) {
24-
main = System.getProperty('mainClass')
25-
classpath = sourceSets.main.runtimeClasspath
24+
main = System.getProperty('mainClass')
25+
classpath = sourceSets.main.runtimeClasspath
2626
}
2727

2828
ext {
2929
swagger_annotations_version = "1.5.17"
30-
jackson_version = "2.6.4"
30+
threetenbp_version = "2.6.4"
31+
jackson_version = "2.9.9"
3132
vertx_version = "3.4.2"
3233
junit_version = "4.12"
3334
}
@@ -40,7 +41,7 @@ dependencies {
4041
compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
4142
compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
4243
compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
43-
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_version"
44+
compile "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
4445
testCompile "junit:junit:$junit_version"
4546
testCompile "io.vertx:vertx-unit:$vertx_version"
4647
}

‎samples/client/petstore/java/vertx/docs/FakeApi.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ Long int64 = 789L; // Long | None
320320
Float _float = 3.4F; // Float | None
321321
String string = "string_example"; // String | None
322322
byte[] binary = B; // byte[] | None
323-
LocalDate date = new LocalDate(); // LocalDate | None
324-
OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
323+
LocalDate date = LocalDate.now(); // LocalDate | None
324+
OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
325325
String password = "password_example"; // String | None
326326
String paramCallback = "paramCallback_example"; // String | None
327327
try {

‎samples/client/petstore/java/vertx/pom.xml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<configuration>
116116
<sources>
117117
<source>
118-
src/main/java</source>
118+
src/main/java</source>
119119
</sources>
120120
</configuration>
121121
</execution>
@@ -128,7 +128,7 @@
128128
<configuration>
129129
<sources>
130130
<source>
131-
src/test/java</source>
131+
src/test/java</source>
132132
</sources>
133133
</configuration>
134134
</execution>
@@ -140,7 +140,7 @@
140140
<version>3.6.1</version>
141141
<configuration>
142142
<source>
143-
1.8</source>
143+
1.8</source>
144144
<target>1.8</target>
145145
</configuration>
146146
</plugin>
@@ -232,16 +232,16 @@
232232
<artifactId>jackson-databind</artifactId>
233233
<version>${jackson-version}</version>
234234
</dependency>
235-
<dependency>
236-
<groupId>com.fasterxml.jackson.datatype</groupId>
237-
<artifactId>jackson-datatype-jsr310</artifactId>
238-
<version>${jackson-version}</version>
239-
</dependency>
240-
<dependency>
241-
<groupId>com.github.joschi.jackson</groupId>
242-
<artifactId>jackson-datatype-threetenbp</artifactId>
243-
<version>${jackson-version}</version>
244-
</dependency>
235+
<dependency>
236+
<groupId>com.fasterxml.jackson.datatype</groupId>
237+
<artifactId>jackson-datatype-jsr310</artifactId>
238+
<version>${jackson-version}</version>
239+
</dependency>
240+
<dependency>
241+
<groupId>com.github.joschi.jackson</groupId>
242+
<artifactId>jackson-datatype-threetenbp</artifactId>
243+
<version>${threetenbp-version}</version>
244+
</dependency>
245245

246246
<!-- test dependencies -->
247247
<dependency>
@@ -262,7 +262,8 @@
262262
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
263263
<vertx-version>3.4.2</vertx-version>
264264
<swagger-core-version>1.5.18</swagger-core-version>
265-
<jackson-version>2.6.4</jackson-version>
265+
<threetenbp-version>2.6.4</threetenbp-version>
266+
<jackson-version>2.9.9</jackson-version>
266267
<junit-version>4.12</junit-version>
267268
</properties>
268269
</project>

‎samples/server/petstore/java-vertx/async/.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/server/petstore/java-vertx/async/pom.xml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
4+
55
<groupId>io.swagger</groupId>
66
<artifactId>swagger-java-vertx-server</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
<packaging>jar</packaging>
9-
10-
<name>Swagger Petstore</name>
11-
9+
10+
<name>Swagger Petstore</name>
11+
1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<java.version>1.8</java.version>
1515
<junit.version>4.12</junit.version>
1616
<vertx.version>3.4.1</vertx.version>
1717
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
18-
<vertx-swagger-router.version>1.4.0</vertx-swagger-router.version>
18+
<vertx-swagger-router.version>1.2.0</vertx-swagger-router.version>
1919
<maven-shade-plugin.version>2.3</maven-shade-plugin.version>
20-
<jackson-datatype-jsr310.version>2.7.4</jackson-datatype-jsr310.version>
20+
<jackson-datatype-jsr310.version>2.9.9</jackson-datatype-jsr310.version>
2121
</properties>
2222

2323
<dependencies>
@@ -46,6 +46,7 @@
4646
<artifactId>jackson-datatype-jsr310</artifactId>
4747
<version>${jackson-datatype-jsr310.version}</version>
4848
</dependency>
49+
4950
</dependencies>
5051

5152
<build>
@@ -58,7 +59,7 @@
5859
<target>${java.version}</target>
5960
</configuration>
6061
</plugin>
61-
62+
6263
<plugin>
6364
<groupId>org.apache.maven.plugins</groupId>
6465
<artifactId>maven-shade-plugin</artifactId>
@@ -72,7 +73,7 @@
7273
<configuration>
7374
<transformers>
7475
<transformer
75-
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
76+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
7677
<manifestEntries>
7778
<Main-Class>io.vertx.core.Starter</Main-Class>
7879
<Main-Verticle>io.swagger.server.api.MainApiVerticle</Main-Verticle>
@@ -87,4 +88,4 @@
8788
</plugin>
8889
</plugins>
8990
</build>
90-
</project>
91+
</project>

‎samples/server/petstore/java-vertx/async/src/main/resources/swagger.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@
112112
"type" : "array",
113113
"items" : {
114114
"type" : "string",
115-
"default" : "available",
116-
"enum" : [ "available", "pending", "sold" ]
115+
"enum" : [ "available", "pending", "sold" ],
116+
"default" : "available"
117117
},
118118
"collectionFormat" : "csv"
119119
} ],

0 commit comments

Comments
 (0)