From 0d2ee6af8590e4c8e68549df8c5412a13de0c198 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Mon, 29 Jan 2024 10:37:15 +0100
Subject: [PATCH 1/4] Jakartified versions update

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 pom.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index ea1fd70657..d80676cac0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010, 2023 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010, 2024 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
@@ -2343,39 +2343,39 @@
         <cdi.api.version>4.0.1</cdi.api.version>
         <cdi.osgi.version>jakarta.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
         <ejb.version>4.0.1</ejb.version>
-        <grizzly2.version>4.0.1</grizzly2.version>
+        <grizzly2.version>4.0.2</grizzly2.version>
         <grizzly.client.version>1.16</grizzly.client.version>
         <grizzly.npn.version>2.0.0</grizzly.npn.version>
         <hk2.version>3.0.5</hk2.version>
         <hk2.osgi.version>org.glassfish.hk2.*;version="[3.0,4)"</hk2.osgi.version>
         <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[3.0,4)"</hk2.jvnet.osgi.version>
-        <hk2.config.version>7.0.3</hk2.config.version>
+        <hk2.config.version>7.0.4</hk2.config.version>
         <jsp.version>3.1.1</jsp.version>
         <jstl.version>3.0.0</jstl.version>
         <jta.api.version>2.0.1</jta.api.version>
-        <istack.commons.runtime.version>4.1.1</istack.commons.runtime.version>
-        <jakarta.activation-api.version>2.1.1</jakarta.activation-api.version>
-        <jakarta.activation.version>2.0.0</jakarta.activation.version>
+        <istack.commons.runtime.version>4.1.2</istack.commons.runtime.version>
+        <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
+        <jakarta.activation.version>2.0.2</jakarta.activation.version>
         <jakarta.el.version>5.0.1</jakarta.el.version>
         <jakarta.el.impl.version>5.0.0-M1</jakarta.el.impl.version>
         <jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version>
         <jakarta.annotation.version>2.1.1</jakarta.annotation.version>
         <jakarta.inject.version>2.0.1</jakarta.inject.version>
         <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
-        <jakarta.jsonp.version>2.1.2</jakarta.jsonp.version>
+        <jakarta.jsonp.version>2.1.3</jakarta.jsonp.version>
         <jakarta.persistence.version>3.1.0</jakarta.persistence.version>
         <jakarta.validation.api.version>3.0.2</jakarta.validation.api.version>
-        <jakarta.jaxb.api.version>4.0.0</jakarta.jaxb.api.version>
-        <jaxb.ri.version>4.0.2</jaxb.ri.version>
+        <jakarta.jaxb.api.version>4.0.1</jakarta.jaxb.api.version>
+        <jaxb.ri.version>4.0.4</jaxb.ri.version>
         <jaxrs.api.spec.version>3.1</jaxrs.api.spec.version>
         <jaxrs.api.impl.version>3.1.0</jaxrs.api.impl.version>
         <jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
-        <jetty.version>12.0.3</jetty.version>
+        <jetty.version>12.0.5</jetty.version>
         <jetty9.version>9.4.53.v20231009</jetty9.version>
-        <jetty11.version>11.0.18</jetty11.version>
-        <jetty.plugin.version>12.0.3</jetty.plugin.version>
+        <jetty11.version>11.0.19</jetty11.version>
+        <jetty.plugin.version>12.0.5</jetty.plugin.version>
         <jsonb.api.version>3.0.0</jsonb.api.version>
-        <jsonp.ri.version>1.1.1</jsonp.ri.version>
+        <jsonp.ri.version>1.1.5</jsonp.ri.version>
         <jsonp.jaxrs.version>1.1.1</jsonp.jaxrs.version>
         <moxy.version>4.0.2</moxy.version>
         <yasson.version>3.0.3</yasson.version>

From 4f08a9993bd266b94e3065e7a6153e809f8a41fe Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Tue, 30 Jan 2024 09:53:22 +0100
Subject: [PATCH 2/4] versions update

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 pom.xml                                            | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
index 3b60fd31fb..5e31264190 100644
--- a/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-heroku-webapp/src/main/resources/archetype-resources/pom.xml
@@ -117,7 +117,7 @@
 
     <properties>
         <jersey.version>${project.version}</jersey.version>
-        <jetty.version>12.0.3</jetty.version>
+        <jetty.version>12.0.5</jetty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <surefire.mvn.plugin.version>3.2.1</surefire.mvn.plugin.version>
         <war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
