diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d80177..320d88d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,12 +7,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 with: - java-version: '8' - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' cache: maven - name: Build with Maven run: mvn --batch-mode --update-snapshots verify diff --git a/pom.xml b/pom.xml index c08033a..d324753 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.rwth.idsg ocpp-jaxb - 0.0.8 + 0.0.9-SNAPSHOT jar @@ -30,18 +30,18 @@ - 1.8 + 17 UTF-8 - 3.2.4 - 1.18.22 + 4.0.5 + 1.18.34 maven-compiler-plugin - 3.10.1 + 3.13.0 ${java.version} ${java.version} @@ -50,7 +50,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources @@ -99,19 +99,14 @@ ${lombok.version} - org.jvnet.jaxb2_commons - jaxb2-basics-annotate - 1.0.1 + org.jvnet.jaxb + jaxb-plugins + 4.0.8 - org.jvnet.jaxb2_commons - jaxb2-fluent-api - 3.0 - - - org.jvnet.jaxb2_commons - jaxb2-basics - 0.9.0 + org.jvnet.jaxb + jaxb-plugin-annotate + 4.0.8 @@ -163,13 +158,15 @@ org.jsonschema2pojo jsonschema2pojo-maven-plugin - 1.1.1 + 1.2.1 ${project.build.directory}/generated-resources ${project.build.directory}/generated-sources ocpp._2020._03 true true + false + true true true true @@ -187,10 +184,31 @@ + + jakarta.validation + jakarta.validation-api + 3.1.0 + + + jakarta.jws + jakarta.jws-api + 3.0.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + jakarta.xml.ws + jakarta.xml.ws-api + 4.0.2 + + joda-time joda-time - 2.10.14 + 2.12.7 org.projectlombok @@ -200,23 +218,23 @@ com.fasterxml.jackson.core jackson-databind - 2.13.4.2 + 2.17.2 - javax.validation - validation-api - 2.0.1.Final + jakarta.validation + jakarta.validation-api + 3.1.0 org.junit.jupiter junit-jupiter-engine - 5.10.1 + 5.10.3 test org.junit.jupiter junit-jupiter-params - 5.10.1 + 5.10.3 test diff --git a/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java b/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java index e43cc89..57b00c1 100644 --- a/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java +++ b/src/main/java/de/rwth/idsg/ocpp/jaxb/JodaDateTimeConverter.java @@ -4,7 +4,7 @@ import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.DateTimeFormatterBuilder; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import static org.joda.time.format.ISODateTimeFormat.date; diff --git a/src/main/resources/wsdl-binding/add_interface.xml b/src/main/resources/wsdl-binding/add_interface.xml index 7334c7b..c4056f9 100644 --- a/src/main/resources/wsdl-binding/add_interface.xml +++ b/src/main/resources/wsdl-binding/add_interface.xml @@ -1,9 +1,9 @@ - diff --git a/src/main/resources/wsdl-binding/async_binding.xml b/src/main/resources/wsdl-binding/async_binding.xml index 71d1e7c..9b98bb2 100644 --- a/src/main/resources/wsdl-binding/async_binding.xml +++ b/src/main/resources/wsdl-binding/async_binding.xml @@ -1,5 +1,5 @@ + xmlns="https://jakarta.ee/xml/ns/jaxws"> true @@ -13,4 +13,4 @@ true - \ No newline at end of file + diff --git a/src/main/resources/wsdl-binding/ocpp_binding.xml b/src/main/resources/wsdl-binding/ocpp_binding.xml index 99b667e..8aaee20 100644 --- a/src/main/resources/wsdl-binding/ocpp_binding.xml +++ b/src/main/resources/wsdl-binding/ocpp_binding.xml @@ -1,6 +1,6 @@ - @@ -12,4 +12,4 @@ - \ No newline at end of file +