This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new cdb034c45 Replace jakarta transpiled module dependencies.
cdb034c45 is described below
commit cdb034c458da494b5d67d4122a588181b3f96405
Author: James Bognar <[email protected]>
AuthorDate: Mon May 12 10:55:32 2025 -0400
Replace jakarta transpiled module dependencies.
---
.../java/org/apache/juneau/common/internal/StringUtils.java | 2 +-
.../src/main/java/org/apache/juneau/dto/atom/Utils.java | 2 +-
.../src/main/java/org/apache/juneau/BeanSession.java | 2 +-
.../src/main/java/org/apache/juneau/internal/DateUtils.java | 2 +-
.../org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java | 4 ++--
juneau-rest/juneau-rest-mock/pom.xml | 4 ----
juneau-rest/juneau-rest-server/pom.xml | 4 ----
.../org/apache/juneau/rest/staticfile/BasicStaticFiles.java | 2 +-
.../java/org/apache/juneau/rest/staticfile/StaticFiles.java | 2 +-
.../main/java/org/apache/juneau/testutils/CalendarUtils.java | 2 +-
pom.xml | 11 ++---------
11 files changed, 11 insertions(+), 26 deletions(-)
diff --git
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
index 21ceaf9dc..c4cbe8b0c 100644
---
a/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
+++
b/juneau-core/juneau-common/src/main/java/org/apache/juneau/common/internal/StringUtils.java
@@ -31,7 +31,7 @@ import java.util.regex.*;
import java.util.stream.*;
import java.util.zip.*;
-import javax.xml.bind.*;
+import jakarta.xml.bind.*;
/**
* Reusable string utility methods.
diff --git
a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
index 9ddd639a9..a597176dc 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/atom/Utils.java
@@ -14,7 +14,7 @@ package org.apache.juneau.dto.atom;
import java.util.*;
-import javax.xml.bind.*;
+import jakarta.xml.bind.*;
/**
* Static utility methods for ATOM marshalling code.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index e2eeda852..772f3a4fe 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.*;
import java.util.function.*;
import java.util.logging.*;
-import javax.xml.bind.*;
+import jakarta.xml.bind.*;
import org.apache.juneau.annotation.*;
import org.apache.juneau.collections.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
index 0c0b3a1b4..62ba9d2bf 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
@@ -20,7 +20,7 @@ import java.text.*;
import java.time.format.*;
import java.util.*;
-import javax.xml.bind.*;
+import jakarta.xml.bind.*;
import org.apache.juneau.reflect.*;
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
index 013cdcc51..8eb88ee2e 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ExtendedMimetypesFileTypeMap.java
@@ -12,10 +12,10 @@
//
***************************************************************************************************************************
package org.apache.juneau.utils;
-import javax.activation.*;
+import jakarta.activation.*;
/**
- * An extension of {@link javax.activation.MimetypesFileTypeMap} that includes
many more media types.
+ * An extension of {@link jakarta.activation.MimetypesFileTypeMap} that
includes many more media types.
*
* <h5 class='section'>See Also:</h5><ul>
* </ul>
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index 78754e016..603ace2a3 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -47,10 +47,6 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index 0c917e74d..2333866be 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -56,10 +56,6 @@
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
index 80b632cd7..d92b2b9db 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/BasicStaticFiles.java
@@ -22,7 +22,7 @@ import static org.apache.juneau.internal.ObjectUtils.*;
import java.io.*;
import java.util.*;
-import javax.activation.*;
+import jakarta.activation.*;
import org.apache.http.*;
import org.apache.juneau.cp.*;
diff --git
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
index f7ea60136..b2e088085 100644
---
a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
+++
b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
@@ -17,7 +17,7 @@ import static org.apache.juneau.internal.CollectionUtils.*;
import java.nio.file.*;
import java.util.*;
-import javax.activation.*;
+import jakarta.activation.*;
import org.apache.http.*;
import org.apache.juneau.*;
diff --git
a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
index 300c30adc..fd88641fe 100644
---
a/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
+++
b/juneau-utest-utils/src/main/java/org/apache/juneau/testutils/CalendarUtils.java
@@ -20,7 +20,7 @@ import java.text.*;
import java.util.*;
import java.util.concurrent.*;
-import javax.xml.bind.*;
+import jakarta.xml.bind.*;
/**
* Utility class for converting {@link Calendar} and {@link Date} objects to
common serialized forms.
diff --git a/pom.xml b/pom.xml
index 3c2be2c28..e99eab698 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
- <jaxb.version>2.3.2</jaxb.version>
+ <jaxb.version>3.0.1</jaxb.version>
<junit.version>4.13.2</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
<servlet.version>6.1.0</servlet.version>
@@ -95,16 +95,9 @@
<version>${jaxb.version}</version>
</dependency>
<dependency>
- <!-- Java 11 -->
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <!-- Java 11 -->
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>1.2.1</version>
+ <version>2.0.1</version>
</dependency>
</dependencies>
</dependencyManagement>
