diff --git a/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF b/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF index 2f88fe0b..50f84b28 100644 --- a/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF +++ b/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF @@ -52,9 +52,11 @@ Bundle-ClassPath: ., target/lib/io.github.apex-dev-tools.vf-parser.jar, target/lib/io.methvin.directory-watcher-better-files_2.13.jar, target/lib/io.methvin.directory-watcher.jar, - target/lib/javax.activation.javax.activation-api.jar, + target/lib/jakarta.activation.jakarta.activation-api.jar, + target/lib/jakarta.annotation.jakarta.annotation-api.jar, + target/lib/jakarta.inject.jakarta.inject-api.jar, + target/lib/jakarta.xml.bind.jakarta.xml.bind-api.jar, target/lib/javax.annotation.jsr250-api.jar, - target/lib/javax.xml.bind.jaxb-api.jar, target/lib/net.java.dev.jna.jna.jar, target/lib/net.sf.saxon.Saxon-HE.jar, target/lib/net.sourceforge.pmd.pmd-apex.jar, diff --git a/net.sourceforge.pmd.eclipse.plugin/build.properties b/net.sourceforge.pmd.eclipse.plugin/build.properties index 88510a09..f634cd99 100644 --- a/net.sourceforge.pmd.eclipse.plugin/build.properties +++ b/net.sourceforge.pmd.eclipse.plugin/build.properties @@ -53,9 +53,11 @@ bin.includes = .,\ target/lib/io.github.apex-dev-tools.vf-parser.jar,\ target/lib/io.methvin.directory-watcher-better-files_2.13.jar,\ target/lib/io.methvin.directory-watcher.jar,\ - target/lib/javax.activation.javax.activation-api.jar,\ + target/lib/jakarta.activation.jakarta.activation-api.jar,\ + target/lib/jakarta.annotation.jakarta.annotation-api.jar,\ + target/lib/jakarta.inject.jakarta.inject-api.jar,\ + target/lib/jakarta.xml.bind.jakarta.xml.bind-api.jar,\ target/lib/javax.annotation.jsr250-api.jar,\ - target/lib/javax.xml.bind.jaxb-api.jar,\ target/lib/net.java.dev.jna.jna.jar,\ target/lib/net.sf.saxon.Saxon-HE.jar,\ target/lib/net.sourceforge.pmd.pmd-apex.jar,\ diff --git a/net.sourceforge.pmd.eclipse.plugin/pom.xml b/net.sourceforge.pmd.eclipse.plugin/pom.xml index 2cffa979..5bf95590 100644 --- a/net.sourceforge.pmd.eclipse.plugin/pom.xml +++ b/net.sourceforge.pmd.eclipse.plugin/pom.xml @@ -24,20 +24,16 @@ ${pmd.version} pom - - javax.xml.bind - jaxb-api - 2.3.1 - - - com.sun.xml.bind - jaxb-core - 2.3.0.1 + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 - com.sun.xml.bind - jaxb-impl - 2.3.1 + com.sun.xml.bind + jaxb-impl + 4.0.7 + runtime diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java index 8777e8cc..c69fb3ca 100644 --- a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java +++ b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java @@ -19,11 +19,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.regex.Pattern; -import javax.xml.bind.DataBindingException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; @@ -48,6 +43,12 @@ import net.sourceforge.pmd.lang.rule.RuleSetLoadException; import net.sourceforge.pmd.lang.rule.RuleSetLoader; +import jakarta.xml.bind.DataBindingException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; + /** * This class manages the persistence of the ProjectProperies information structure * diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesTO.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesTO.java index 6449878f..0f4e72f8 100644 --- a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesTO.java +++ b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesTO.java @@ -4,10 +4,10 @@ package net.sourceforge.pmd.eclipse.runtime.properties.impl; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * This class is a simple data bean to let simply serialize project properties diff --git a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/RuleSpecTO.java b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/RuleSpecTO.java index c6a4710f..a4b2718a 100644 --- a/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/RuleSpecTO.java +++ b/net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/RuleSpecTO.java @@ -4,8 +4,8 @@ package net.sourceforge.pmd.eclipse.runtime.properties.impl; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * This class is a simple data bean to help serialize project properties. Is