Merge remote-tracking branch 'origin/reboot/gw-zaas-conf' into reboot…

…/gw-zaas-conf

api-catalog-services/build.gradle

@@ -75,6 +75,8 @@ dependencies {
 
     implementation(libs.openapidiff) {
         exclude group: "io.swagger.core.v3", module: "swagger-core"
+        // Remove deprecated HTTP client (unused transitive dependency of openDiff)
+        exclude group: "commons-httpclient", module: "commons-httpclient"
     }
     implementation(libs.swagger.inflector) {
         exclude group: "io.swagger.core.v3", module: "swagger-core"

api-catalog-services/src/main/resources/application.yml

@@ -39,6 +39,7 @@ logging:
 
         # New Config
         org.apache: WARN #org.apache.catalina, org.apache.coyote, org.apache.tomcat
+        org.apache.tomcat.util.net.SSLUtilBase: ERROR
         org.eclipse.jetty: WARN
         org.apache.http.conn.ssl.DefaultHostnameVerifier: DEBUG #logs only SSLException
         javax.net.ssl: ERROR

api-catalog-ui/frontend/package.json

@@ -28,7 +28,7 @@
         "htmr": "1.0.2",
         "install": "0.13.0",
         "lodash": "4.17.21",
-        "loglevel": "1.9.1",
+        "loglevel": "1.9.2",
         "openapi-snippet": "0.14.0",
         "react": "18.3.1",
         "react-app-polyfill": "3.0.0",
@@ -90,13 +90,13 @@
         "@testing-library/user-event": "13.5.0",
         "ajv": "7.2.4",
         "ansi-regex": "5.0.1",
-        "body-parser": "1.20.2",
-        "caniuse-lite": "1.0.30001655",
+        "body-parser": "1.20.3",
+        "caniuse-lite": "1.0.30001660",
         "cheerio": "1.0.0",
         "concurrently": "5.3.0",
         "cors": "2.8.5",
         "cross-env": "7.0.3",
-        "cypress": "13.14.1",
+        "cypress": "13.14.2",
         "cypress-file-upload": "5.0.8",
         "enzyme": "3.11.0",
         "eslint": "7.32.0",
@@ -106,10 +106,10 @@
         "eslint-plugin-flowtype": "5.10.0",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.30.0",
-        "eslint-plugin-jsx-a11y": "6.9.0",
+        "eslint-plugin-jsx-a11y": "6.10.0",
         "eslint-plugin-prettier": "3.4.1",
         "eslint-plugin-react": "7.35.2",
-        "express": "4.19.2",
+        "express": "4.21.0",
         "html-loader": "4.2.0",
         "jest": "29.7.0",
         "jest-environment-enzyme": "7.1.2",
@@ -131,7 +131,7 @@
         "redux-mock-store": "1.5.4",
         "rimraf": "3.0.2",
         "source-map-explorer": "2.5.3",
-        "start-server-and-test": "2.0.5",
+        "start-server-and-test": "2.0.7",
         "tmpl": "1.0.5",
         "yaml": "1.10.2"
     },

build.gradle

@@ -30,6 +30,7 @@ buildscript {
         classpath libs.gradle.release
         classpath libs.gradle.licencer
         classpath libs.gradle.jib.plugin
+        classpath libs.apache.compress
     }
 }
 

discovery-service/src/main/resources/application.yml

@@ -18,6 +18,7 @@ logging:
         org.eclipse.jetty: WARN
         org.apache.http.conn.ssl.DefaultHostnameVerifier: DEBUG #logs only SSLException
         javax.net.ssl: ERROR
+        org.apache.tomcat.util.net.SSLUtilBase: ERROR
     #    com.netflix.eureka.resources: WARN
 
 apiml:

gateway-service/src/main/java/org/zowe/apiml/gateway/config/ConnectionsConfig.java

