Skip to content

Commit f8032a0

Browse files
committed
Bump jaxb from 2.3.1 to 4.0.7
Replaces pmd#377 and pmd#376
1 parent 6487d81 commit f8032a0

File tree

6 files changed

+28
-27
lines changed

6 files changed

+28
-27
lines changed

net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ Bundle-ClassPath: .,
5252
target/lib/io.github.apex-dev-tools.vf-parser.jar,
5353
target/lib/io.methvin.directory-watcher-better-files_2.13.jar,
5454
target/lib/io.methvin.directory-watcher.jar,
55-
target/lib/javax.activation.javax.activation-api.jar,
55+
target/lib/jakarta.activation.jakarta.activation-api.jar,
56+
target/lib/jakarta.annotation.jakarta.annotation-api.jar,
57+
target/lib/jakarta.inject.jakarta.inject-api.jar,
58+
target/lib/jakarta.xml.bind.jakarta.xml.bind-api.jar,
5659
target/lib/javax.annotation.jsr250-api.jar,
57-
target/lib/javax.xml.bind.jaxb-api.jar,
5860
target/lib/net.java.dev.jna.jna.jar,
5961
target/lib/net.sf.saxon.Saxon-HE.jar,
6062
target/lib/net.sourceforge.pmd.pmd-apex.jar,

net.sourceforge.pmd.eclipse.plugin/build.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ bin.includes = .,\
5353
target/lib/io.github.apex-dev-tools.vf-parser.jar,\
5454
target/lib/io.methvin.directory-watcher-better-files_2.13.jar,\
5555
target/lib/io.methvin.directory-watcher.jar,\
56-
target/lib/javax.activation.javax.activation-api.jar,\
56+
target/lib/jakarta.activation.jakarta.activation-api.jar,\
57+
target/lib/jakarta.annotation.jakarta.annotation-api.jar,\
58+
target/lib/jakarta.inject.jakarta.inject-api.jar,\
59+
target/lib/jakarta.xml.bind.jakarta.xml.bind-api.jar,\
5760
target/lib/javax.annotation.jsr250-api.jar,\
58-
target/lib/javax.xml.bind.jaxb-api.jar,\
5961
target/lib/net.java.dev.jna.jna.jar,\
6062
target/lib/net.sf.saxon.Saxon-HE.jar,\
6163
target/lib/net.sourceforge.pmd.pmd-apex.jar,\

net.sourceforge.pmd.eclipse.plugin/pom.xml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,16 @@
2424
<version>${pmd.version}</version>
2525
<type>pom</type>
2626
</dependency>
27-
<dependency>
28-
<groupId>javax.xml.bind</groupId>
29-
<artifactId>jaxb-api</artifactId>
30-
<version>2.3.1</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>com.sun.xml.bind</groupId>
34-
<artifactId>jaxb-core</artifactId>
35-
<version>2.3.0.1</version>
27+
<dependency>
28+
<groupId>jakarta.xml.bind</groupId>
29+
<artifactId>jakarta.xml.bind-api</artifactId>
30+
<version>4.0.2</version>
3631
</dependency>
3732
<dependency>
38-
<groupId>com.sun.xml.bind</groupId>
39-
<artifactId>jaxb-impl</artifactId>
40-
<version>2.3.1</version>
33+
<groupId>com.sun.xml.bind</groupId>
34+
<artifactId>jaxb-impl</artifactId>
35+
<version>4.0.7</version>
36+
<scope>runtime</scope>
4137
</dependency>
4238

4339
<dependency>

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
import java.util.concurrent.ConcurrentHashMap;
2020
import java.util.concurrent.ConcurrentMap;
2121
import java.util.regex.Pattern;
22-
import javax.xml.bind.DataBindingException;
23-
import javax.xml.bind.JAXBContext;
24-
import javax.xml.bind.JAXBElement;
25-
import javax.xml.bind.JAXBException;
26-
import javax.xml.bind.Marshaller;
2722
import javax.xml.transform.Source;
2823
import javax.xml.transform.stream.StreamSource;
2924

@@ -48,6 +43,12 @@
4843
import net.sourceforge.pmd.lang.rule.RuleSetLoadException;
4944
import net.sourceforge.pmd.lang.rule.RuleSetLoader;
5045

46+
import jakarta.xml.bind.DataBindingException;
47+
import jakarta.xml.bind.JAXBContext;
48+
import jakarta.xml.bind.JAXBElement;
49+
import jakarta.xml.bind.JAXBException;
50+
import jakarta.xml.bind.Marshaller;
51+
5152
/**
5253
* This class manages the persistence of the ProjectProperies information structure
5354
*

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesTO.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
package net.sourceforge.pmd.eclipse.runtime.properties.impl;
66

7-
import javax.xml.bind.annotation.XmlElement;
8-
import javax.xml.bind.annotation.XmlElementWrapper;
9-
import javax.xml.bind.annotation.XmlRootElement;
10-
import javax.xml.bind.annotation.XmlType;
7+
import jakarta.xml.bind.annotation.XmlElement;
8+
import jakarta.xml.bind.annotation.XmlElementWrapper;
9+
import jakarta.xml.bind.annotation.XmlRootElement;
10+
import jakarta.xml.bind.annotation.XmlType;
1111

1212
/**
1313
* This class is a simple data bean to let simply serialize project properties

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/RuleSpecTO.java

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

55
package net.sourceforge.pmd.eclipse.runtime.properties.impl;
66

7-
import javax.xml.bind.annotation.XmlElement;
8-
import javax.xml.bind.annotation.XmlType;
7+
import jakarta.xml.bind.annotation.XmlElement;
8+
import jakarta.xml.bind.annotation.XmlType;
99

1010
/**
1111
* This class is a simple data bean to help serialize project properties. Is

0 commit comments

Comments
 (0)