Bump netty

multiapps-controller-client/src/main/java/org/cloudfoundry/multiapps/controller/client/facade/util/RestUtil.java

@@ -1,12 +1,14 @@
 package org.cloudfoundry.multiapps.controller.client.facade.util;
 
 import java.net.MalformedURLException;
+import java.net.Socket;
 import java.net.URL;
 import java.security.cert.X509Certificate;
 import java.text.MessageFormat;
 
+import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLException;
-import javax.net.ssl.X509TrustManager;
+import javax.net.ssl.X509ExtendedTrustManager;
 
 import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
@@ -17,6 +19,7 @@
 
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
+import io.netty.handler.ssl.SslProvider;
 import reactor.netty.http.client.HttpClient;
 
 /**
@@ -72,15 +75,16 @@
     private SslContext buildSslContext() {
         try {
             return SslContextBuilder.forClient()
+                                    .sslProvider(SslProvider.JDK)
                                     .trustManager(createDummyTrustManager())
                                     .build();
         } catch (SSLException e) {
             throw new RuntimeException("An error occurred setting up the SSLContext", e);
         }
     }
 
-    private X509TrustManager createDummyTrustManager() {
-        return new X509TrustManager() {
+    private X509ExtendedTrustManager createDummyTrustManager() {
+        return new X509ExtendedTrustManager() {
 
             @Override
             public void checkClientTrusted(X509Certificate[] xcs, String string) {
@@ -92,6 +96,26 @@
                 // NOSONAR
             }
 
+            @Override
+            public void checkClientTrusted(X509Certificate[] xcs, String string, Socket socket) {
+                // NOSONAR
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] xcs, String string, Socket socket) {
+                // NOSONAR
+            }
+
+            @Override
+            public void checkClientTrusted(X509Certificate[] xcs, String string, SSLEngine sslEngine) {
+                // NOSONAR
+            }
+
+            @Override
+            public void checkServerTrusted(X509Certificate[] xcs, String string, SSLEngine sslEngine) {
+                // NOSONAR
+            }
+
             @Override
             public X509Certificate[] getAcceptedIssuers() {
                 return new X509Certificate[] {};

multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/OAuthClientFactory.java

@@ -6,6 +6,7 @@
 import org.cloudfoundry.multiapps.controller.client.facade.util.RestUtil;
 import org.cloudfoundry.multiapps.controller.client.uaa.UAAClient;
 import org.cloudfoundry.multiapps.controller.core.security.token.TokenService;
+import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
 
 @Named
 public class OAuthClientFactory {
@@ -16,9 +17,11 @@
     private TokenService tokenService;
     @Inject
     private UAAClient uaaClient;
+    @Inject
+    private ApplicationConfiguration configuration;
 
     public OAuthClient createOAuthClient() {
-        return new OAuthClientExtended(uaaClient.getUaaUrl(), tokenService, restUtil.createWebClient(true));
+        return new OAuthClientExtended(uaaClient.getUaaUrl(), tokenService, restUtil.createWebClient(configuration.shouldSkipSslValidation()));
     }
 
 }

pom.xml

@@ -36,8 +36,8 @@
         <liquibase.version>4.33.0</liquibase.version>
         <liquibase-slf4j.version>5.1.0</liquibase-slf4j.version>
         <cloudfoundry-client.version>5.16.0.RELEASE</cloudfoundry-client.version>
-        <reactor-netty.version>1.3.6</reactor-netty.version>
-        <netty.version>4.2.15.Final</netty.version>
+        <reactor-netty.version>1.3.7</reactor-netty.version>
+        <netty.version>4.2.17.Final</netty.version>
         <swagger.version>1.6.16</swagger.version>
         <jclouds.version>2.7.0</jclouds.version>
         <guava.version>33.5.0-jre</guava.version>
@@ -292,6 +292,8 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <!-- Force all Netty artifacts to 4.2.x to avoid JPMS split-package conflict
+                 between netty-codec (4.1) and netty-codec-compression (4.2) on Java 25 -->
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
                 <version>${netty.version}</version>