Skip to content

Commit 8c1fd52

Browse files
Li Xucp2boston
authored andcommitted
WS-1360: jackson updates (#121)
* WS-1360: jackson updates * WS-1360: avoid a guava * WS-1360: no internal version * WS-1360: manage guava to 18.0
1 parent e1e00e1 commit 8c1fd52

File tree

11 files changed

+28
-13
lines changed

11 files changed

+28
-13
lines changed

annotations/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.9.1-SNAPSHOT</version>
22+
<version>1.9.101-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api-annotations</artifactId>
2525
<name>rosette-api-annotations</name>

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.9.1-SNAPSHOT</version>
22+
<version>1.9.101-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api</artifactId>
2525
<name>rosette-api</name>

common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.9.1-SNAPSHOT</version>
22+
<version>1.9.101-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api-common</artifactId>
2525
<name>rosette-api-common</name>

examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.basistech.rosette</groupId>
2222
<artifactId>rosette-api-java-binding</artifactId>
23-
<version>1.9.1-SNAPSHOT</version>
23+
<version>1.9.101-SNAPSHOT</version>
2424
</parent>
2525
<groupId>com.basistech.rosette</groupId>
2626
<artifactId>rosette-api-examples</artifactId>

json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>com.basistech.rosette</groupId>
2222
<artifactId>rosette-api-java-binding</artifactId>
23-
<version>1.9.1-SNAPSHOT</version>
23+
<version>1.9.101-SNAPSHOT</version>
2424
</parent>
2525
<artifactId>rosette-api-json</artifactId>
2626
<name>rosette-api-json</name>

json/src/main/java/com/basistech/rosette/apimodel/jackson/NameMixin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ protected NameMixin (
4141
//
4242
}
4343

44+
@JsonCreator
45+
protected NameMixin (String name) {
46+
//
47+
}
48+
4449
@JsonPOJOBuilder(withPrefix = "")
4550
abstract class NameBuilderMixin {
4651
}

json/src/test/java/com/basistech/rosette/apimodel/ModelTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.lang.reflect.ParameterizedType;
2525
import java.lang.reflect.Type;
2626
import java.util.ArrayList;
27+
import java.util.Arrays;
2728
import java.util.Collection;
2829
import java.util.HashMap;
2930
import java.util.HashSet;
@@ -58,7 +59,7 @@ public ModelTest(Boolean inputStreams) {
5859

5960
@Parameterized.Parameters(name = "inputStreamContent: {0}")
6061
public static Collection<Object[]> data() {
61-
return Lists.newArrayList(new Object[] {Boolean.FALSE}, new Object[] {Boolean.TRUE});
62+
return Arrays.asList(new Object[] {Boolean.FALSE}, new Object[] {Boolean.TRUE});
6263
}
6364

6465

json/src/test/java/com/basistech/rosette/apimodel/PolymorphicRequestTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,9 @@ public void testRequestTypes() throws Exception {
4949
json = "{\"names\": [{\"text\": \"Joe\"}, {\"text\": \"Smith\"}], \"threshold\": 0.8}";
5050
request = mapper.readValue(json, NameDeduplicationRequest.class);
5151
assertTrue(request instanceof NameDeduplicationRequest);
52+
53+
json = "{\"names\": [\"Joe\", \"Smith\"], \"threshold\": 0.8}";
54+
request = mapper.readValue(json, NameDeduplicationRequest.class);
55+
assertTrue(request instanceof NameDeduplicationRequest);
5256
}
5357
}

model/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<parent>
2020
<groupId>com.basistech.rosette</groupId>
2121
<artifactId>rosette-api-java-binding</artifactId>
22-
<version>1.9.1-SNAPSHOT</version>
22+
<version>1.9.101-SNAPSHOT</version>
2323
</parent>
2424
<artifactId>rosette-api-model</artifactId>
2525
<name>rosette-api-model</name>

pom.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
<modelVersion>4.0.0</modelVersion>
1919
<groupId>com.basistech.rosette</groupId>
2020
<artifactId>rosette-api-java-binding</artifactId>
21-
<version>1.9.1-SNAPSHOT</version>
21+
<version>1.9.101-SNAPSHOT</version>
2222
<parent>
2323
<artifactId>open-source-parent</artifactId>
2424
<groupId>com.basistech</groupId>
25-
<version>1.1.5</version>
25+
<version>1.2.0</version>
2626
<relativePath />
2727
</parent>
2828
<packaging>pom</packaging>
@@ -69,17 +69,22 @@
6969
<dependency>
7070
<groupId>com.basistech</groupId>
7171
<artifactId>common-api</artifactId>
72-
<version>36.1.3</version>
72+
<version>36.1.4</version>
7373
</dependency>
7474
<dependency>
7575
<groupId>com.basistech</groupId>
7676
<artifactId>adm-model</artifactId>
77-
<version>2.4.0</version>
77+
<version>2.4.3</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>com.basistech</groupId>
8181
<artifactId>adm-json</artifactId>
82-
<version>2.4.0</version>
82+
<version>2.4.3</version>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.google.guava</groupId>
86+
<artifactId>guava</artifactId>
87+
<version>18.0</version>
8388
</dependency>
8489
</dependencies>
8590
</dependencyManagement>

0 commit comments

Comments
 (0)