Skip to content

Commit 400c23c

Browse files
Migrate javax.xml.bind to jakarta.xml.bind (#542)
* Upgrade javax.xml.bind.jaxb-api 2.3.1 to jakarta.xml.bind-api 4.0.4 * Upgrade (unrelated) jdt-annotations from 2.3.100 to 2.4.100 Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
1 parent 350de99 commit 400c23c

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<mojo.executor.version>2.4.1</mojo.executor.version>
7676
<org.jsoup.version>1.19.1</org.jsoup.version>
7777
<sat.version>0.18.0</sat.version>
78-
<jdt-annotations.version>2.3.100</jdt-annotations.version>
78+
<jdt-annotations.version>2.4.100</jdt-annotations.version>
7979
<flexmark.version>0.64.8</flexmark.version>
8080
<maven.surefire.plugin.version>3.5.4</maven.surefire.plugin.version>
8181
<jetty.server.version>9.4.50.v20221201</jetty.server.version>
@@ -93,14 +93,14 @@
9393

9494
<dependencies>
9595
<dependency>
96-
<groupId>javax.xml.bind</groupId>
97-
<artifactId>jaxb-api</artifactId>
98-
<version>2.3.1</version>
96+
<groupId>jakarta.xml.bind</groupId>
97+
<artifactId>jakarta.xml.bind-api</artifactId>
98+
<version>4.0.4</version>
9999
</dependency>
100100
<dependency>
101101
<groupId>org.glassfish.jaxb</groupId>
102102
<artifactId>jaxb-runtime</artifactId>
103-
<version>2.3.1</version>
103+
<version>4.0.6</version>
104104
</dependency>
105105
<dependency>
106106
<groupId>org.hamcrest</groupId>

sat-plugin/src/main/java/org/openhab/tools/analysis/tools/SpotBugsChecker.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
import java.util.List;
2626
import java.util.Properties;
2727

28-
import javax.xml.bind.JAXBContext;
29-
import javax.xml.bind.JAXBException;
30-
import javax.xml.bind.Unmarshaller;
31-
3228
import org.apache.maven.model.Dependency;
3329
import org.apache.maven.plugin.MojoExecutionException;
3430
import org.apache.maven.plugin.logging.Log;
@@ -39,6 +35,10 @@
3935
import org.openhab.tools.analysis.tools.internal.SpotBugsVisitors;
4036
import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
4137

38+
import jakarta.xml.bind.JAXBContext;
39+
import jakarta.xml.bind.JAXBException;
40+
import jakarta.xml.bind.Unmarshaller;
41+
4242
/**
4343
* <p>
4444
* Executes the

sat-plugin/src/main/java/org/openhab/tools/analysis/tools/internal/SpotBugsVisitors.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import java.util.ArrayList;
1616
import java.util.List;
1717

18-
import javax.xml.bind.annotation.XmlElement;
19-
import javax.xml.bind.annotation.XmlRootElement;
20-
2118
import org.apache.commons.lang3.StringUtils;
2219

20+
import jakarta.xml.bind.annotation.XmlElement;
21+
import jakarta.xml.bind.annotation.XmlRootElement;
22+
2323
/**
2424
* A JAXB model of the SpotBugs visitors XML file
2525
*

0 commit comments

Comments
 (0)