@@ -173,18 +173,13 @@ public HttpsFactory factory() {
     }
 
     /**
-     * This bean processor is used to override bean routingFilter defined at
-     * org.springframework.cloud.gateway.config.GatewayAutoConfiguration.NettyConfiguration#routingFilter(HttpClient, ObjectProvider, HttpClientProperties)
-     * <p>
-     * There is no simple way how to override this specific bean, but bean processing could handle that.
-     *
      * @param httpClient             default http client
      * @param headersFiltersProvider header filter for spring gateway router
      * @param properties             client HTTP properties
-     * @return bean processor to replace NettyRoutingFilter by NettyRoutingFilterApiml
+     * @return                       instance of NettyRoutingFilterApiml
      */
     @Bean
-    public BeanPostProcessor routingFilterHandler(HttpClient httpClient, ObjectProvider<List<HttpHeadersFilter>> headersFiltersProvider, HttpClientProperties properties) {
+    public NettyRoutingFilterApiml createNettyRoutingFilterApiml(HttpClient httpClient, ObjectProvider<List<HttpHeadersFilter>> headersFiltersProvider, HttpClientProperties properties) {
         // obtain SSL contexts (one with keystore to support client cert sign and truststore, second just with truststore)
         SslContext justTruststore = sslContext(false);
         SslContext withKeystore = sslContext(true);
@@ -199,13 +194,27 @@ public BeanPostProcessor routingFilterHandler(HttpClient httpClient, ObjectProvi
         // construct http clients with different SSL configuration - with / without client certs
         var httpClientNoCert = httpClient.secure(builderJustTruststore.build());
         var httpClientClientCert = httpClient.secure(builderWithKeystore.build());
+
+        return new NettyRoutingFilterApiml(httpClientNoCert, httpClientClientCert, headersFiltersProvider, properties);
+    }
+
+    /**
+     * This bean processor is used to override bean routingFilter defined at
+     * org.springframework.cloud.gateway.config.GatewayAutoConfiguration.NettyConfiguration#routingFilter(HttpClient, ObjectProvider, HttpClientProperties)
+     * <p>
+     * There is no simple way how to override this specific bean, but bean processing could handle that.
+     *
+     * @return bean processor to replace NettyRoutingFilter by NettyRoutingFilterApiml
+     */
+    @Bean
+    public static BeanPostProcessor routingFilterHandler(ApplicationContext context) {
         return new BeanPostProcessor() {
             @Override
             public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
                 if ("routingFilter".equals(beanName)) {
                     log.debug("Updating routing bean {}", NettyRoutingFilterApiml.class);
                     // once is creating original bean by autoconfiguration replace it with custom implementation
-                    return new NettyRoutingFilterApiml(httpClientNoCert, httpClientClientCert, headersFiltersProvider, properties);
+                    return context.getBean(NettyRoutingFilterApiml.class);
                 }
                 // do not touch any other bean
                 return bean;

gateway-service/src/main/java/org/zowe/apiml/gateway/config/WebSecurity.java

@@ -251,7 +251,7 @@ public ApimlServerAuthorizationRequestRepository requestRepository(Optional<Serv
     @Bean
     public ReactiveClientRegistrationRepository clientRegistrationRepository() {
         if (!clientConfiguration.isConfigured()) {
-            return null;
+            return registrationId -> null;
         }
         return new InMemoryReactiveClientRegistrationRepository(this.getClientRegistrations());
     }
@@ -275,7 +275,7 @@ public ReactiveOAuth2AuthorizedClientManager gatewayReactiveOAuth2AuthorizedClie
         Optional<ReactiveOAuth2AuthorizedClientService> authorizedClientService
     ) {
         if (!clientConfiguration.isConfigured()) {
-            return null;
+            return registrationId -> null;
         }
 
         var authorizedClientProvider = ReactiveOAuth2AuthorizedClientProviderBuilder

gradle.properties

@@ -12,7 +12,7 @@ mavenPublishPassword=
 
 sonar.host.url=https://sonarcloud.io
 
-# Artifactory repositories for publising
+# Artifactory repositories for publishing
 artifactoryPublishingMavenRepo=https://zowe.jfrog.io/zowe/libs-release-local
 artifactoryPublishingMavenSnapshotRepo=https://zowe.jfrog.io/zowe/libs-snapshot-local
 

gradle/versions.gradle

@@ -5,7 +5,7 @@ dependencyResolutionManagement {
             version('projectNode', '18.20.4')
             version('projectNpm', '9.9.3')
 
-            version('springBoot', '3.2.9')
+            version('springBoot', '3.3.3')
             version('springBootGraphQl', '3.3.3')
             version('springCloudNetflix', '4.1.3')
             version('springCloudCommons', '4.1.4')
@@ -57,15 +57,15 @@ dependencyResolutionManagement {
             version('junitPlatform', '1.11.0')
             version('lettuce', '6.4.0.RELEASE')
             // force version in build.gradle file - compatibility with Slf4j
-            version('log4j', '2.23.1')
+            version('log4j', '2.24.0')
             version('lombok', '1.18.34')
-            version('netty', '4.1.112.Final')
+            version('netty', '4.1.113.Final')
             version('nettyReactor', '1.1.22')
-            version('nimbusJoseJwt', '9.40')
+            version('nimbusJoseJwt', '9.41')
             version('openApiDiff', '2.0.1')
             version('picocli', '4.7.6')
 
-            version('reactor', '3.6.9')
+            version('reactor', '3.6.10')
             version('restAssured', '5.5.0')
             version('springDoc', '2.6.0')
             version('swaggerInflector', '2.0.12')
@@ -81,21 +81,22 @@ dependencyResolutionManagement {
             }
             version('jgit', '6.10.0.202406032230-r')
             version('gradleNode', '7.0.2')
-            version('sonarGradlePlugin', '4.0.0.2929')
+            version('sonarGradlePlugin', '5.1.0.4882')
             version('gradleRelease', '3.0.2')
             version('gradleLicencer', '0.6.1')
             version('gradleJibPlugin', '3.2.1')
             version('taskTree', '2.1.1')
             version('reactorBom', '2023.0')
             version('gradleTestLogger', '4.0.0')
             version('testLogger', '4.0.0')
-            version('micronautPlatform', '4.6.0')
-            version('micronaut', '4.6.3')
+            version('micronautPlatform', '4.6.1')
+            version('micronaut', '4.6.5')
             version('micronautPlugin', '4.4.2')
             version('shadow', '8.1.1')
             version('checkstyle', '10.17.0')
             version('jacoco', '0.8.11')
             version('gradle', '8.6')
+            version('commonsCompress', '1.25.0')
 
             library('zowe_zos_utils', 'org.zowe.apiml.sdk', 'zos-utils').versionRef('zosUtils')
             library('spring_boot_configuration_processor', 'org.springframework.boot', 'spring-boot-configuration-processor').versionRef('springBoot')
@@ -217,6 +218,7 @@ dependencyResolutionManagement {
             library('gradle_jib_plugin', 'gradle.plugin.com.google.cloud.tools', 'jib-gradle-plugin').versionRef('gradleJibPlugin')
             library('gradle_test_logger', 'com.adarshr', 'gradle-test-logger-plugin').versionRef('gradleTestLogger')
             library('micronaut_http_client', 'io.micronaut', 'micronaut-http-client').versionRef('micronaut')
+            library('apache_compress', 'org.apache.commons', 'commons-compress').versionRef('commonsCompress')
 
             plugin('gradle_git_properties', 'com.gorylenko.gradle-git-properties').versionRef('gradleGitProperties')
             plugin('gradle_node', 'com.github.node-gradle.node').versionRef('gradleNode')
@@ -230,7 +232,7 @@ dependencyResolutionManagement {
             plugin('micronaut_library', 'io.micronaut.library').versionRef('micronautPlugin')
 
             // Pure Java dependencies - do not use in Spring unless really necessary
-            version('logback', '1.5.6')
+            version('logback', '1.5.8')
             version('mockitoCore', '5.13.0')
             version('mockitoInline', '5.2.0')
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

mock-services/src/main/resources/application.yml

@@ -1,3 +1,7 @@
+logging:
+    level:
+        ROOT: INFO
+        org.apache.tomcat.util.net.SSLUtilBase: ERROR
 spring:
     application:
         name: Mock services