COREP-4082 Update to Jakarta 10 and java 17

.github/workflows/publish.yml

@@ -9,15 +9,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           java-version: '17'
           distribution: 'adopt'
-      
-      - name: Checkout
-        uses: actions/checkout@v2
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Create GPG key file
         run: |
@@ -34,5 +36,5 @@ jobs:
          echo pwd=${{ secrets.OSSRH_TOKEN }} >> gradle.properties
 
       - name: Publish package
-        run: gradle publish
+        run: ./gradlew publish
 

.github/workflows/sdk_tests.yml

@@ -11,15 +11,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout
+        uses: actions/checkout@v2
+
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
           java-version: '17'
           distribution: 'adopt'
 
-      - name: Checkout
-        uses: actions/checkout@v2
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Create gradle.properties file
         run: |
@@ -30,4 +32,4 @@ jobs:
           echo pwd=${{ secrets.OSSRH_TOKEN }} >> gradle.properties
 
       - name: Run Tests
-        run: gradle test
+        run: ./gradlew test

CHANGELOG.md

@@ -1,14 +1,17 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [3.0.1]
+
+- Update to Jakarta 10 and Java 17
+
 ## [2.0.7]
 
 - Added `organisationName`, `organisationEntityType`, `organisationVatId`  field to `CustomerInfo` in API responses
 - Added `Firstname`, `Lastname`, `CardHolderName` fields to `CustomerInfo` in API responses
 - Added `orderId` and `returnUrl` fields to `Body` in API responses
 - Added `MethodConfigurations` field to `Terminal` in API responses
 - Added `ExtraData` field to `Funding` in API responses
-- 
 
 ## [2.0.6]
 

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'com.altapay'
-version = '2.0.7'
+version = '3.0.1'
 
 repositories {
     mavenCentral()
@@ -26,7 +26,7 @@ configurations {
 }
 
 dependencies {
-    implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
     implementation 'net.sourceforge.javacsv:javacsv:2.0'
     implementation 'commons-collections:commons-collections:3.2.2'
     implementation 'commons-codec:commons-codec:1.17.1'
@@ -35,18 +35,18 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.junit.jupiter:junit-jupiter-params'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
+    testRuntimeOnly 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
 
     integrationTestImplementation platform('org.junit:junit-bom:5.11.4')
     integrationTestImplementation 'org.junit.jupiter:junit-jupiter-api'
     integrationTestImplementation 'org.junit.jupiter:junit-jupiter-params'
     integrationTestRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    integrationTestRuntimeOnly 'org.glassfish.jaxb:jaxb-runtime:2.3.1'
+    integrationTestRuntimeOnly 'org.glassfish.jaxb:jaxb-runtime:3.0.2'
 }
 
 xjc {
-    xjcVersion.set("2.3.8")
-    useJakarta.set(false)
+    xjcVersion.set("3.0.2")
+    useJakarta.set(true)
     markGenerated.set(true)
     xsdDir.set(layout.projectDirectory.dir("src/main/resources/xsd"))
     outputResourcesDir.set(layout.projectDirectory.dir("generated"))
@@ -70,6 +70,9 @@ tasks.register("integrationTest", Test) {
 }
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
     withJavadocJar()
     withSourcesJar()
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

readme.md

@@ -49,12 +49,12 @@ For integrating Java projects with the AltaPay gateway.
     <dependency>
         <groupId>com.altapay</groupId>
         <artifactId>sdk-java</artifactId>
-        <version>2.0.7</version>
+        <version>3.0.1</version>
     </dependency>
 
 ### Gradle
 
-    implementation 'com.altapay:sdk-java:2.0.7'
+    implementation 'com.altapay:sdk-java:3.0.1'
 
 ## Changelog
 

src/main/java/com/pensio/api/PensioAbstractAPI.java

@@ -7,10 +7,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 
 import com.pensio.api.generated.APIResponse;
 

src/main/java/com/pensio/api/PensioMerchantAPI.java

@@ -6,8 +6,8 @@
 import com.pensio.api.generated.APIResponse;
 import com.pensio.api.request.*;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
 
 import java.io.InputStream;
 import java.io.StringReader;

src/main/java/com/pensio/api/PensioProcessorAPI.java

@@ -44,6 +44,7 @@ public APIResponse initiatePaymentRequest(PaymentReservationRequest paymentReque
 	 *
 	 * @deprecated use {@link #reservation(PaymentReservationRequest)} instead
 	 */
+    @Deprecated
 	public APIResponse reservationOfFixedAmount(PaymentReservationRequest paymentRequest)
 			throws PensioAPIException
 	{

src/main/resources/xsd/bindings.xjb

@@ -1,7 +1,7 @@
 <jxb:bindings
         xmlns:xs="http://www.w3.org/2001/XMLSchema"
-        xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
-        version="2.1">
+        xmlns:jxb="https://jakarta.ee/xml/ns/jaxb"
+        version="3.0">
 
     <jxb:bindings schemaLocation="APIResponse.xsd">
         <jxb:bindings node="//xs:simpleType[@name='AuthenticationType']/xs:restriction/xs:enumeration[@value='3DSECURE']">