Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FISH-5989 Upgrade Jakarta Activation to 2.1.0 #5689

Merged
merged 2 commits into from
Apr 8, 2022
Merged

FISH-5989 Upgrade Jakarta Activation to 2.1.0 #5689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b579a9b
FISH-5989 Upgrade Jakarta Activation to 2.1.0
luiseufrasio Apr 4, 2022
8cb21c2
Merge branch 'Payara6' into FISH-5989
luiseufrasio Apr 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions api/payara-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,9 +734,9 @@
<version>${istack-commons-runtime.version}</version>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
<version>${jakarta.activation-impl.version}</version>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
<version>${angus.activation.version}</version>
</dependency>

<!-- Other libraries -->
Expand Down
6 changes: 4 additions & 2 deletions appserver/admin/gf_template/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->
<!-- // Portions Copyright [2016-2021] [Payara Foundation and/or its affiliates] -->
<!-- // Portions Copyright [2016-2022] [Payara Foundation and/or its affiliates] -->

<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.1" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">

Expand Down Expand Up @@ -330,7 +330,9 @@
hibernate-validator.jar
jakarta.ejb-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.mail.jar
jakarta.activation-api.jar
angus-activation.jar
jakarta.mail.jar
jakarta.persistence.jar
jakarta.resource-api.jar
jakarta.security.auth.message-api.jar
Expand Down
6 changes: 4 additions & 2 deletions appserver/admin/gf_template_web/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!--
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

Copyright (c) [2017-2021] Payara Foundation and/or its affiliates. All rights reserved.
Copyright (c) [2017-2022] Payara Foundation and/or its affiliates. All rights reserved.

The contents of this file are subject to the terms of either the GNU
General Public License Version 2 only ("GPL") or the Common Development
Expand Down Expand Up @@ -326,7 +326,9 @@
web-glue.jar
bean-validator.jar
jakarta.ejb-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.activation-api.jar
angus-activation.jar
jakarta.mail.jar
jakarta.persistence.jar
jakarta.resource-api.jar
Expand Down
27 changes: 25 additions & 2 deletions appserver/appclient/client/acc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 +368,37 @@
<artifactId>jakarta.annotation-api</artifactId>
</dependency>

<!-- jakarta.activation-api.jar -->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>

<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
</dependency>

<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<artifactId>jakarta.xml.bind-api</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<artifactId>jaxb-osgi</artifactId>
<exclusions>
<exclusion>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions appserver/extras/javaee/manifest-jar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->
<!-- Portions Copyright [2017-2021] [Payara Foundation and/or its affiliates] -->
<!-- Portions Copyright [2017-2022] [Payara Foundation and/or its affiliates] -->

<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
Expand All @@ -59,7 +59,7 @@
<configuration>
<archive>
<manifestEntries>
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/javax.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/parsson.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
<Class-Path>../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/webservices-osgi.jar ../modules/jaxb-osgi.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/javax.xml.registry-api.jar ../modules/jakarta.mail.jar ../modules/jakarta.activation-api.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/cdi-api.jar ../../mq/lib/jaxm-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/parsson.jar ../modules/javax.websocket-api.jar ../modules/javax.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar</Class-Path>
<GlassFish-ServerExcluded>true</GlassFish-ServerExcluded>
</manifestEntries>
</archive>
Expand Down
6 changes: 3 additions & 3 deletions appserver/packager/appserver-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,9 @@
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
<artifactId>jakarta.activation</artifactId>
</dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-activation</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.metro</groupId>
<artifactId>webservices-api-osgi</artifactId>
Expand Down
14 changes: 13 additions & 1 deletion appserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,19 @@
<configuration>
<dir>${stage.dir}/${install.dir.name}/glassfish/modules</dir>
<excludes>jakarta.inject-api.jar,jakarta.servlet.jsp.jstl.jar,jakarta.servlet.jsp.jar,jakarta.enterprise.concurrent.jar, jakarta.persistence.jar</excludes>
<specs>
<specs>
<!-- Activation-API -->
<spec>
<artifact>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${activation.version}</version>
</artifact>
<jarType>api</jarType>
<specVersion>2.1</specVersion>
<specImplVersion>${activation.version}</specImplVersion>
<apiPackage>jakarta.activation</apiPackage>
</spec>

