From 194b84304bf319b1f22e1e1a98ea73d6fece5e41 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Wed, 1 Nov 2023 08:26:11 +0100
Subject: [PATCH] Moxy version update

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 core-client/pom.xml                                     | 1 -
 examples/helloworld-programmatic/pom.xml                | 1 -
 examples/helloworld-pure-jax-rs/pom.xml                 | 1 -
 examples/helloworld/pom.xml                             | 1 -
 examples/osgi-helloworld-webapp/functional-test/pom.xml | 1 -
 pom.xml                                                 | 4 ++--
 6 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/core-client/pom.xml b/core-client/pom.xml
index a7af0b65ba..10cb8b72bb 100644
--- a/core-client/pom.xml
+++ b/core-client/pom.xml
@@ -122,7 +122,6 @@
             <!-- not to warn about missing activation -->
             <groupId>com.sun.activation</groupId>
             <artifactId>jakarta.activation</artifactId>
-            <version>${jakarta.activation.version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/examples/helloworld-programmatic/pom.xml b/examples/helloworld-programmatic/pom.xml
index f39742d91c..0744312ee0 100644
--- a/examples/helloworld-programmatic/pom.xml
+++ b/examples/helloworld-programmatic/pom.xml
@@ -95,7 +95,6 @@
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>${jakarta.activation.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
diff --git a/examples/helloworld-pure-jax-rs/pom.xml b/examples/helloworld-pure-jax-rs/pom.xml
index 219d7ab731..b1cd5269a6 100644
--- a/examples/helloworld-pure-jax-rs/pom.xml
+++ b/examples/helloworld-pure-jax-rs/pom.xml
@@ -98,7 +98,6 @@
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>${jakarta.activation.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
diff --git a/examples/helloworld/pom.xml b/examples/helloworld/pom.xml
index b1bf7e0748..83d5119401 100644
--- a/examples/helloworld/pom.xml
+++ b/examples/helloworld/pom.xml
@@ -110,7 +110,6 @@
                 <dependency>
                     <groupId>jakarta.activation</groupId>
                     <artifactId>jakarta.activation-api</artifactId>
-                    <version>${jakarta.activation.version}</version>
                 </dependency>
                 <dependency>
                     <groupId>jakarta.xml.bind</groupId>
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
index 8305387f67..114089d5f5 100644
--- a/examples/osgi-helloworld-webapp/functional-test/pom.xml
+++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -147,7 +147,6 @@
         <dependency>
             <groupId>com.sun.activation</groupId>
             <artifactId>jakarta.activation</artifactId>
-            <version>${jakarta.activation.version}</version>
         </dependency>
          <!-- uncomment the following dependency to get ability
               to run felix console in the test -->
diff --git a/pom.xml b/pom.xml
index 43c1cb8e00..3ab6f47b88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2351,7 +2351,7 @@
         <grizzly2.version>3.0.1</grizzly2.version>
         <grizzly.client.version>1.16</grizzly.client.version>
         <grizzly.npn.version>2.0.0</grizzly.npn.version>
-        <hk2.version>3.0.3</hk2.version> <!-- 3.0.4 fails osgi tests -->
+        <hk2.version>3.0.3</hk2.version> <!-- 3.0.4 fails osgi tests, 3.0.5 is for JDK 11+ -->
         <jsp.version>3.0.0</jsp.version>
         <jstl.version>2.0.0</jstl.version>
         <jta.api.version>2.0.1</jta.api.version>
@@ -2380,7 +2380,7 @@
         <jsonb.api.version>2.0.0</jsonb.api.version>
         <jsonp.ri.version>1.0.5</jsonp.ri.version>
         <jsonp.jaxrs.version>1.0.5</jsonp.jaxrs.version>
-        <moxy.version>3.0.3</moxy.version>
+        <moxy.version>3.0.4</moxy.version>
         <yasson.version>2.0.4</yasson.version>
         <!-- END of Jakartified -->