This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch juneau-8.1.4-branch
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/juneau-8.1.4-branch by this
push:
new 9a524711a Move to jakara.activation
9a524711a is described below
commit 9a524711ad8418c97b66e2db101b25742b9bdbc1
Author: James Bognar <[email protected]>
AuthorDate: Wed Oct 16 11:03:07 2024 -0400
Move to jakara.activation
---
.../juneau-microservice-ftest/pom.xml | 8 ++---
juneau-rest/juneau-rest-client-utest/pom.xml | 4 +--
juneau-rest/juneau-rest-client/pom.xml | 4 +--
juneau-rest/juneau-rest-mock/pom.xml | 4 +--
juneau-rest/juneau-rest-server-utest/pom.xml | 4 +--
juneau-rest/juneau-rest-server/pom.xml | 4 +--
pom.xml | 38 +++++++++++-----------
7 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/juneau-microservice/juneau-microservice-ftest/pom.xml
b/juneau-microservice/juneau-microservice-ftest/pom.xml
index 160d44112..340ed5bd2 100644
--- a/juneau-microservice/juneau-microservice-ftest/pom.xml
+++ b/juneau-microservice/juneau-microservice-ftest/pom.xml
@@ -29,7 +29,7 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
-
+
<!-- Java 8 required because Jetty requires it. -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -75,8 +75,8 @@
<artifactId>javax.servlet-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>
@@ -95,7 +95,7 @@
<type>test-jar</type>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
diff --git a/juneau-rest/juneau-rest-client-utest/pom.xml
b/juneau-rest/juneau-rest-client-utest/pom.xml
index 44265627f..9ece4bb4c 100644
--- a/juneau-rest/juneau-rest-client-utest/pom.xml
+++ b/juneau-rest/juneau-rest-client-utest/pom.xml
@@ -38,8 +38,8 @@
<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>
diff --git a/juneau-rest/juneau-rest-client/pom.xml
b/juneau-rest/juneau-rest-client/pom.xml
index 46e75b96c..be0758e75 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -39,8 +39,8 @@
<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>
diff --git a/juneau-rest/juneau-rest-mock/pom.xml
b/juneau-rest/juneau-rest-mock/pom.xml
index b20334e17..bf9b98472 100644
--- a/juneau-rest/juneau-rest-mock/pom.xml
+++ b/juneau-rest/juneau-rest-mock/pom.xml
@@ -44,8 +44,8 @@
<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>
diff --git a/juneau-rest/juneau-rest-server-utest/pom.xml
b/juneau-rest/juneau-rest-server-utest/pom.xml
index fc62c0030..c17d7847e 100644
--- a/juneau-rest/juneau-rest-server-utest/pom.xml
+++ b/juneau-rest/juneau-rest-server-utest/pom.xml
@@ -43,8 +43,8 @@
<artifactId>jaxb-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>
diff --git a/juneau-rest/juneau-rest-server/pom.xml
b/juneau-rest/juneau-rest-server/pom.xml
index dc03d7ce4..cb3df3dad 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -53,8 +53,8 @@
<artifactId>jaxb-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>
diff --git a/pom.xml b/pom.xml
index dea6eecf7..852eb639d 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>
@@ -95,9 +95,9 @@
</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 -->
@@ -119,7 +119,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>
@@ -147,9 +147,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>
@@ -162,8 +162,8 @@
<exclude>**/DEPENDENCIES</exclude>
<exclude>**/target/**</exclude>
<exclude>**/empty.txt</exclude>
-
-
+
+
<!-- Eclipse metadata files -->
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
@@ -173,21 +173,21 @@
<!-- Overlay files -->
<exclude>**/*.2</exclude>
-
+
<!-- Generated by embedded
jetty server -->
<exclude>**/jetty.out.xml</exclude>
<exclude>**/derby.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>
</excludes>
<consoleOutput>true</consoleOutput>
<!-- Note: useEclipseDefaultExcludes
does not work for subprojects. See RAT-107 -->
@@ -205,7 +205,7 @@
<pluginManagement>
<plugins>
-
+
<!-- Generates the javadocs for all non-test
projects. -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -252,7 +252,7 @@
<tagletClass>org.apache.juneau.doc.internal.SourceTag</tagletClass>
<tagletpath>${basedir}/juneau-doc/target/juneau-doc-${project.version}.jar</tagletpath>
</taglet>
-
+
<!--org.apache.juneau.doc.internal.DocTag</taglet-->
<!--
taglet>org.apache.juneau.doc.internal.PropertyTag</taglet-->
</taglets>
@@ -358,8 +358,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>