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)
AdoptOpenJDK · Jun 20, 2020 · 13bd838 · 13bd838
2 parents 765ddf5 + 71122c1
commit 13bd838
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 13 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -1,9 +1,22 @@
-<c:changelog xmlns:c="urn:com.io7m.changelog:4.0" project="openjdk-api-java-client">
- <c:releases>
- </c:releases>
- <c:ticket-systems>
- <c:ticket-system id="com.github.adoptopenjdk.openjdk-api-java-client"
- url="https://github.com/AdoptOpenJDK/openjdk-api-java-client/issues/"
- default="true"/>
- </c:ticket-systems>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<c:changelog project="openjdk-api-java-client" xmlns:c="urn:com.io7m.changelog:4.0">
+ <c:releases>
+ <c:release date="2020-06-20T19:23:13+00:00" ticket-system="com.github.adoptopenjdk.openjdk-api-java-client" version="0.4.0">
+ <c:changes>
+ <c:change date="2020-06-20T00:00:00+00:00" summary="Add support for new fields. Thanks @maxandersen.">
+ <c:tickets>
+ <c:ticket id="6"/>
+ </c:tickets>
+ </c:change>
+ <c:change date="2020-06-20T19:23:13+00:00" summary="Enable support for ignoring unrecognized fields. Thanks @joschi.">
+ <c:tickets>
+ <c:ticket id="8"/>
+ </c:tickets>
+ </c:change>
+ </c:changes>
+ </c:release>
+ </c:releases>
+ <c:ticket-systems>
+ <c:ticket-system default="true" id="com.github.adoptopenjdk.openjdk-api-java-client" url="https://github.com/AdoptOpenJDK/openjdk-api-java-client/issues/"/>
+ </c:ticket-systems>
 </c:changelog>
diff --git a/net.adoptopenjdk.site/pom.xml b/net.adoptopenjdk.site/pom.xml
@@ -9,7 +9,7 @@
  <parent>
  <artifactId>net.adoptopenjdk</artifactId>
  <groupId>net.adoptopenjdk</groupId>
- <version>0.3.3</version>
+ <version>0.4.0</version>
  </parent>
 
  <artifactId>net.adoptopenjdk.site</artifactId>

diff --git a/net.adoptopenjdk.v3.api/pom.xml b/net.adoptopenjdk.v3.api/pom.xml
@@ -9,7 +9,7 @@
  <parent>
  <artifactId>net.adoptopenjdk</artifactId>
  <groupId>net.adoptopenjdk</groupId>
- <version>0.3.3</version>
+ <version>0.4.0</version>
  </parent>
 
  <artifactId>net.adoptopenjdk.v3.api</artifactId>

diff --git a/net.adoptopenjdk.v3.tests/pom.xml b/net.adoptopenjdk.v3.tests/pom.xml
@@ -9,7 +9,7 @@
  <parent>
  <artifactId>net.adoptopenjdk</artifactId>
  <groupId>net.adoptopenjdk</groupId>
- <version>0.3.3</version>
+ <version>0.4.0</version>
  </parent>
 
  <artifactId>net.adoptopenjdk.v3.tests</artifactId>
@@ -60,4 +60,11 @@
  </dependency>
  </dependencies>
 
+ <contributors>
+ <contributor>
+ <name>Max Rydahl Andersen</name>
+ <email>max@xam.dk</email>
+ <url>http://xam.dk</url>
+ </contributor>
+ </contributors>
 </project>
diff --git a/net.adoptopenjdk.v3.vanilla/pom.xml b/net.adoptopenjdk.v3.vanilla/pom.xml
@@ -9,7 +9,7 @@
  <parent>
  <artifactId>net.adoptopenjdk</artifactId>
  <groupId>net.adoptopenjdk</groupId>
- <version>0.3.3</version>
+ <version>0.4.0</version>
  </parent>
 
  <artifactId>net.adoptopenjdk.v3.vanilla</artifactId>

diff --git a/net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3AST.java b/net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3AST.java
@@ -61,6 +61,13 @@ public static final class AOV3AvailableReleasesJSON
 
  @JsonProperty(value = "most_recent_lts", required = true)
  BigInteger mostRecentLTS = BigInteger.ZERO;
+
+ @JsonProperty(value = "most_recent_feature_version", required = true)
+ BigInteger getMostRecentFeatureVersion;
+
+ @JsonProperty(value = "tip_version", required = true)
+ BigInteger tipVersion;
+
  }
 
  @JsonDeserialize

diff --git a/...njdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3ObjectMappers.java b/...njdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/internal/AOV3ObjectMappers.java
@@ -33,6 +33,7 @@ public static ObjectMapper createObjectMapper()
  final JsonMapper mapper =
  JsonMapper.builder()
  .configure(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS, true)
+ .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
  .build();
 
  final var deserializers = AOV3Deserializers.create();

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
  <groupId>net.adoptopenjdk</groupId>
  <artifactId>net.adoptopenjdk</artifactId>
- <version>0.3.3</version>
+ <version>0.4.0</version>
  <packaging>pom</packaging>
 
  <name>net.adoptopenjdk</name>
@@ -58,6 +58,13 @@
  <url>http://io7m.com</url>
  </developer>
  </developers>
+ <contributors>
+ <contributor>
+ <name>Jochen Schalanda</name>
+ <email>jochen@schalanda.name</email>
+ <url>https://github.com/joschi/</url>
+ </contributor>
+ </contributors>
 
  <issueManagement>
  <url>http://github.com/AdoptOpenJDK/openjdk-api-java-client/issues</url>