Bug 37932581 - [37932373->25.09] Bump Helidon from 4.2.0 to 4.2.2

rlubke · rlubke · commit 135db4cbd161 · 2025-05-13T12:38:52.000-05:00
Bug 37932588 - [37932530-&gt;25.09] Bump Jersey from 3.1.9 to 3.1.10 
Bug 37944892 - [37932538-&gt;25.09] Bump parsson-media from 1.1.6 to 1.1.7 
(merge main -&gt; ce/main @ 116202)

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 116208]
diff --git a/prj/coherence-dependencies/pom.xml b/prj/coherence-dependencies/pom.xml
@@ -190,7 +190,7 @@
     This is not always possible if we need to bump versions for CVE's
     -->
     <!-- When running tests with Java 21 we will use Helidon 4 -->
-    <helidon.version.4>4.2.0</helidon.version.4>
+    <helidon.version.4>4.2.2</helidon.version.4>
     <!-- When running tests with Java 17 we will use Helidon 3 (this will be set using the helidon3 profile) -->
     <helidon.version.3>3.2.12</helidon.version.3>
     <!-- This is the property that sets the version used by other modules (we default to Helidon 4) -->
@@ -230,7 +230,7 @@
     <jaxb-impl.version>4.0.3</jaxb-impl.version>
     <!-- NOTE: this version should ideally be in sync' with that used by Helidon
          This is not always possible if we need to bump versions for CVE's -->
-    <jersey.version>3.1.9</jersey.version>
+    <jersey.version>3.1.10</jersey.version>
     <jettison.version>1.5.4</jettison.version>
     <jhdf.version>0.7.0-alpha</jhdf.version>
     <jna.version>5.14.0</jna.version>
@@ -248,7 +248,7 @@
     <opentracing.tracerresolver.version>0.1.8</opentracing.tracerresolver.version>
     <oracle.db.version>11.2.0.3.0</oracle.db.version>
     <!-- make sure this version of parsson-media is in sync with Helidon -->
-    <parsson-media.version>1.1.6</parsson-media.version>
+    <parsson-media.version>1.1.7</parsson-media.version>
     <protobuf.version>3.25.5</protobuf.version>
     <resin.version>3.0</resin.version>
     <rxjava.version>3.0.2</rxjava.version>
diff --git a/prj/coherence-rest/src/main/java/com/tangosol/coherence/rest/providers/JsonCollectionWriter.java b/prj/coherence-rest/src/main/java/com/tangosol/coherence/rest/providers/JsonCollectionWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -33,6 +33,7 @@
 
 import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;
 
+
 /**
  * Provider responsible for converting Java collections to a JSON formatted
  * stream.
@@ -42,7 +43,7 @@
 @Provider
 @Produces(APPLICATION_JSON)
 public class JsonCollectionWriter
-        implements MessageBodyWriter<Object>
+        implements MessageBodyWriter<Collection<?>>
     {
     // ----- constructors ---------------------------------------------------
 
@@ -56,7 +57,7 @@ public JsonCollectionWriter()
     /**
      * Construct a JsonCollectionWriter instance.
      *
-     * @param registry  marshaller registry to use
+     * @param registry marshaller registry to use
      */
     public JsonCollectionWriter(MarshallerRegistry registry)
         {
@@ -67,21 +68,21 @@ public JsonCollectionWriter(MarshallerRegistry registry)
 
     @Override
     public boolean isWriteable(Class<?> clz, Type type, Annotation[] aAnnotation,
-            MediaType mediaType)
+                               MediaType mediaType)
         {
         return Collection.class.isAssignableFrom(clz);
         }
 
     @Override
-    public long getSize(Object col, Class<?> clz, Type type, Annotation[] aAnnotation,
-            MediaType mediaType)
+    public long getSize(Collection<?> col, Class<?> clz, Type type, Annotation[] aAnnotation,
+                        MediaType mediaType)
         {
         return -1;
         }
 
     @Override
