Skip to content

Commit d92d114

Browse files
authored
[JAVA-37371] Upgrade xml to jakarta namespace (#17090)
1 parent 2213f55 commit d92d114

File tree

18 files changed

+40
-40
lines changed

18 files changed

+40
-40
lines changed

xml/pom.xml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,25 @@
5151
<version>${jdom2.version}</version>
5252
</dependency>
5353
<dependency>
54-
<groupId>javax.xml.bind</groupId>
55-
<artifactId>jaxb-api</artifactId>
56-
<version>${jaxb-api.version}</version>
54+
<groupId>jakarta.xml.bind</groupId>
55+
<artifactId>jakarta.xml.bind-api</artifactId>
56+
<version>${jakarta.xml.bind-api.version}</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>com.sun.xml.bind</groupId>
6060
<artifactId>jaxb-impl</artifactId>
6161
<version>${jaxb-impl.version}</version>
6262
</dependency>
63+
<dependency>
64+
<groupId>org.glassfish.jaxb</groupId>
65+
<artifactId>jaxb-runtime</artifactId>
66+
<version>${jaxb-runtime.version}</version>
67+
</dependency>
6368
<dependency>
6469
<groupId>com.sun.xml.bind</groupId>
6570
<artifactId>jaxb-core</artifactId>
6671
<version>${jaxb-core.version}</version>
6772
</dependency>
68-
<dependency>
69-
<groupId>javax.xml</groupId>
70-
<artifactId>jaxp-api</artifactId>
71-
<version>${jaxp-api.version}</version>
72-
</dependency>
73-
<dependency>
74-
<groupId>javax.xml.stream</groupId>
75-
<artifactId>stax-api</artifactId>
76-
<version>${stax-api.version}</version>
77-
</dependency>
7873
<dependency>
7974
<groupId>org.freemarker</groupId>
8075
<artifactId>freemarker</artifactId>
@@ -360,7 +355,7 @@
360355
<jaxb-api.version>2.3.1</jaxb-api.version>
361356
<jaxp-api.version>1.4.2</jaxp-api.version>
362357
<jaxb-core.version>2.3.0.1</jaxb-core.version>
363-
<jaxb-impl.version>2.3.2</jaxb-impl.version>
358+
<jaxb-impl.version>4.0.4</jaxb-impl.version>
364359
<stax-api.version>1.0-2</stax-api.version>
365360
<xmlunit-assertj.version>2.6.3</xmlunit-assertj.version>
366361
<freemarker.version>2.3.29</freemarker.version>
@@ -371,6 +366,8 @@
371366
<htmlcleaner.version>2.25</htmlcleaner.version>
372367
<jericho.version>3.4</jericho.version>
373368
<bcel.version>6.7.0</bcel.version>
369+
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
370+
<jaxb-runtime.version>4.0.3</jaxb-runtime.version>
374371
</properties>
375372

376373
</project>

xml/src/main/java/com/baeldung/xml/JaxbParser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.io.File;
44
import java.util.ArrayList;
55

6-
import javax.xml.bind.JAXBContext;
7-
import javax.xml.bind.JAXBException;
8-
import javax.xml.bind.Marshaller;
9-
import javax.xml.bind.Unmarshaller;
6+
import jakarta.xml.bind.JAXBContext;
7+
import jakarta.xml.bind.JAXBException;
8+
import jakarta.xml.bind.Marshaller;
9+
import jakarta.xml.bind.Unmarshaller;
1010

1111
import com.baeldung.xml.binding.Tutorial;
1212
import com.baeldung.xml.binding.Tutorials;

xml/src/main/java/com/baeldung/xml/attribute/Dom4jTransformer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public Dom4jTransformer(String resourcePath) throws DocumentException, SAXExcept
2727
this.input = xmlReader.read(resourcePath);
2828
}
2929

