Skip to content

fix: Spring Boot 4 migration — incremental areas A-E for #4616 #4717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
balhar-jakub wants to merge 15 commits into
base: v3.x.x
Choose a base branch
from
Draft

fix: Spring Boot 4 migration — incremental areas A-E for #4616 #4717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e4d4030
feat: upgrade version catalog to Spring Boot 4 baseline (#4616)
balhar-jakub Jun 15, 2026
19d94ba
fix: SB4 compilation fixes for discovery-service + dependencies (#4616)
balhar-jakub Jun 15, 2026
8505b9c
fix: SB4 migration - Area C simple fixes (#4616)
balhar-jakub Jun 15, 2026
bffff5e
fix: add commons-logging, MockitoExtension, force jersey-container-se…
balhar-jakub Jun 15, 2026
35accdc
fix: use explicit commons-logging coordinate instead of catalog ref f…
balhar-jakub Jun 15, 2026
ace8b45
fix: add explicit version 1.3.6 for commons-logging for #4616
balhar-jakub Jun 15, 2026
72f5b10
fix: remove global commons-logging exclusion for Spring Cloud Netflix…
balhar-jakub Jun 15, 2026
51cbee3
fix: javax → jakarta in string literals and JavaDoc (#4616)
balhar-jakub Jun 15, 2026
c678bb1
fix: update ErrorProperties/BasicErrorController to Spring Boot 4.x p…
balhar-jakub Jun 15, 2026
b945a74
fix: inject WebProperties instead of ErrorProperties (no longer a bea…
balhar-jakub Jun 15, 2026
d49b1f9
fix: restore MetadataFilterService.verifyAllowedDomains() call
balhar-jakub Jun 15, 2026
b572e37
fix: address security review findings for #4616
balhar-jakub Jun 15, 2026
9acf059
fix: SB4 migration - Area E (health/Tomcat/WebSocket/HttpHeaders) for…
balhar-jakub Jun 15, 2026
a83cb58
fix: force Groovy 4.0.28 to resolve REST Assured/Groovy 5.x NPE in di…
balhar-jakub Jun 16, 2026
cca140b
Merge branch 'v3.x.x' into hermes/gh4616
balhar-jakub Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api-catalog-services/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ dependencies {
api project(':apiml-tomcat-common')
api project(':security-service-client-spring')

implementation libs.spring.boot.starter.aop
implementation libs.spring.boot.starter.aspectj
implementation libs.spring.boot.starter.actuator
implementation libs.spring.boot.starter.security
implementation libs.spring.boot.starter.web
Expand Down
4 changes: 0 additions & 4 deletions api-catalog-services/src/main/java/org/zowe/apiml/apicatalog/ApiCatalogApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
package org.zowe.apiml.apicatalog;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.actuate.autoconfigure.logging.OpenTelemetryLoggingAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.ComponentScan;
Expand All @@ -27,8 +25,6 @@

@SpringBootApplication(
exclude = {
OpenTelemetryAutoConfiguration.class,
OpenTelemetryLoggingAutoConfiguration.class
}
)
@EnableDiscoveryClient
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/zowe/apiml/apicatalog/controllers/handlers/CustomErrorStatusHandlingBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
package org.zowe.apiml.apicatalog.controllers.handlers;

import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.error.ErrorPage;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
import org.springframework.boot.web.server.servlet.ConfigurableServletWebServerFactory;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Component;

Expand Down
6 changes: 3 additions & 3 deletions ...og-services/src/main/java/org/zowe/apiml/apicatalog/health/ApiCatalogHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
package org.zowe.apiml.apicatalog.health;

import lombok.RequiredArgsConstructor;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.health.contributor.AbstractHealthIndicator;
import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.contributor.Status;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.stereotype.Component;
Expand Down
4 changes: 2 additions & 2 deletions ...ervices/src/test/java/org/zowe/apiml/apicatalog/health/ApiCatalogHealthIndicatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.contributor.Status;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.zowe.apiml.product.constants.CoreService;
Expand Down
80 changes: 0 additions & 80 deletions ...n/java/org/zowe/apiml/product/compatibility/ApimlDiscoveryCompositeHealthContributor.java
View file
Open in desktop

This file was deleted.

180 changes: 0 additions & 180 deletions apiml-common/src/main/java/org/zowe/apiml/product/compatibility/ApimlHealthCheckHandler.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...on/src/main/java/org/zowe/apiml/product/compatibility/CustomDiskSpaceHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

package org.zowe.apiml.product.compatibility;

import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
import org.springframework.boot.health.contributor.Health;
import org.springframework.boot.health.application.DiskSpaceHealthIndicator;
import org.springframework.util.unit.DataSize;

import java.io.File;
Expand Down
6 changes: 3 additions & 3 deletions apiml-common/src/main/java/org/zowe/apiml/product/compatibility/DiskHealthConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

package org.zowe.apiml.product.compatibility;

import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthIndicatorProperties;
import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
import org.springframework.boot.health.autoconfigure.application.DiskSpaceHealthContributorAutoConfiguration;
import org.springframework.boot.health.autoconfigure.application.DiskSpaceHealthIndicatorProperties;
import org.springframework.boot.health.application.DiskSpaceHealthIndicator;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
Expand Down
10 changes: 5 additions & 5 deletions apiml-common/src/main/java/org/zowe/apiml/product/config/ServerAddressPropertiesUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.env.EnvironmentPostProcessor;
import org.springframework.boot.web.embedded.tomcat.TomcatConnectorCustomizer;
import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.tomcat.TomcatConnectorCustomizer;
import org.springframework.boot.tomcat.reactive.TomcatReactiveWebServerFactory;
import org.springframework.boot.tomcat.servlet.TomcatServletWebServerFactory;
import org.springframework.boot.web.server.AbstractConfigurableWebServerFactory;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.context.annotation.Bean;
Expand Down Expand Up @@ -226,7 +226,7 @@ public AdditionalConnectorReactive(List<TomcatConnectorCustomizer> connectorCust

@Override
protected void initFactory(TomcatReactiveWebServerFactory factory) {
factory.addAdditionalTomcatConnectors(connector);
factory.addAdditionalConnectors(connector);
factory.addConnectorCustomizers(connectorCustomizers.toArray(new TomcatConnectorCustomizer[0]));
}

Expand All @@ -243,7 +243,7 @@ public AdditionalConnectorServlet(List<TomcatConnectorCustomizer> connectorCusto

@Override
protected void initFactory(TomcatServletWebServerFactory factory) {
factory.addAdditionalTomcatConnectors(connector);
factory.addAdditionalConnectors(connector);
factory.addConnectorCustomizers(connectorCustomizers.toArray(new TomcatConnectorCustomizer[0]));
}

Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/zowe/apiml/product/opentelemetry/ApimlNonZosOpenTelemetryResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.stereotype.Component;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

@ConditionalOnMissingBean(ApimlZosOpenTelemetryResourceProvider.class)
@Component
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/zowe/apiml/product/opentelemetry/ApimlOpenTelemetryResourceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

@Slf4j
public abstract class ApimlOpenTelemetryResourceProvider implements ResourceProvider {
Expand Down
Loading
Loading