-    public void writeTo(Object oCol, Class<?> clz, Type type, Annotation[] aAnnotation,
-            MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream stream)
+    public void writeTo(Collection<?> oCol, Class<?> clz, Type type, Annotation[] aAnnotation,
+                        MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream stream)
             throws IOException, WebApplicationException
         {
         MarshallerRegistry registry = m_marshallerRegistry;
@@ -91,11 +92,11 @@ public void writeTo(Object oCol, Class<?> clz, Type type, Annotation[] aAnnotati
             }
 
         EntryWriter entryWriter = new EntryWriter(registry);
-        PrintStream out         = new PrintStream(stream);
+        PrintStream out = new PrintStream(stream);
         out.print("[");
 
         boolean first = true;
-        for (Object o : (Collection) oCol)
+        for (Object o : oCol)
             {
             if (o != null)
                 {
diff --git a/prj/coherence-rest/src/main/java/com/tangosol/coherence/rest/providers/XmlCollectionWriter.java b/prj/coherence-rest/src/main/java/com/tangosol/coherence/rest/providers/XmlCollectionWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -42,7 +42,7 @@
 @Provider
 @Produces(APPLICATION_XML)
 public class XmlCollectionWriter
-        implements MessageBodyWriter<Object>
+        implements MessageBodyWriter<Collection<?>>
     {
     // ----- constructors ---------------------------------------------------
 
@@ -73,14 +73,14 @@ public boolean isWriteable(Class<?> clz, Type type, Annotation[] aAnnotation,
         }
 
     @Override
-    public long getSize(Object col, Class<?> clz, Type type, Annotation[] aAnnotation,
+    public long getSize(Collection<?> col, Class<?> clz, Type type, Annotation[] aAnnotation,
             MediaType mediaType)
         {
         return -1;
         }
 
     @Override
-    public void writeTo(Object oCol, Class<?> clz, Type type, Annotation[] aAnnotation,
+    public void writeTo(Collection<?> oCol, Class<?> clz, Type type, Annotation[] aAnnotation,
             MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream stream)
             throws IOException, WebApplicationException
         {
@@ -96,7 +96,7 @@ public void writeTo(Object oCol, Class<?> clz, Type type, Annotation[] aAnnotati
         out.print("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
         out.print("<collection>");
 
-        for (Object o : (Collection) oCol)
+        for (Object o : oCol)
             {
             if (o instanceof Map.Entry)
                 {
diff --git a/prj/coherence-testing-support/src/main/java/com/oracle/coherence/testing/AbstractTestInfrastructure.java b/prj/coherence-testing-support/src/main/java/com/oracle/coherence/testing/AbstractTestInfrastructure.java
@@ -15,6 +15,7 @@
 import com.oracle.bedrock.deferred.TemporarilyUnavailableException;
 import com.oracle.bedrock.runtime.concurrent.RemoteCallable;
 import com.oracle.bedrock.runtime.java.options.JavaHome;
+import com.oracle.bedrock.runtime.java.profiles.RemoteDebugging;
 import com.oracle.bedrock.testsupport.deferred.Eventually;
 import com.oracle.bedrock.runtime.Application;
 import com.oracle.bedrock.runtime.ApplicationConsole;
@@ -730,6 +731,8 @@ else if (!props.containsKey("coherence.distributed.localstorage"))
             optionsByType.add(SystemProperty.of(sName, props.getProperty(sName)));
             }
 
+        //optionsByType.add(RemoteDebugging.autoDetect().startSuspended(true));
+
         try
             {
             member = startCacheServer(sServer, optionsByType, sProject, fGraceful);
diff --git a/prj/examples/guides/600-response-caching/gradle.properties b/prj/examples/guides/600-response-caching/gradle.properties
@@ -10,4 +10,4 @@ coherenceGroupId=com.oracle.coherence.ce
 
 junitVersion=5.8.2
 jandexPluginVersion=1.86
-helidonVersion=4.2.0
+helidonVersion=4.2.2
diff --git a/prj/examples/guides/600-response-caching/pom.xml b/prj/examples/guides/600-response-caching/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>io.helidon.applications</groupId>
     <artifactId>helidon-mp</artifactId>
-    <version>4.2.0</version>
+    <version>4.2.2</version>
     <relativePath/>
   </parent>
 
diff --git a/prj/examples/tutorials/500-graphql/complete/gradle.properties b/prj/examples/tutorials/500-graphql/complete/gradle.properties
@@ -8,6 +8,6 @@
 coherenceVersion=25.09-SNAPSHOT
 coherenceGroupId=com.oracle.coherence.ce
 
-helidonVersion=4.2.0
+helidonVersion=4.2.2
 
 junitVersion=5.9.0
diff --git a/prj/examples/tutorials/500-graphql/complete/pom.xml b/prj/examples/tutorials/500-graphql/complete/pom.xml
@@ -21,7 +21,7 @@
 
     <coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
     <coherence.version>${project.version}</coherence.version>
-    <helidon.version>4.2.0</helidon.version>
+    <helidon.version>4.2.2</helidon.version>
     <!-- make sure this version of parsson-media is in sync with Helidon -->
     <parsson-media.version>1.1.6</parsson-media.version>
 
diff --git a/prj/examples/tutorials/500-graphql/initial/gradle.properties b/prj/examples/tutorials/500-graphql/initial/gradle.properties
@@ -8,6 +8,6 @@
 coherenceVersion=25.09-SNAPSHOT
 coherenceGroupId=com.oracle.coherence.ce
 
-helidonVersion=4.2.0
+helidonVersion=4.2.2
 
 junitVersion=5.8.2
diff --git a/prj/examples/tutorials/500-graphql/initial/pom.xml b/prj/examples/tutorials/500-graphql/initial/pom.xml
@@ -21,7 +21,7 @@
 
     <coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
     <coherence.version>${project.version}</coherence.version>
-    <helidon.version>4.2.0</helidon.version>
+    <helidon.version>4.2.2</helidon.version>
     <!-- make sure this version of parsson-media is in sync with Helidon -->
     <parsson-media.version>1.1.6</parsson-media.version>
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2000, 2022, Oracle and/or its affiliates.`
	`2`	`+ * Copyright (c) 2000, 2025, Oracle and/or its affiliates.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Universal Permissive License v 1.0 as shown at`
`5`	`5`	`* https://oss.oracle.com/licenses/upl.`
`@@ -33,6 +33,7 @@`
`33`	`33`
`34`	`34`	`import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON;`
`35`	`35`
	`36`	`+`
`36`	`37`	`/**`
`37`	`38`	`* Provider responsible for converting Java collections to a JSON formatted`
`38`	`39`	`* stream.`
`@@ -42,7 +43,7 @@`
`42`	`43`	`@Provider`
`43`	`44`	`@Produces(APPLICATION_JSON)`
`44`	`45`	`public class JsonCollectionWriter`
`45`		`- implements MessageBodyWriter<Object>`
	`46`	`+ implements MessageBodyWriter<Collection<?>>`
`46`	`47`	`{`
`47`	`48`	`// ----- constructors ---------------------------------------------------`
`48`	`49`
`@@ -56,7 +57,7 @@ public JsonCollectionWriter()`
`56`	`57`	`/**`
`57`	`58`	`* Construct a JsonCollectionWriter instance.`
`58`	`59`	`*`
`59`		`- * @param registry marshaller registry to use`
	`60`	`+ * @param registry marshaller registry to use`
`60`	`61`	`*/`
`61`	`62`	`public JsonCollectionWriter(MarshallerRegistry registry)`
`62`	`63`	`{`
`@@ -67,21 +68,21 @@ public JsonCollectionWriter(MarshallerRegistry registry)`
`67`	`68`
`68`	`69`	`@Override`
`69`	`70`	`public boolean isWriteable(Class<?> clz, Type type, Annotation[] aAnnotation,`
`70`		`- MediaType mediaType)`
	`71`	`+ MediaType mediaType)`
`71`	`72`	`{`
`72`	`73`	`return Collection.class.isAssignableFrom(clz);`
`73`	`74`	`}`
`74`	`75`
`75`	`76`	`@Override`
`76`		`- public long getSize(Object col, Class<?> clz, Type type, Annotation[] aAnnotation,`
`77`		`- MediaType mediaType)`
	`77`	`+ public long getSize(Collection<?> col, Class<?> clz, Type type, Annotation[] aAnnotation,`
	`78`	`+ MediaType mediaType)`
`78`	`79`	`{`
`79`	`80`	`return -1;`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`@Override`
`83`		`- public void writeTo(Object oCol, Class<?> clz, Type type, Annotation[] aAnnotation,`
`84`		`- MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream stream)`
	`84`	`+ public void writeTo(Collection<?> oCol, Class<?> clz, Type type, Annotation[] aAnnotation,`
	`85`	`+ MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream stream)`
`85`	`86`	`throws IOException, WebApplicationException`
`86`	`87`	`{`
`87`	`88`	`MarshallerRegistry registry = m_marshallerRegistry;`
`@@ -91,11 +92,11 @@ public void writeTo(Object oCol, Class<?> clz, Type type, Annotation[] aAnnotati`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`EntryWriter entryWriter = new EntryWriter(registry);`
`94`		`- PrintStream out = new PrintStream(stream);`
	`95`	`+ PrintStream out = new PrintStream(stream);`
`95`	`96`	`out.print("[");`
`96`	`97`
`97`	`98`	`boolean first = true;`
`98`		`- for (Object o : (Collection) oCol)`
	`99`	`+ for (Object o : oCol)`
`99`	`100`	`{`
`100`	`101`	`if (o != null)`
`101`	`102`	`{`