Skip to content

Commit 13bd838

Browse files
io7mio7m
committed
Merge branch 'release/0.4.0'
Release: openjdk-api-java-client 0.4.0 Change: Enable support for ignoring unrecognized fields. Thanks @joschi. (Ticket: #8) Change: Add support for new fields. Thanks @maxandersen. (Ticket: #6)
2 parents 765ddf5 + 71122c1 commit 13bd838

File tree

8 files changed

+48
-13
lines changed

8 files changed

+48
-13
lines changed

‎README-CHANGES.xml‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,22 @@
1-
<c:changelog xmlns:c="urn:com.io7m.changelog:4.0" project="openjdk-api-java-client">
2-
<c:releases>
3-
</c:releases>
4-
<c:ticket-systems>
5-
<c:ticket-system id="com.github.adoptopenjdk.openjdk-api-java-client"
6-
url="https://github.com/AdoptOpenJDK/openjdk-api-java-client/issues/"
7-
default="true"/>
8-
</c:ticket-systems>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<c:changelog project="openjdk-api-java-client" xmlns:c="urn:com.io7m.changelog:4.0">
3+
<c:releases>
4+
<c:release date="2020-06-20T19:23:13+00:00" ticket-system="com.github.adoptopenjdk.openjdk-api-java-client" version="0.4.0">
5+
<c:changes>
6+
<c:change date="2020-06-20T00:00:00+00:00" summary="Add support for new fields. Thanks @maxandersen.">
7+
<c:tickets>
8+
<c:ticket id="6"/>
9+
</c:tickets>
10+
</c:change>
11+
<c:change date="2020-06-20T19:23:13+00:00" summary="Enable support for ignoring unrecognized fields. Thanks @joschi.">
12+
<c:tickets>
13+
<c:ticket id="8"/>
14+
</c:tickets>
15+
</c:change>
16+
</c:changes>
17+
</c:release>
18+
</c:releases>
19+
<c:ticket-systems>
20+
<c:ticket-system default="true" id="com.github.adoptopenjdk.openjdk-api-java-client" url="https://github.com/AdoptOpenJDK/openjdk-api-java-client/issues/"/>
21+
</c:ticket-systems>
922
</c:changelog>

‎net.adoptopenjdk.site/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.3</version>
12+
<version>0.4.0</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.site</artifactId>

‎net.adoptopenjdk.v3.api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.3</version>
12+
<version>0.4.0</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.v3.api</artifactId>

‎net.adoptopenjdk.v3.tests/pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.3</version>
12+
<version>0.4.0</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.v3.tests</artifactId>
@@ -60,4 +60,11 @@
6060
</dependency>
6161
</dependencies>
6262

63+
<contributors>
64+
<contributor>
65+
<name>Max Rydahl Andersen</name>
66+
<email>max@xam.dk</email>
67+
<url>http://xam.dk</url>
68+
</contributor>
69+
</contributors>
6370
</project>

‎net.adoptopenjdk.v3.vanilla/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<artifactId>net.adoptopenjdk</artifactId>
1111
<groupId>net.adoptopenjdk</groupId>
12-
<version>0.3.3</version>
12+
<version>0.4.0</version>
1313
</parent>
1414

1515
<artifactId>net.adoptopenjdk.v3.vanilla</artifactId>

‎net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3AST.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ public static final class AOV3AvailableReleasesJSON
6161

6262
@JsonProperty(value = "most_recent_lts", required = true)
6363
BigInteger mostRecentLTS = BigInteger.ZERO;
64+
65+
@JsonProperty(value = "most_recent_feature_version", required = true)
66+
BigInteger getMostRecentFeatureVersion;
67+
68+
@JsonProperty(value = "tip_version", required = true)
69+
BigInteger tipVersion;
70+
6471
}
6572

6673
@JsonDeserialize

‎net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3ObjectMappers.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public static ObjectMapper createObjectMapper()
3333
final JsonMapper mapper =
3434
JsonMapper.builder()
3535
.configure(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS, true)
36+
.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
3637
.build();
3738

3839
final var deserializers = AOV3Deserializers.create();

‎pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<groupId>net.adoptopenjdk</groupId>
1616
<artifactId>net.adoptopenjdk</artifactId>
17-
<version>0.3.3</version>
17+
<version>0.4.0</version>
1818
<packaging>pom</packaging>
1919

2020
<name>net.adoptopenjdk</name>
@@ -58,6 +58,13 @@
5858
<url>http://io7m.com</url>
5959
</developer>
6060
</developers>
61+
<contributors>
62+
<contributor>
63+
<name>Jochen Schalanda</name>
64+
<email>jochen@schalanda.name</email>
65+
<url>https://github.com/joschi/</url>
66+
</contributor>
67+
</contributors>
6168

6269
<issueManagement>
6370
<url>http://github.com/AdoptOpenJDK/openjdk-api-java-client/issues</url>

0 commit comments

Comments
 (0)