This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch juneau-8.1.5-branch in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 99e3b7923bb78e0f34cfbcd87698dfc4393acc6a Author: James Bognar <[email protected]> AuthorDate: Tue May 13 07:45:35 2025 -0400 Replace usage of jakarta transpiled dependencies. --- .../org/apache/juneau/transforms/CalendarSwapTest.java | 2 +- .../main/java/org/apache/juneau/dto/atom/Utils.java | 2 +- .../java/org/apache/juneau/internal/DateUtils.java | 2 +- .../java/org/apache/juneau/internal/StringUtils.java | 2 +- .../java/org/apache/juneau/utils/CalendarUtils.java | 2 +- .../juneau/utils/ExtendedMimetypesFileTypeMap.java | 2 +- .../juneau-examples-rest-jetty-ftest/pom.xml | 5 +++++ juneau-examples/juneau-examples-rest/pom.xml | 5 +++++ juneau-microservice/juneau-microservice-core/pom.xml | 18 ++++++++++++++++++ juneau-rest/juneau-rest-client-utest/pom.xml | 6 +----- juneau-rest/juneau-rest-mock-utest/pom.xml | 2 +- juneau-rest/juneau-rest-server-springboot/pom.xml | 5 +++++ .../main/java/org/apache/juneau/rest/RestContext.java | 2 +- .../main/java/org/apache/juneau/rest/StaticFiles.java | 2 +- pom.xml | 6 +++--- 15 files changed, 46 insertions(+), 17 deletions(-) diff --git a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java index 6f64f70f7..1bce40968 100755 --- a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java +++ b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/transforms/CalendarSwapTest.java @@ -17,7 +17,7 @@ import static org.junit.Assert.*; import java.net.*; import java.util.*; -import javax.xml.bind.*; +import jakarta.xml.bind.*; import org.apache.juneau.*; import org.apache.juneau.annotation.*; 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 7cae20933..464f05597 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/internal/DateUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java index b82d8bcf9..dddd28582 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 @@ -19,7 +19,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/internal/StringUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java index ff73a7685..cec3d0ff1 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java @@ -26,7 +26,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.regex.*; -import javax.xml.bind.*; +import jakarta.xml.bind.*; import org.apache.juneau.*; import org.apache.juneau.json.*; diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java index aa945139d..d85c93231 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/CalendarUtils.java @@ -19,7 +19,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/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 da5e656c2..5f42d4729 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,7 +12,7 @@ // *************************************************************************************************************************** package org.apache.juneau.utils; -import javax.activation.*; +import jakarta.activation.*; /** * An extension of {@link javax.activation.MimetypesFileTypeMap} that includes many more media types. diff --git a/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml index 9cbf6816c..b82aed144 100644 --- a/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml +++ b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml @@ -56,6 +56,11 @@ <version>${project.version}</version> <type>test-jar</type> </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-config</artifactId> + <version>${project.version}</version> + </dependency> <!-- Other --> <dependency> diff --git a/juneau-examples/juneau-examples-rest/pom.xml b/juneau-examples/juneau-examples-rest/pom.xml index 731c501e9..6cdc5c7fc 100644 --- a/juneau-examples/juneau-examples-rest/pom.xml +++ b/juneau-examples/juneau-examples-rest/pom.xml @@ -43,6 +43,11 @@ <artifactId>juneau-microservice-jetty</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-dto</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-rest-server-rdf</artifactId> diff --git a/juneau-microservice/juneau-microservice-core/pom.xml b/juneau-microservice/juneau-microservice-core/pom.xml index d9000c91f..c77d72dc0 100644 --- a/juneau-microservice/juneau-microservice-core/pom.xml +++ b/juneau-microservice/juneau-microservice-core/pom.xml @@ -47,6 +47,11 @@ <artifactId>juneau-rest-client</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-config</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>jakarta.servlet</groupId> <artifactId>jakarta.servlet-api</artifactId> @@ -55,6 +60,19 @@ <build> <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <phase>verify</phase> + <goals> + <goal>jar-no-fork</goal> + </goals> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> diff --git a/juneau-rest/juneau-rest-client-utest/pom.xml b/juneau-rest/juneau-rest-client-utest/pom.xml index 651999c1e..9d56f41d6 100644 --- a/juneau-rest/juneau-rest-client-utest/pom.xml +++ b/juneau-rest/juneau-rest-client-utest/pom.xml @@ -41,10 +41,6 @@ <groupId>jakarta.activation</groupId> <artifactId>jakarta.activation-api</artifactId> </dependency> - <dependency> - <groupId>com.sun.activation</groupId> - <artifactId>jakarta.activation</artifactId> - </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -94,7 +90,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.2</version> + <version>0.8.5</version> <executions> <execution> <id>default-prepare-agent</id> diff --git a/juneau-rest/juneau-rest-mock-utest/pom.xml b/juneau-rest/juneau-rest-mock-utest/pom.xml index 42fa0f1d1..6d1baf4fa 100644 --- a/juneau-rest/juneau-rest-mock-utest/pom.xml +++ b/juneau-rest/juneau-rest-mock-utest/pom.xml @@ -107,7 +107,7 @@ <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> - <version>0.8.2</version> + <version>0.8.5</version> <executions> <execution> <id>default-prepare-agent</id> diff --git a/juneau-rest/juneau-rest-server-springboot/pom.xml b/juneau-rest/juneau-rest-server-springboot/pom.xml index 0f7481cfd..1800d1137 100644 --- a/juneau-rest/juneau-rest-server-springboot/pom.xml +++ b/juneau-rest/juneau-rest-server-springboot/pom.xml @@ -29,6 +29,11 @@ <packaging>bundle</packaging> <dependencies> + <dependency> + <groupId>org.apache.juneau</groupId> + <artifactId>juneau-marshall</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.juneau</groupId> <artifactId>juneau-rest-server</artifactId> diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java index 39847866c..f50178566 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RestContext.java @@ -29,7 +29,7 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.*; import java.util.stream.*; -import javax.activation.*; +import jakarta.activation.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java index e7d859dba..f7e0db1ff 100644 --- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java +++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/StaticFiles.java @@ -27,7 +27,7 @@ package org.apache.juneau.rest; import java.io.*; import java.util.*; -import javax.activation.*; +import jakarta.activation.*; import org.apache.juneau.http.*; import org.apache.juneau.utils.*; diff --git a/pom.xml b/pom.xml index bdd54696c..5e1c302af 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.target>1.8</maven.compiler.target> - <jaxb.version>2.3.2</jaxb.version> + <jaxb.version>3.0.1</jaxb.version> <jena.version>3.10.0</jena.version> <junit.version>4.11</junit.version> <jaxrs.version>1.1.1</jaxrs.version> @@ -97,13 +97,13 @@ <!-- Java 11 --> <groupId>jakarta.activation</groupId> <artifactId>jakarta.activation-api</artifactId> - <version>1.2.1</version> + <version>2.0.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>
