Migrate to Java 17 and Jackson 3

.github/workflows/javaci.yml

@@ -48,7 +48,7 @@ jobs:
 
     strategy:
       matrix:
-        java: [ '11', '17', '21', '25' ]
+        java: [ '17', '21', '25' ]
 
     steps:
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd

.github/workflows/publish.yml

@@ -13,11 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
       with:
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
 
     - name: Build with Maven
       run: mvn -B package --file pom.xml
@@ -26,7 +26,7 @@ jobs:
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165
       with: # running setup-java again overwrites the settings.xml
         distribution: 'temurin'
-        java-version: '11'
+        java-version: '17'
         server-id: central # Value of the central-publishing-maven-plugin publishingServerId in pom.xml
         server-username: MAVEN_USERNAME # env variable for username in deploy
         server-password: MAVEN_CENTRAL_TOKEN # env variable for token in deploy

README.md

@@ -66,7 +66,7 @@ the [API Explorer](https://docs.adyen.com/api-explorer/).
 
 * An [Adyen account](https://docs.adyen.com/get-started-with-adyen)
 * An [API key](https://docs.adyen.com/development-resources/api-credentials#generate-api-key). 
-* Java 11 or later
+* Java 17 or later
 
 ## Installation
 

pom.xml

@@ -24,7 +24,7 @@
     </developers>
     <properties>
         <!-- Project Settings -->
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <sonar.organization>adyen</sonar.organization>
@@ -35,8 +35,9 @@
 
         <!-- Dependency Versions -->
         <!-- Compile -->
-        <com.fasterxml.jackson-version>2.22.1</com.fasterxml.jackson-version>
-        <com.fasterxml.jackson-annotations-version>2.22</com.fasterxml.jackson-annotations-version>
+        <tools.jackson-version>3.1.5</tools.jackson-version>
+        <!-- Jackson 3 intentionally continues to use the Jackson 2 annotations artifact/package. -->
+        <com.fasterxml.jackson-annotations-version>2.21</com.fasterxml.jackson-annotations-version>
         <gson-version>2.14.0</gson-version>
         <commons-codec-version>1.22.1</commons-codec-version>
         <swagger-core-version>1.6.16</swagger-core-version>
@@ -246,15 +247,24 @@
                 <version>${maven-enforcer-version}</version>
                 <executions>
                     <execution>
-                        <id>enforce-jakarta-compliance</id>
+                        <id>enforce-runtime-baseline</id>
                         <goals>
                             <goal>enforce</goal>
                         </goals>
                         <configuration>
                             <rules>
+                                <requireJavaVersion>
+                                    <version>[17,)</version>
+                                </requireJavaVersion>
                                 <bannedDependencies>
                                     <excludes>
                                         <exclude>javax.xml.bind:jaxb-api</exclude>
+                                        <exclude>com.fasterxml.jackson.core:jackson-core</exclude>
+                                        <exclude>com.fasterxml.jackson.core:jackson-databind</exclude>
+                                        <exclude>com.fasterxml.jackson.datatype:*</exclude>
+                                        <exclude>com.fasterxml.jackson.dataformat:*</exclude>
+                                        <exclude>com.fasterxml.jackson.module:*</exclude>
+                                        <exclude>com.fasterxml.jackson.jaxrs:*</exclude>
 
                                         <!-- Not used but keeping exclusions for Jakarta EE 9+ compatibility -->
                                         <exclude>javax.servlet:servlet-api</exclude>
@@ -265,7 +275,7 @@
                                         <exclude>javax.inject:javax.inject</exclude>
                                     </excludes>
                                     <message>
-                                        STOP! A legacy javax.* dependency was detected
+                                        STOP! An unsupported legacy dependency was detected
                                     </message>
                                 </bannedDependencies>
                             </rules>
@@ -293,25 +303,20 @@
     <dependencies>
         <!-- Compile -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${com.fasterxml.jackson-version}</version>
+            <version>${tools.jackson-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
+            <groupId>tools.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${com.fasterxml.jackson-version}</version>
+            <version>${tools.jackson-version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
             <version>${com.fasterxml.jackson-annotations-version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${com.fasterxml.jackson-version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

src/main/java/com/adyen/model/ApiError.java

@@ -21,9 +21,9 @@
 
 import com.adyen.model.checkout.JSON;
 import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.*;
+import tools.jackson.core.JacksonException;
 
 /**
  * Class that defines the API error model returned when an error (401. 403, 422, etc..) is returned
@@ -339,9 +339,9 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of ServiceError
-   * @throws JsonProcessingException if the JSON string is invalid with respect to ServiceError
+   * @throws JacksonException if the JSON string is invalid with respect to ServiceError
    */
-  public static ApiError fromJson(String jsonString) throws JsonProcessingException {
+  public static ApiError fromJson(String jsonString) throws JacksonException {
     if (jsonString == null) {
       return null;
     }
@@ -353,7 +353,7 @@ public static ApiError fromJson(String jsonString) throws JsonProcessingExceptio
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/InvalidField.java

@@ -15,9 +15,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Objects;
+import tools.jackson.core.JacksonException;
 
 /** InvalidField */
 @JsonPropertyOrder({
@@ -152,9 +152,9 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of InvalidField
-   * @throws JsonProcessingException if the JSON string is invalid with respect to InvalidField
+   * @throws JacksonException if the JSON string is invalid with respect to InvalidField
    */
-  public static InvalidField fromJson(String jsonString) throws JsonProcessingException {
+  public static InvalidField fromJson(String jsonString) throws JacksonException {
     return JSON.getMapper().readValue(jsonString, InvalidField.class);
   }
 
@@ -163,7 +163,7 @@ public static InvalidField fromJson(String jsonString) throws JsonProcessingExce
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/acswebhooks/Amount.java

@@ -14,8 +14,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.*;
+import tools.jackson.core.JacksonException;
 
 /** Amount */
 @JsonPropertyOrder({Amount.JSON_PROPERTY_CURRENCY, Amount.JSON_PROPERTY_VALUE})
@@ -156,9 +156,9 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of Amount
-   * @throws JsonProcessingException if the JSON string is invalid with respect to Amount
+   * @throws JacksonException if the JSON string is invalid with respect to Amount
    */
-  public static Amount fromJson(String jsonString) throws JsonProcessingException {
+  public static Amount fromJson(String jsonString) throws JacksonException {
     return JSON.getMapper().readValue(jsonString, Amount.class);
   }
 
@@ -167,7 +167,7 @@ public static Amount fromJson(String jsonString) throws JsonProcessingException
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/acswebhooks/AuthenticationDecision.java

@@ -16,10 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.*;
 import java.util.Arrays;
 import java.util.logging.Logger;
+import tools.jackson.core.JacksonException;
 
 /** AuthenticationDecision */
 @JsonPropertyOrder({AuthenticationDecision.JSON_PROPERTY_STATUS})
@@ -161,10 +161,9 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of AuthenticationDecision
-   * @throws JsonProcessingException if the JSON string is invalid with respect to
-   *     AuthenticationDecision
+   * @throws JacksonException if the JSON string is invalid with respect to AuthenticationDecision
    */
-  public static AuthenticationDecision fromJson(String jsonString) throws JsonProcessingException {
+  public static AuthenticationDecision fromJson(String jsonString) throws JacksonException {
     return JSON.getMapper().readValue(jsonString, AuthenticationDecision.class);
   }
 
@@ -173,7 +172,7 @@ public static AuthenticationDecision fromJson(String jsonString) throws JsonProc
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/acswebhooks/AuthenticationInfo.java

@@ -16,11 +16,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.Arrays;
 import java.util.logging.Logger;
+import tools.jackson.core.JacksonException;
 
 /** AuthenticationInfo */
 @JsonPropertyOrder({
@@ -1238,10 +1238,9 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of AuthenticationInfo
-   * @throws JsonProcessingException if the JSON string is invalid with respect to
-   *     AuthenticationInfo
+   * @throws JacksonException if the JSON string is invalid with respect to AuthenticationInfo
    */
-  public static AuthenticationInfo fromJson(String jsonString) throws JsonProcessingException {
+  public static AuthenticationInfo fromJson(String jsonString) throws JacksonException {
     return JSON.getMapper().readValue(jsonString, AuthenticationInfo.class);
   }
 
@@ -1250,7 +1249,7 @@ public static AuthenticationInfo fromJson(String jsonString) throws JsonProcessi
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/acswebhooks/AuthenticationNotificationData.java

@@ -16,10 +16,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.*;
 import java.util.Arrays;
 import java.util.logging.Logger;
+import tools.jackson.core.JacksonException;
 
 /** AuthenticationNotificationData */
 @JsonPropertyOrder({
@@ -358,11 +358,10 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of AuthenticationNotificationData
-   * @throws JsonProcessingException if the JSON string is invalid with respect to
+   * @throws JacksonException if the JSON string is invalid with respect to
    *     AuthenticationNotificationData
    */
-  public static AuthenticationNotificationData fromJson(String jsonString)
-      throws JsonProcessingException {
+  public static AuthenticationNotificationData fromJson(String jsonString) throws JacksonException {
     return JSON.getMapper().readValue(jsonString, AuthenticationNotificationData.class);
   }
 
@@ -371,7 +370,7 @@ public static AuthenticationNotificationData fromJson(String jsonString)
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/acswebhooks/AuthenticationNotificationRequest.java

@@ -16,11 +16,11 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.Arrays;
 import java.util.logging.Logger;
+import tools.jackson.core.JacksonException;
 
 /** AuthenticationNotificationRequest */
 @JsonPropertyOrder({
@@ -272,11 +272,11 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of AuthenticationNotificationRequest
-   * @throws JsonProcessingException if the JSON string is invalid with respect to
+   * @throws JacksonException if the JSON string is invalid with respect to
    *     AuthenticationNotificationRequest
    */
   public static AuthenticationNotificationRequest fromJson(String jsonString)
-      throws JsonProcessingException {
+      throws JacksonException {
     return JSON.getMapper().readValue(jsonString, AuthenticationNotificationRequest.class);
   }
 
@@ -285,7 +285,7 @@ public static AuthenticationNotificationRequest fromJson(String jsonString)
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }

src/main/java/com/adyen/model/acswebhooks/BalancePlatformNotificationResponse.java

@@ -14,8 +14,8 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.*;
+import tools.jackson.core.JacksonException;
 
 /** BalancePlatformNotificationResponse */
 @JsonPropertyOrder({BalancePlatformNotificationResponse.JSON_PROPERTY_NOTIFICATION_RESPONSE})
@@ -111,11 +111,11 @@ private String toIndentedString(Object o) {
    *
    * @param jsonString JSON string
    * @return An instance of BalancePlatformNotificationResponse
-   * @throws JsonProcessingException if the JSON string is invalid with respect to
+   * @throws JacksonException if the JSON string is invalid with respect to
    *     BalancePlatformNotificationResponse
    */
   public static BalancePlatformNotificationResponse fromJson(String jsonString)
-      throws JsonProcessingException {
+      throws JacksonException {
     return JSON.getMapper().readValue(jsonString, BalancePlatformNotificationResponse.class);
   }
 
@@ -124,7 +124,7 @@ public static BalancePlatformNotificationResponse fromJson(String jsonString)
    *
    * @return JSON string
    */
-  public String toJson() throws JsonProcessingException {
+  public String toJson() throws JacksonException {
     return JSON.getMapper().writeValueAsString(this);
   }
 }