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 ca4629cbe Update to jakarta namespaces.
ca4629cbe is described below
commit ca4629cbe162b08e86f99d11f9948d14e3df48a4
Author: James Bognar <[email protected]>
AuthorDate: Mon Dec 2 13:47:25 2024 -0500
Update to jakarta namespaces.
---
juneau-core/juneau-common/pom.xml | 4 +-
juneau-core/juneau-dto/pom.xml | 4 +-
juneau-core/juneau-marshall-rdf/pom.xml | 7 +-
.../org/apache/juneau/jena/RdfParserSession.java | 6 +-
.../apache/juneau/jena/RdfSerializerSession.java | 5 +-
juneau-core/juneau-marshall/pom.xml | 4 +-
.../juneau-examples-rest-jetty-ftest/pom.xml | 4 +-
juneau-examples/juneau-examples-rest-jetty/pom.xml | 4 +-
.../juneau-examples-rest-springboot/pom.xml | 4 +-
.../microservice/jetty/JettyMicroservice.java | 8 +--
juneau-rest/juneau-rest-mock/pom.xml | 6 +-
juneau-rest/juneau-rest-server/pom.xml | 10 +--
juneau-utest-utils/pom.xml | 4 +-
juneau-utest/pom.xml | 4 +-
pom.xml | 82 +++++++++++++---------
15 files changed, 88 insertions(+), 68 deletions(-)
diff --git a/juneau-core/juneau-common/pom.xml
b/juneau-core/juneau-common/pom.xml
index 7a76985af..42484cae9 100644
--- a/juneau-core/juneau-common/pom.xml
+++ b/juneau-core/juneau-common/pom.xml
@@ -30,8 +30,8 @@
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 7126a952c..2e242c101 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -35,8 +35,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml
b/juneau-core/juneau-marshall-rdf/pom.xml
index 929069807..f71b648a6 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -34,10 +34,15 @@
<artifactId>juneau-marshall</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-core</artifactId>
- <optional>true</optional>
+ <version>${jena.version}</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 6c1bf9b55..c3045bb9e 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -13,7 +13,7 @@
package org.apache.juneau.jena;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.StringUtils.*;
+import static org.apache.juneau.common.internal.StringUtils.*;
import static org.apache.juneau.jena.Constants.*;
import java.io.*;
@@ -23,8 +23,8 @@ import java.util.*;
import java.util.concurrent.atomic.*;
import java.util.function.*;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.util.iterator.*;
+import com.hp.hpl.jena.rdf.model.*;
+import com.hp.hpl.jena.util.iterator.*;
import org.apache.juneau.*;
import org.apache.juneau.collections.*;
import org.apache.juneau.httppart.*;
diff --git
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 65d115cc5..cf98ea296 100644
---
a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++
b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -13,7 +13,7 @@
package org.apache.juneau.jena;
import static org.apache.juneau.internal.CollectionUtils.*;
-import static org.apache.juneau.internal.IOUtils.*;
+import static org.apache.juneau.common.internal.IOUtils.*;
import static org.apache.juneau.jena.Constants.*;
import java.io.*;
@@ -22,8 +22,9 @@ import java.nio.charset.*;
import java.util.*;
import java.util.function.*;
-import org.apache.jena.rdf.model.*;
+import com.hp.hpl.jena.rdf.model.*;
import org.apache.juneau.*;
+import org.apache.juneau.common.internal.StringUtils;
import org.apache.juneau.httppart.*;
import org.apache.juneau.internal.*;
import org.apache.juneau.jena.annotation.*;
diff --git a/juneau-core/juneau-marshall/pom.xml
b/juneau-core/juneau-marshall/pom.xml
index d71441d81..2973e861d 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -38,8 +38,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
index 55e054491..7108defee 100644
--- a/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty-ftest/pom.xml
@@ -52,8 +52,8 @@
<!-- Other -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
diff --git a/juneau-examples/juneau-examples-rest-jetty/pom.xml
b/juneau-examples/juneau-examples-rest-jetty/pom.xml
index 07cc36703..2aabca0fc 100644
--- a/juneau-examples/juneau-examples-rest-jetty/pom.xml
+++ b/juneau-examples/juneau-examples-rest-jetty/pom.xml
@@ -50,8 +50,8 @@
<!-- Other -->
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-examples/juneau-examples-rest-springboot/pom.xml
b/juneau-examples/juneau-examples-rest-springboot/pom.xml
index 800d195e0..9740879b8 100644
--- a/juneau-examples/juneau-examples-rest-springboot/pom.xml
+++ b/juneau-examples/juneau-examples-rest-springboot/pom.xml
@@ -46,8 +46,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
index 0c314e4f3..ccc9890a7 100644
---
a/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
+++
b/juneau-microservice/juneau-microservice-jetty/src/main/java/org/apache/juneau/microservice/jetty/JettyMicroservice.java
@@ -789,10 +789,10 @@ public class JettyMicroservice extends Microservice {
* @throws RuntimeException if context handler is not defined.
*/
public ServletContextHandler getServletContextHandler() {
- final var obj =
getServer().getAttribute(KEY_SERVLET_CONTEXT_HANDLER);
- if (obj instanceof ServletContextHandler servletContextHandler) {
- return servletContextHandler;
- }
+ Object obj =
getServer().getAttribute(KEY_SERVLET_CONTEXT_HANDLER);
+ if (obj instanceof ServletContextHandler) {
+ return (ServletContextHandler)obj;
+ }
throw new IllegalStateException("Servlet context handler not
found in jetty server or at attribute '" + KEY_SERVLET_CONTEXT_HANDLER + "'");
}
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index ac0ede985..d280fd5e6 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -44,12 +44,12 @@
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index 7f99a9f80..a1ccf2577 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -49,16 +49,16 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
+ <artifactId>jakarta.activation</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/juneau-utest-utils/pom.xml b/juneau-utest-utils/pom.xml
index 16c420889..5a11249b1 100644
--- a/juneau-utest-utils/pom.xml
+++ b/juneau-utest-utils/pom.xml
@@ -40,8 +40,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>
diff --git a/juneau-utest/pom.xml b/juneau-utest/pom.xml
index ac522c380..e2ae9def9 100644
--- a/juneau-utest/pom.xml
+++ b/juneau-utest/pom.xml
@@ -55,8 +55,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
diff --git a/pom.xml b/pom.xml
index efbbbac92..a5ee1ecd1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<packaging>pom</packaging>
<name>juneau</name>
<description>Apache Juneau</description>
-
+
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -32,10 +32,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
+ <maven.compiler.source>11</maven.compiler.source>
+ <maven.compiler.target>11</maven.compiler.target>
- <jaxb.version>2.3.1</jaxb.version>
+ <jaxb.version>2.3.2</jaxb.version>
<junit.version>4.13.2</junit.version>
<jaxrs.version>1.1.1</jaxrs.version>
<servlet.version>6.1.0</servlet.version>
@@ -55,18 +55,19 @@
<javadoc.executable />
<javadoc.plugin.version>3.10.1</javadoc.plugin.version>
<jacoco.plugin.version>0.8.12</jacoco.plugin.version>
+ <jena.version>2.7.4</jena.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.junit</groupId>
- <artifactId>junit-bom</artifactId>
- <version>5.11.3</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
+ <groupId>org.junit</groupId>
+ <artifactId>junit-bom</artifactId>
+ <version>5.11.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>${jaxrs.version}</version>
@@ -89,21 +90,21 @@
</dependency>
<dependency>
<!-- Java 11 -->
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>${jaxb.version}</version>
</dependency>
<dependency>
<!-- Java 11 -->
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<!-- Java 11 -->
<groupId>com.sun.activation</groupId>
- <artifactId>javax.activation</artifactId>
- <version>1.2.0</version>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -121,7 +122,7 @@
</modules>
<distributionManagement>
- <!-- Uncomment to generate Maven site in /tmp/site -->
+ <!-- Uncomment to generate Maven site in /tmp/site -->
<!--site>
<id>${project.artifactId}-site</id>
<url>file:///tmp/site</url>
@@ -149,9 +150,9 @@
</execution>
</executions>
</plugin>
-
- <!--
- Runs Apache Rat against all source code to make
sure all files have licenses.
+
+ <!--
+ Runs Apache Rat against all source code to make
sure all files have licenses.
-->
<plugin>
<groupId>org.apache.rat</groupId>
@@ -165,8 +166,8 @@
<exclude>**/target/**</exclude>
<exclude>**/empty.txt</exclude>
<exclude>**/TODO.txt</exclude>
-
-
+
+
<!-- Eclipse metadata files -->
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
@@ -176,23 +177,23 @@
<!-- Overlay files -->
<exclude>**/*.2</exclude>
-
+
<!-- Generated by embedded
jetty server -->
<exclude>**/jetty.out.xml</exclude>
<exclude>**/*.log</exclude>
<exclude>**/*.log.*</exclude>
-
+
<!-- Generated in
juneau-microservice-template for some reason -->
<exclude>**/dependency-reduced-pom.xml</exclude>
<!-- Generated by
juneau-docs.jar -->
<exclude>**/docs.txt</exclude>
<exclude>**/toc.txt</exclude>
-
+
<!-- Files needed by Heroku
as-is -->
- <exclude>**/app.json</exclude>
- <exclude>**/Procfile</exclude>
-
+ <exclude>**/app.json</exclude>
+ <exclude>**/Procfile</exclude>
+
<exclude>**/.asf.yaml</exclude>
</excludes>
<consoleOutput>true</consoleOutput>
@@ -211,7 +212,7 @@
<pluginManagement>
<plugins>
-
+
<!-- Generates the javadocs for all non-test
projects. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -304,6 +305,19 @@
</ignore>
</action>
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-enforcer-plugin</artifactId>
+
<versionRange>[1.0.0,)</versionRange>
+
<goals>
+
<goal>enforce</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore />
+
</action>
+
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
@@ -374,8 +388,8 @@
</reporting>
<url>https://juneau.apache.org/</url>
- <!--
- Inherited from parent pom
+ <!--
+ Inherited from parent pom
<organization>
<name>The Apache Software Foundation</name>
<url>https://www.apache.org/</url>
@@ -469,7 +483,7 @@
<email>ggregory at apache.org</email>
<url>https://www.garygregory.com</url>
<organization>The Apache Software Foundation</organization>
- <organizationUrl>https://www.apache.org/</organizationUrl>
+ <organizationUrl>https://www.apache.org/</organizationUrl>
<roles>
<role>PMC Member</role>
</roles>
