Merge pull request #23887 from hs536/jacksonJaxb
Change the dependency on jackson-module-jaxb-annotations to jackson-module-jakarta-xmlbind-annotations
diff --git a/appserver/admingui/jackson-jaxb/pom.xml b/appserver/admingui/jackson-jaxb/pom.xml
deleted file mode 100644
index b529bb9..0000000
--- a/appserver/admingui/jackson-jaxb/pom.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.glassfish.main</groupId>
- <artifactId>glassfish-parent</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.glassfish.main.admingui</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <packaging>jar</packaging>
-
- <name>Admin Console Jackson JAXB Repackaging</name>
- <description>jackson-module-jaxb-annotations repackaged as OSGi bundle for GlassFish</description>
-
- <properties>
- <jackson-jaxb-src-folder>${project.build.directory}/jackson-jaxb-src</jackson-jaxb-src-folder>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack_jackson-jaxb_sources</id>
- <phase>process-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${jackson.version}</version>
- <classifier>sources</classifier>
- <overWrite>true</overWrite>
- <outputDirectory>${jackson-jaxb-src-folder}</outputDirectory>
- <includes>**/jaxb/**/*.java,**/jaxb/**/*.xml</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>${jackson-jaxb-src-folder}/**/*.java</include>
- </includes>
- <replacements>
- <replacement>
- <token>javax.xml.bind</token>
- <value>jakarta.xml.bind</value>
- </replacement>
- <replacement>
- <token>javax.activation</token>
- <value>jakarta.activation</value>
- </replacement>
- </replacements>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-jackson-jaxb-src</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${jackson-jaxb-src-folder}</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- Creates the OSGi MANIFEST.MF file -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- </supportedProjectTypes>
- <instructions>
- <Import-Package>com.fasterxml.jackson.annotation,com.fasterxml.jackson.core.*,com.fasterxml.jackson.databind.*,jakarta.activation,jakarta.xml.bind,jakarta.xml.bind.annotation,jakarta.xml.bind.annotation.adapters,javax.xml.parsers,org.w3c.dom</Import-Package>
- <Export-Package>com.fasterxml.jackson.module.jaxb.*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
-
- <!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/appserver/admingui/pom.xml b/appserver/admingui/pom.xml
index 93990d3..cc9d480 100644
--- a/appserver/admingui/pom.xml
+++ b/appserver/admingui/pom.xml
@@ -89,7 +89,6 @@
<module>community-theme</module>
<module>web</module>
<module>gf-admingui-connector</module>
- <module>jackson-jaxb</module>
<module>jts</module>
<module>jdbc</module>
<module>jca</module>
diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index 11bf5cb..760920b 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -1307,9 +1307,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.main.admingui</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${project.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
index ddb5cda..d25d1d7 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -1268,9 +1268,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.main.admingui</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${project.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml
index db247cb..50b61fa 100644
--- a/appserver/extras/embedded/web/pom.xml
+++ b/appserver/extras/embedded/web/pom.xml
@@ -1278,9 +1278,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>org.glassfish.main.admingui</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${project.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml
index 08802e3..8ba70f0 100644
--- a/nucleus/featuresets/atomic/pom.xml
+++ b/nucleus/featuresets/atomic/pom.xml
@@ -1002,9 +1002,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.glassfish.main.admingui</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>${project.version}</version>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index a339b6a..89bb69a 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -609,7 +609,7 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jaxb-annotations</artifactId>
+ <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
<version>${jackson.version}</version>
<exclusions>
<exclusion>
