Integrate metro 3.0.0-M2
Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
diff --git a/appserver/appclient/client/acc-config/pom.xml b/appserver/appclient/client/acc-config/pom.xml
index 83e59e7..1d2c94b 100755
--- a/appserver/appclient/client/acc-config/pom.xml
+++ b/appserver/appclient/client/acc-config/pom.xml
@@ -154,30 +154,16 @@
</goals>
<configuration>
<target>
+ <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask" classpathref="maven.plugin.classpath"/>
<property name="dest" location="${project.build.directory}/generated-sources/xjc"/>
<mkdir dir="${dest}"/>
- <!-- see https://github.com/eclipse-ee4j/jaxb-ri/issues/1436 -->
- <java classpathref="maven.plugin.classpath" fork="true"
- classname="com.sun.tools.xjc.XJCFacade">
- <jvmarg value="-DenableExternalEntityProcessing=true"/>
- <arg value="-dtd"/>
- <arg line="-d ${dest}"/>
- <arg line="-p org.glassfish.appclient.client.acc.config"/>
- <arg value="${project.basedir}/${extracted-dtd-directory}/${dtd-for-jaxb-compilation}"/>
- <arg line="-b ${project.basedir}/src/main/resources/configBindings.xml"/>
- </java>
-
- <!--
- <taskdef name="xjc" classname="com.sun.tools.xjc.XJC2Task" classpathref="maven.plugin.classpath"/>
<xjc destdir="${dest}" fork="true"
schema="${project.basedir}/${extracted-dtd-directory}/${dtd-for-jaxb-compilation}"
package="org.glassfish.appclient.client.acc.config">
<binding dir="${project.basedir}/src/main/resources" includes="configBindings.xml"/>
<arg value="-dtd"/>
- <arg line="-classpath ${cp}"/>
<jvmarg value="-DenableExternalEntityProcessing=true"/>
- <classpath path="${cp}"/>
- </xjc>-->
+ </xjc>
</target>
</configuration>
</execution>
diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml
index 5ea7111..9e45f2b 100644
--- a/appserver/featuresets/glassfish/pom.xml
+++ b/appserver/featuresets/glassfish/pom.xml
@@ -457,10 +457,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- </dependency>
- <dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<exclusions>
diff --git a/nucleus/admin/server-mgmt/pom.xml b/nucleus/admin/server-mgmt/pom.xml
index 365d287..bf87c7b 100644
--- a/nucleus/admin/server-mgmt/pom.xml
+++ b/nucleus/admin/server-mgmt/pom.xml
@@ -104,7 +104,7 @@
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
- <version>3.0.0-M2</version>
+ <version>${jakarta.jaxb-impl.version}</version>
</dependency>
</dependencies>
<executions>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index a19caf2..76304a1 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -79,7 +79,7 @@
<findbugs.version>3.0.3</findbugs.version>
<findbugs.glassfish.logging.validLoggerPrefixes>javax.enterprise</findbugs.glassfish.logging.validLoggerPrefixes>
- <webservices.version>3.0.0-M1</webservices.version>
+ <webservices.version>3.0.0-M2</webservices.version>
<glassfish-corba.version>4.2.0</glassfish-corba.version>
<stax-api.version>1.0-2</stax-api.version>
<slf4j.version>1.7.21</slf4j.version>
@@ -100,7 +100,7 @@
<fasterxml.classmate.version>1.5.1</fasterxml.classmate.version>
<jsch.version>0.1.56</jsch.version>
<pfl.version>4.1.0</pfl.version>
- <gmbal.version>4.0.0</gmbal.version>
+ <gmbal.version>4.0.2</gmbal.version>
<antlr.version>2.7.8</antlr.version>
<ant.version>1.10.2</ant.version>
<jersey.version>3.0.0-M2</jersey.version>
@@ -114,7 +114,7 @@
<jax-rs-api.spec.version>2.1</jax-rs-api.spec.version>
<jax-rs-api.impl.version>3.0.0-M1</jax-rs-api.impl.version>
<mimepull.version>1.9.13</mimepull.version>
- <glassfish-management-api.version>3.2.2</glassfish-management-api.version>
+ <glassfish-management-api.version>3.2.3</glassfish-management-api.version>
<asm.version>7.3.1</asm.version>
<shoal.version>1.6.53</shoal.version>
<ha-api.version>3.1.12</ha-api.version>