<!-- JavaMail -->
<spec>
Expand Down
4 changes: 3 additions & 1 deletion appserver/tests/quicklook/gfproject/build-impl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,9 @@

<!-- the following targets are for running the wsit tests -->
<path id="wsit.classpath">
<pathelement location="${glassfish.home}/modules/jakarta.jws-api.jar"/>
<pathelement location="${glassfish.home}/modules/jakarta.jws-api.jar"/>
<pathelement location="${glassfish.home}/modules/jakarta.activation-api.jar"/>
<pathelement location="${glassfish.home}/modules/angus-activation.jar"/>
</path>

<condition property="wsjar.available">
Expand Down
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
# Portions Copyright [2019-2020] Payara Foundation and/or affiliates
# Portions Copyright [2019-2022] Payara Foundation and/or affiliates

AS_INSTALL=`dirname "$0"`/..

Expand All @@ -60,4 +60,4 @@ fi
. $(dirname "$0")/jdkcheck
checkEndorsedAvailable

exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.activation.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar:$AS_INSTALL_LIB/angus-activation.jar" com.sun.tools.jxc.SchemaGeneratorFacade "$@"
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/schemagen.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ REM and therefore, elected the GPL Version 2 license, then the option applies
REM only if the new code is made subject to such option by the copyright
REM holder.
REM
REM Portions Copyright [2019-2020] Payara Foundation and/or affiliates
REM Portions Copyright [2019-2022] Payara Foundation and/or affiliates

VERIFY OTHER 2>nul
setlocal ENABLEEXTENSIONS
Expand All @@ -59,4 +59,4 @@ set JAVA=java
:run
CALL %~dp0jdkcheck.bat

%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.jxc.SchemaGeneratorFacade %*
%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\angus-activation.jar" com.sun.tools.jxc.SchemaGeneratorFacade %*
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
# Portions Copyright [2019-2020] Payara Foundation and/or affiliates
# Portions Copyright [2019-2022] Payara Foundation and/or affiliates

AS_INSTALL=`dirname "$0"`/..

Expand All @@ -59,4 +59,4 @@ fi
. $(dirname "$0")/jdkcheck
checkEndorsedAvailable

exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.xml.ws-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.activation.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar" com.sun.tools.ws.WsGen "$@"
exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.xml.ws-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar:$AS_INSTALL_LIB/angus-activation.jar" com.sun.tools.ws.WsGen "$@"
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsgen.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ REM and therefore, elected the GPL Version 2 license, then the option applies
REM only if the new code is made subject to such option by the copyright
REM holder.
REM
REM Portions Copyright [2019-2020] Payara Foundation and/or affiliates
REM Portions Copyright [2019-2022] Payara Foundation and/or affiliates

VERIFY OTHER 2>nul
setlocal ENABLEEXTENSIONS
Expand All @@ -59,4 +59,4 @@ set JAVA=java
:run
CALL %~dp0jdkcheck.bat

%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.xml.ws-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.ws.WsGen %*
%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.xml.ws-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\angus-activation.jar" com.sun.tools.ws.WsGen %*
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
# Portions Copyright [2019-2020] Payara Foundation and/or affiliates
# Portions Copyright [2019-2022] Payara Foundation and/or affiliates

AS_INSTALL=`dirname "$0"`/..

Expand All @@ -59,4 +59,4 @@ fi
. $(dirname "$0")/jdkcheck
checkEndorsedAvailable

exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.xml.ws-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar:$AS_INSTALL_LIB/jakarta.activation.jar" com.sun.tools.ws.WsImport "$@"
exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.xml.ws-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar:$AS_INSTALL_LIB/angus-activation.jar" com.sun.tools.ws.WsImport "$@"
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/wsimport.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ REM and therefore, elected the GPL Version 2 license, then the option applies
REM only if the new code is made subject to such option by the copyright
REM holder.
REM
REM Portions Copyright [2019-2020] Payara Foundation and/or affiliates
REM Portions Copyright [2019-2022] Payara Foundation and/or affiliates

VERIFY OTHER 2>nul
setlocal ENABLEEXTENSIONS
Expand All @@ -60,4 +60,4 @@ set JAVA=java
:run
CALL %~dp0jdkcheck.bat

%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.xml.ws-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.ws.WsImport %*
%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.xml.ws-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\angus-activation.jar" com.sun.tools.ws.WsImport %*
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
# Portions Copyright [2019-2020] Payara Foundation and/or affiliates
# Portions Copyright [2019-2022] Payara Foundation and/or affiliates

AS_INSTALL=`dirname "$0"`/..

Expand All @@ -59,4 +59,4 @@ fi
. $(dirname "$0")/jdkcheck
checkEndorsedAvailable

exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar:$AS_INSTALL_LIB/jakarta.activation.jar:$AS_INSTALL_LIB/jakarta.xml.ws-api.jar" com.sun.tools.xjc.Driver "$@"
exec "$JAVA" $WSIMPORT_OPTS -cp "$AS_INSTALL_LIB/webservices-osgi.jar:$AS_INSTALL_LIB/jaxb-osgi.jar:$AS_INSTALL_LIB/jakarta.xml.bind-api.jar:$AS_INSTALL_LIB/jakarta.jws-api.jar:$AS_INSTALL_LIB/webservices-api-osgi.jar:$AS_INSTALL_LIB/jakarta.activation-api.jar:$AS_INSTALL_LIB/angus-activation.jar:$AS_INSTALL_LIB/jakarta.xml.ws-api.jar" com.sun.tools.xjc.Driver "$@"
4 changes: 2 additions & 2 deletions appserver/webservices/webservices-scripts/src/main/resources/glassfish/bin/xjc.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ REM and therefore, elected the GPL Version 2 license, then the option applies
REM only if the new code is made subject to such option by the copyright
REM holder.
REM
REM Portions Copyright [2019-2020] Payara Foundation and/or affiliates
REM Portions Copyright [2019-2022] Payara Foundation and/or affiliates

VERIFY OTHER 2>nul
setlocal ENABLEEXTENSIONS
Expand All @@ -59,4 +59,4 @@ set JAVA=java
:run
CALL %~dp0jdkcheck.bat

%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\jakarta.activation.jar" com.sun.tools.xjc.Driver %*
%JAVA% %WSIMPORT_OPTS% -cp "%~dp0..\modules\webservices-osgi.jar;%~dp0..\modules\jaxb-osgi.jar;%~dp0..\modules\jakarta.xml.bind-api.jar;%~dp0..\modules\jakarta.jws-api.jar;%~dp0..\modules\webservices-api-osgi.jar;%~dp0..\modules\jakarta.activation-api.jar;%~dp0..\modules\angus-activation.jar" com.sun.tools.xjc.Driver %*
14 changes: 14 additions & 0 deletions nucleus/admin/cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@
<dependency>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
<stax2-api.version>4.2.1</stax2-api.version>
<jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
<jakarta.enterprise.deploy-api.version>1.7.2</jakarta.enterprise.deploy-api.version>
<jakarta.activation-api.version>2.0.1</jakarta.activation-api.version>
<jakarta.activation-impl.version>2.0.1</jakarta.activation-impl.version>
<jakarta.activation-api.version>2.1.0-RC2</jakarta.activation-api.version>
<angus.activation.version>1.0.0-M1</angus.activation.version>
<istack-commons-runtime.version>4.0.1</istack-commons-runtime.version>
<jline.version>3.20.0</jline.version>
<wsdl4j.version>1.6.3</wsdl4j.version>
Expand Down