30-
public String modifyAttribute(String attribute, String oldValue, String newValue) throws TransformerException {
30+
public String modifyAttribute(String attribute, String oldValue, String newValue) throws TransformerException, TransformerException {
3131
// 2- Locate the node(s) with xpath, we can use index and iterator too.
3232
String expr = String.format("//*[contains(@%s, '%s')]", attribute, oldValue);
3333
XPath xpath = DocumentHelper.createXPath(expr);

xml/src/main/java/com/baeldung/xml/attribute/JaxpTransformer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import javax.xml.parsers.ParserConfigurationException;
1010
import javax.xml.transform.OutputKeys;
1111
import javax.xml.transform.Transformer;
12+
import javax.xml.transform.TransformerConfigurationException;
1213
import javax.xml.transform.TransformerException;
1314
import javax.xml.transform.TransformerFactory;
1415
import javax.xml.transform.TransformerFactoryConfigurationError;
@@ -37,7 +38,8 @@ public JaxpTransformer(String resourcePath) throws SAXException, IOException, Pa
3738
.parse(resourcePath);
3839
}
3940

40-
public String modifyAttribute(String attribute, String oldValue, String newValue) throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException {
41+
public String modifyAttribute(String attribute, String oldValue, String newValue)
42+
throws XPathExpressionException, TransformerFactoryConfigurationError, TransformerException, TransformerConfigurationException {
4143
// 2- Locate the node(s) with xpath
4244
XPath xpath = XPathFactory.newInstance()
4345
.newXPath();

xml/src/main/java/com/baeldung/xml/attribute/jmh/AttributeBenchMark.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ public String jooxBenchmark() throws IOException, SAXException {
6363
}
6464

6565
@Benchmark
66-
public String jaxpBenchmark() throws TransformerException, ParserConfigurationException, SAXException, IOException, XPathExpressionException {
66+
public String jaxpBenchmark()
67+
throws TransformerException, ParserConfigurationException, SAXException, IOException, XPathExpressionException {
6768
String path = this.getClass()
6869
.getResource("/xml/attribute.xml")
6970
.toString();

xml/src/main/java/com/baeldung/xml/binding/Tutorial.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.xml.binding;
22

3-
import javax.xml.bind.annotation.XmlAttribute;
4-
import javax.xml.bind.annotation.XmlElement;
3+
import jakarta.xml.bind.annotation.XmlAttribute;
4+
import jakarta.xml.bind.annotation.XmlElement;
55

66
public class Tutorial {
77

xml/src/main/java/com/baeldung/xml/binding/Tutorials.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.util.List;
44

5-
import javax.xml.bind.annotation.XmlElement;
6-
import javax.xml.bind.annotation.XmlRootElement;
5+
import jakarta.xml.bind.annotation.XmlElement;
6+
import jakarta.xml.bind.annotation.XmlRootElement;
77

88
@XmlRootElement
99
public class Tutorials {

xml/src/main/java/com/baeldung/xmlhtml/helpers/jaxb/JAXBHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.baeldung.xmlhtml.pojo.jaxb.html.elements.NestedElement;
88
import com.baeldung.xmlhtml.pojo.jaxb.xml.XMLExample;
99

10-
import javax.xml.bind.JAXBContext;
11-
import javax.xml.bind.Marshaller;
12-
import javax.xml.bind.Unmarshaller;
10+
import jakarta.xml.bind.JAXBContext;
11+
import jakarta.xml.bind.Marshaller;
12+
import jakarta.xml.bind.Unmarshaller;
1313

1414
import java.io.File;
1515

xml/src/main/java/com/baeldung/xmlhtml/pojo/jaxb/html/ExampleHTML.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.baeldung.xmlhtml.pojo.jaxb.html.elements.Body;
44
import com.baeldung.xmlhtml.pojo.jaxb.html.elements.Meta;
55

6-
import javax.xml.bind.annotation.*;
6+
import jakarta.xml.bind.annotation.*;
77
import java.util.ArrayList;
88
import java.util.List;
99

xml/src/main/java/com/baeldung/xmlhtml/pojo/jaxb/html/elements/Body.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.baeldung.xmlhtml.pojo.jaxb.html.elements;
22

3-
import javax.xml.bind.annotation.XmlElement;
3+
import jakarta.xml.bind.annotation.XmlElement;
44

55
public class Body {
66

0 commit comments

Comments
 (0)