Bug 37630352 - [37630316->22.06.12] Update Helidon version to 2.6.11 …

…in 14.1.2.0 and 14.1.1.2206 (14.1.1.2206 -> ce/22.06 @114610) [git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v22.06/": change = 114611]
oracle · Feb 25, 2025 · 7cf28c8 · 7cf28c8
1 parent 2574e2f
commit 7cf28c8
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 25 deletions.
diff --git a/prj/coherence-dependencies/pom.xml b/prj/coherence-dependencies/pom.xml
@@ -198,7 +198,7 @@
     grpc.version ???
     This is not always possible if we need to bump versions for CVE's
     -->
-    <helidon.version>2.6.10</helidon.version>
+    <helidon.version>2.6.11</helidon.version>
     <helidon.sitegen.version>2.1.2</helidon.sitegen.version>
     <hsqldb.version>2.3.2</hsqldb.version>
     <jackson.version>2.14.1</jackson.version>

diff --git a/prj/etc/dependency-check-suppression.xml b/prj/etc/dependency-check-suppression.xml
@@ -481,22 +481,4 @@
   </suppress>
 
 
-  <!-- Suppress Netty 4.1.115 coming from Helidon for 2 weeks -->
-  <suppress until="2025-03-06Z">
-    <notes><![CDATA[
-    file name: netty-common-4.1.115.Final.jar
-    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/io\.netty/netty\-common@.*$</packageUrl>
-    <cpe>cpe:2.3:a:netty:netty</cpe>
-    <cve>CVE-2025-25193</cve>
-  </suppress>
-  <suppress until="2025-03-06Z">
-    <notes><![CDATA[
-    file name: netty-handler-4.1.115.Final.jar
-    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/io\.netty/netty\-handler@.*$</packageUrl>
-    <cpe>cpe:2.3:a:netty:netty</cpe>
-    <cve>CVE-2025-24970</cve>
-  </suppress>
-
 </suppressions>
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
 
-helidonVersion=2.6.10
+helidonVersion=2.6.11
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>2.6.10</version>
+    <version>2.6.11</version>
     <relativePath/>
   </parent>
 

diff --git a/prj/examples/tutorials/500-graphql/complete/gradle.properties b/prj/examples/tutorials/500-graphql/complete/gradle.properties
@@ -8,7 +8,7 @@
 coherenceVersion=22.06.12-SNAPSHOT
 coherenceGroupId=com.oracle.coherence.ce
 
-helidonVersion=2.6.10
+helidonVersion=2.6.11
 
 junitVersion=5.8.2
 
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>2.6.10</helidon.version>
+    <helidon.version>2.6.11</helidon.version>
 
     <java.version>11</java.version>
     <java.version.release>11</java.version.release>

diff --git a/prj/examples/tutorials/500-graphql/initial/gradle.properties b/prj/examples/tutorials/500-graphql/initial/gradle.properties
@@ -8,7 +8,7 @@
 coherenceVersion=22.06.12-SNAPSHOT
 coherenceGroupId=com.oracle.coherence.ce
 
-helidonVersion=2.6.10
+helidonVersion=2.6.11
 
 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>2.6.10</helidon.version>
+    <helidon.version>2.6.11</helidon.version>
 
     <java.version>11</java.version>
     <java.version.release>11</java.version.release>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,4 @@ coherenceGroupId=com.oracle.coherence.ce

		junitVersion=5.8.2

		helidonVersion=2.6.10
		helidonVersion=2.6.11