This is an automated email from the ASF dual-hosted git repository.
amichai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git
commit 0809e326f668840cf51d85fd1822dd3d67346062
Author: Amichai Rothman <amic...@apache.org>
AuthorDate: Wed Jun 5 13:23:38 2024 +0300
ARIES-2158 Upgrade build to JDK 11 and jakarta.* namespace
---
discovery/local/pom.xml | 15 ++++++++++++---
.../endpoint/EndpointDescriptionParserImpl.java | 10 +++++-----
.../rsa/discovery/endpoint/PropertiesMapper.java | 2 +-
itests/felix/pom.xml | 13 +++++++++++++
.../apache/aries/rsa/itests/felix/RsaTestBase.java | 3 +++
parent/pom.xml | 19 +++++++++++++++++--
6 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml
index 32b4a980..036c50f4 100644
--- a/discovery/local/pom.xml
+++ b/discovery/local/pom.xml
@@ -50,14 +50,23 @@
<version>1.6</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.jvnet.jaxb2.maven2</groupId>
- <artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.15.3</version>
+ <groupId>org.jvnet.jaxb</groupId>
+ <artifactId>jaxb-maven-plugin</artifactId>
+ <version>4.0.6</version>
<executions>
<execution>
<goals>
diff --git
a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
index f4c81455..5512cbfd 100644
---
a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
+++
b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/EndpointDescriptionParserImpl.java
@@ -25,11 +25,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
diff --git
a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
index f3fa57fd..8882f9f8 100644
---
a/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
+++
b/discovery/local/src/main/java/org/apache/aries/rsa/discovery/endpoint/PropertiesMapper.java
@@ -30,7 +30,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
diff --git a/itests/felix/pom.xml b/itests/felix/pom.xml
index 5c9cf305..1e007a38 100644
--- a/itests/felix/pom.xml
+++ b/itests/felix/pom.xml
@@ -98,6 +98,19 @@
<version>9.7</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.aries.rsa</groupId>
<artifactId>org.apache.aries.rsa.core</artifactId>
diff --git
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
index a6da0542..e5003f78 100644
---
a/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
+++
b/itests/felix/src/test/java/org/apache/aries/rsa/itests/felix/RsaTestBase.java
@@ -137,6 +137,9 @@ public class RsaTestBase {
mvn("org.ow2.asm", "asm-util"),
mvn("org.ow2.asm", "asm-tree"),
mvn("org.ow2.asm", "asm-analysis"),
+ mvn("jakarta.xml.bind", "jakarta.xml.bind-api"),
+ mvn("com.sun.xml.bind", "jaxb-osgi"),
+ mvn("jakarta.activation", "jakarta.activation-api"),
mvn("org.apache.felix",
"org.apache.felix.eventadmin"),
mvn("org.apache.felix",
"org.apache.felix.configadmin"),
mvn("org.apache.felix", "org.apache.felix.scr"),
diff --git a/parent/pom.xml b/parent/pom.xml
index b2d6b1ce..329470ca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -229,6 +229,22 @@
<artifactId>org.apache.felix.converter</artifactId>
<version>1.0.18</version>
</dependency>
+
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>4.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <version>4.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.1.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -242,8 +258,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
</configuration>
</plugin>
<plugin>