diff --git a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
index 9bd0bda279..2cfef61694 100644
--- a/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/jersey-quickstart-grizzly2/src/main/resources/archetype-resources/pom.xml
@@ -83,7 +83,7 @@
 
     <properties>
         <jersey.version>${project.version}</jersey.version>
-        <junit-jupiter.version>5.10.0</junit-jupiter.version>
+        <junit-jupiter.version>5.10.1</junit-jupiter.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <surefire.mvn.plugin.version>3.2.1</surefire.mvn.plugin.version>
     </properties>
diff --git a/pom.xml b/pom.xml
index d80676cac0..e1dbc57075 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2284,13 +2284,13 @@
         <!-- microprofile -->
         <microprofile.config.version>3.0.3</microprofile.config.version>
         <microprofile.rest.client.version>3.0.1</microprofile.rest.client.version>
-        <helidon.config.version>3.0.2</helidon.config.version>
-        <helidon.config.11.version>1.4.13</helidon.config.11.version> <!-- JDK 11- support -->
-        <smallrye.config.version>3.0.0</smallrye.config.version>
+        <helidon.config.version>3.2.5</helidon.config.version>
+        <helidon.config.11.version>1.4.14</helidon.config.11.version> <!-- JDK 11- support -->
+        <smallrye.config.version>3.1.3</smallrye.config.version>
 
         <guava.version>31.1-jre</guava.version>
         <hamcrest.version>2.2</hamcrest.version>
-        <helidon.jersey.connector.version>3.0.2</helidon.jersey.connector.version>
+        <helidon.jersey.connector.version>3.2.5</helidon.jersey.connector.version>
         <xmlunit.version>2.9.0</xmlunit.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpclient5.version>5.2.1</httpclient5.version>
@@ -2301,12 +2301,12 @@
         <jmh.version>1.37</jmh.version>
         <jmockit.version>1.49</jmockit.version>
         <junit4.version>4.13.2</junit4.version>
-        <junit5.version>5.10.0</junit5.version>
+        <junit5.version>5.10.1</junit5.version>
         <junit-platform-suite.version>1.10.0</junit-platform-suite.version>
         <kryo.version>4.0.2</kryo.version>
         <mockito.version>3.12.4</mockito.version> <!-- CQ 17673 -->
         <mustache.version>0.9.10</mustache.version>
-        <netty.version>4.1.100.Final</netty.version>
+        <netty.version>4.1.106.Final</netty.version>
         <opentracing.version>0.33.0</opentracing.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.framework.version>1.10.0</osgi.framework.version>
@@ -2355,7 +2355,7 @@
         <jta.api.version>2.0.1</jta.api.version>
         <istack.commons.runtime.version>4.1.2</istack.commons.runtime.version>
         <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version>
-        <jakarta.activation.version>2.0.2</jakarta.activation.version>
+        <jakarta.activation.version>2.0.1</jakarta.activation.version>
         <jakarta.el.version>5.0.1</jakarta.el.version>
         <jakarta.el.impl.version>5.0.0-M1</jakarta.el.impl.version>
         <jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version>

From aa8c05d9c30cbd314e334f6057f2876d1748c563 Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Wed, 31 Jan 2024 12:56:57 +0100
Subject: [PATCH 3/4] Netty version degrade

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e1dbc57075..0e8894ca41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2306,7 +2306,7 @@
         <kryo.version>4.0.2</kryo.version>
         <mockito.version>3.12.4</mockito.version> <!-- CQ 17673 -->
         <mustache.version>0.9.10</mustache.version>
-        <netty.version>4.1.106.Final</netty.version>
+        <netty.version>4.1.105.Final</netty.version>
         <opentracing.version>0.33.0</opentracing.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.framework.version>1.10.0</osgi.framework.version>

From 6002d1f96f2cbacbcf52f40fd2c0cd9db2986cdc Mon Sep 17 00:00:00 2001
From: Maxim Nesen <maxim.nesen@oracle.com>
Date: Wed, 31 Jan 2024 13:34:54 +0100
Subject: [PATCH 4/4] Netty version degrade

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e8894ca41..64ada98bf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2306,7 +2306,7 @@
         <kryo.version>4.0.2</kryo.version>
         <mockito.version>3.12.4</mockito.version> <!-- CQ 17673 -->
         <mustache.version>0.9.10</mustache.version>
-        <netty.version>4.1.105.Final</netty.version>
+        <netty.version>4.1.104.Final</netty.version>
         <opentracing.version>0.33.0</opentracing.version>
         <osgi.version>6.0.0</osgi.version>
         <osgi.framework.version>1.10.0</osgi.framework.version>