From b2b99afa70eb1c1d9a66c87e62a0c82ad848f569 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Wed, 3 Oct 2018 09:48:01 +0200
Subject: [PATCH] Integrate Metro 2.4.2 (#22586)

* integrate metro 2.4.2

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 appserver/extras/embedded/all/pom.xml                |  4 ++--
 .../shell/glassfish-embedded-static-shell/pom.xml    |  4 ++--
 appserver/featuresets/glassfish/pom.xml              |  4 ++--
 appserver/pom.xml                                    | 12 ++++++------
 nucleus/parent/pom.xml                               |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml
index cccdfeec862..884958861c1 100644
--- a/appserver/extras/embedded/all/pom.xml
+++ b/appserver/extras/embedded/all/pom.xml
@@ -1693,8 +1693,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
             <optional>true</optional>
         </dependency>
         <dependency>
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 13adbe099fe..d3a25cdcccb 100755
--- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
+++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml
@@ -1479,8 +1479,8 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-          <groupId>org.codehaus.woodstox</groupId>
-          <artifactId>woodstox-core-asl</artifactId>
+          <groupId>com.fasterxml.woodstox</groupId>
+          <artifactId>woodstox-core</artifactId>
             <optional>true</optional>
         </dependency>
    </dependencies>
diff --git a/appserver/featuresets/glassfish/pom.xml b/appserver/featuresets/glassfish/pom.xml
index 90151e7b503..087d4c6a781 100644
--- a/appserver/featuresets/glassfish/pom.xml
+++ b/appserver/featuresets/glassfish/pom.xml
@@ -502,8 +502,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
+            <groupId>com.fasterxml.woodstox</groupId>
+            <artifactId>woodstox-core</artifactId>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
diff --git a/appserver/pom.xml b/appserver/pom.xml
index 6da1be6cb8a..b176787b0fa 100644
--- a/appserver/pom.xml
+++ b/appserver/pom.xml
@@ -101,10 +101,10 @@
         <javaee.version>${javaee.major_version}.${minor_version}${javaee.version_qualifier}</javaee.version>
 
         <jsftemplating.version>2.1.3</jsftemplating.version>
-        <webservices.version>2.4.1</webservices.version>
-        <woodstox.version>4.4.1</woodstox.version>
-        <jaxb.version>2.3.0.1</jaxb.version>
-        <stax2-api.version>3.1.4</stax2-api.version>
+        <webservices.version>2.4.2</webservices.version>
+        <woodstox.version>5.1.0</woodstox.version>
+        <jaxb.version>2.3.1</jaxb.version>
+        <stax2-api.version>4.1</stax2-api.version>
         <javax.xml.registry-api.version>1.0.8</javax.xml.registry-api.version>
         <eclipselink.version>2.7.0</eclipselink.version>
         <javax-persistence-api.version>2.2.0</javax-persistence-api.version>
@@ -646,8 +646,8 @@
                 <version>${eclipselink.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>woodstox-core-asl</artifactId>
+                <groupId>com.fasterxml.woodstox</groupId>
+                <artifactId>woodstox-core</artifactId>
                 <version>${woodstox.version}</version>
             </dependency>
             <dependency>
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index 6781746c986..b5caa70fe56 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -149,10 +149,10 @@
         <jersey.version>2.26</jersey.version>
         <jackson.version>2.9.4</jackson.version>
         <jettison.version>1.3.7</jettison.version>
-        <jaxb-api.version>2.3.0</jaxb-api.version>
+        <jaxb-api.version>2.3.1</jaxb-api.version>
         <jax-rs-api.spec.version>2.1</jax-rs-api.spec.version>
         <jax-rs-api.impl.version>2.1</jax-rs-api.impl.version>
-        <mimepull.version>1.9.7</mimepull.version>
+        <mimepull.version>1.9.10</mimepull.version>
         <glassfish-management-api.version>3.2.1-b003</glassfish-management-api.version>
         <asm.version>6.0_ALPHA</asm.version>
         <shoal.version>1.6.52</shoal.version>