This is an automated email from the ASF dual-hosted git repository.
gitgabrio pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-examples.git
The following commit(s) were added to refs/heads/main by this push:
new da4600414 [incubator-kie-issues#2288] - Springboot 4.0.x upgrade
(#2210)
da4600414 is described below
commit da4600414a60dce0f99d3514f404909816185807
Author: Nithin R Krishnan <[email protected]>
AuthorDate: Mon May 18 14:04:46 2026 +0530
[incubator-kie-issues#2288] - Springboot 4.0.x upgrade (#2210)
* Upgrade to Spring Boot 4.0.5 and adjust configurations for compatibility;
update dependencies and remove deprecated observability annotations.
* Update Gradle and POM configurations for Spring Boot 4 compatibility; pin
Groovy version and adjust dependencies for observability and caching.
* Refine comments in CacheAutoConfiguration for clarity; update Netty
version description in POM file.
* Refactor comments in JacksonHttpMessageConverterConfig for clarity and
consistency
* ci: retrigger
* ci: retrigger
---
.gitignore | 4 ++
.../dmn-springboot-gradle/build.gradle | 4 ++
.../dmn-springboot-gradle/gradle.properties | 2 +-
.../build.gradle | 4 ++
.../gradle.properties | 2 +-
.../examples/springboot/DashboardsListTest.java | 2 -
.../examples/springboot/DroolsMetricsTest.java | 2 -
.../examples/springboot/LoanEligibilityTest.java | 2 -
.../onboarding-springboot/pom.xml | 5 ++
.../JacksonHttpMessageConverterConfig.java | 49 +++++++++++++++++
.../examples/KogitoOnboardingApplication.java | 12 +++--
kogito-springboot-examples/pom.xml | 62 ++++++++++++++++++++++
.../process-decisions-rest-springboot/pom.xml | 5 ++
.../traffic/LicenseValidationRestService.java | 2 +-
.../traffic/TrafficViolationRestService.java | 2 +-
.../cache/CacheAutoConfiguration.java} | 24 +++------
.../examples/springboot/ProcessMetricsTest.java | 2 -
.../process-rest-service-call-springboot/pom.xml | 5 ++
.../KogitoInfinispanSpringbootApplication.java | 2 +-
.../springboot/DefaultWebSecurityConfig.java | 15 +++---
.../kie/kogito/tests/DefaultWebSecurityConfig.java | 9 ++--
21 files changed, 167 insertions(+), 49 deletions(-)
diff --git a/.gitignore b/.gitignore
index ab67e8496..3bd14b64c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,10 @@ bin/
/target
/local
+# Gradle
+build/
+.gradle/
+
# Eclipse, Netbeans and IntelliJ files
.*
!.env
diff --git
a/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/build.gradle
b/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/build.gradle
index cd95ab317..ea1d14b6f 100644
---
a/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/build.gradle
+++
b/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/build.gradle
@@ -33,6 +33,10 @@ repositories {
mavenLocal()
}
+// Pin Groovy 4 to match the Maven side: RestAssured 5.5.6 is compiled against
Groovy 4 and trips
+// a NullPointerException under Groovy 5. TODO drop when RestAssured ships a
Groovy 5 release.
+ext['groovy.version'] = '4.0.29'
+
dependencies {
implementation
platform("org.kie.kogito:kogito-spring-boot-bom:${kogitoVersion}")
implementation("org.springframework.boot:spring-boot-starter-web")
diff --git
a/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/gradle.properties
b/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/gradle.properties
index a4482e88a..2e107726b 100644
---
a/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/gradle.properties
+++
b/gradle-examples/kogito-springboot-gradle-examples/dmn-springboot-gradle/gradle.properties
@@ -1,5 +1,5 @@
#Gradle properties
-springBootVersion=3.5.14
+springBootVersion=4.0.5
springBootDependencyManagementVersion=1.1.5
taskTreeVersion=4.0.1
junitVersion=5.12.1
diff --git
a/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/build.gradle
b/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/build.gradle
index 3d17fe9a0..ec2ab3b38 100644
---
a/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/build.gradle
+++
b/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/build.gradle
@@ -33,6 +33,10 @@ repositories {
mavenLocal()
}
+// Pin Groovy 4 to match the Maven side: RestAssured 5.5.6 is compiled against
Groovy 4 and trips
+// a NullPointerException under Groovy 5. TODO drop when RestAssured ships a
Groovy 5 release.
+ext['groovy.version'] = '4.0.29'
+
dependencies {
implementation
platform("org.kie.kogito:kogito-spring-boot-bom:${kogitoVersion}")
implementation("org.springframework.boot:spring-boot-starter-web")
diff --git
a/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/gradle.properties
b/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/gradle.properties
index a4482e88a..2e107726b 100644
---
a/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/gradle.properties
+++
b/gradle-examples/kogito-springboot-gradle-examples/process-decisions-rules-springboot-gradle/gradle.properties
@@ -1,5 +1,5 @@
#Gradle properties
-springBootVersion=3.5.14
+springBootVersion=4.0.5
springBootDependencyManagementVersion=1.1.5
taskTreeVersion=4.0.1
junitVersion=5.12.1
diff --git
a/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DashboardsListTest.java
b/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DashboardsListTest.java
index dffabca9c..3d93d6c9c 100644
---
a/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DashboardsListTest.java
+++
b/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DashboardsListTest.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import
org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
@@ -33,7 +32,6 @@ import io.restassured.http.ContentType;
import static io.restassured.RestAssured.given;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = KogitoSpringbootApplication.class)
-@AutoConfigureObservability
public class DashboardsListTest {
@LocalServerPort
diff --git
a/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DroolsMetricsTest.java
b/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DroolsMetricsTest.java
index 22e5ecce8..30e253115 100644
---
a/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DroolsMetricsTest.java
+++
b/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/DroolsMetricsTest.java
@@ -20,7 +20,6 @@ package org.kie.kogito.examples.springboot;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import
org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.annotation.DirtiesContext;
@@ -33,7 +32,6 @@ import static org.hamcrest.Matchers.containsString;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = KogitoSpringbootApplication.class)
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
-@AutoConfigureObservability
public class DroolsMetricsTest {
private static final String PROJECT_VERSION =
ProjectMetadataProvider.getProjectVersion();
diff --git
a/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/LoanEligibilityTest.java
b/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/LoanEligibilityTest.java
index e9ef22fc9..c08456d0d 100644
---
a/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/LoanEligibilityTest.java
+++
b/kogito-springboot-examples/dmn-drools-springboot-metrics/src/test/java/org/kie/kogito/examples/springboot/LoanEligibilityTest.java
@@ -20,7 +20,6 @@ package org.kie.kogito.examples.springboot;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import
org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
@@ -32,7 +31,6 @@ import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = KogitoSpringbootApplication.class)
-@AutoConfigureObservability
public class LoanEligibilityTest {
private static final String PROJECT_VERSION =
ProjectMetadataProvider.getProjectVersion();
diff --git a/kogito-springboot-examples/onboarding-springboot/pom.xml
b/kogito-springboot-examples/onboarding-springboot/pom.xml
index c8a7a4fcd..cf133a37f 100644
--- a/kogito-springboot-examples/onboarding-springboot/pom.xml
+++ b/kogito-springboot-examples/onboarding-springboot/pom.xml
@@ -57,6 +57,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+ <!-- spring-boot-cache: hosts CacheMetricsAutoConfiguration, which this
app excludes below. -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-cache</artifactId>
+ </dependency>
<dependency>
<groupId>org.kie</groupId>
<artifactId>kie-addons-springboot-monitoring-prometheus</artifactId>
diff --git
a/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/JacksonHttpMessageConverterConfig.java
b/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/JacksonHttpMessageConverterConfig.java
new file mode 100644
index 000000000..aef01ae3a
--- /dev/null
+++
b/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/JacksonHttpMessageConverterConfig.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.examples;
+
+import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.MediaType;
+import
org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+// Jackson 2 HTTP converter for this module — it has no rule units, so the
codegen-generated
+// RestObjectMapper that normally provides one is not produced here. canWrite
refuses String so DMN
+// controllers' pre-serialized JSON passes through StringHttpMessageConverter.
Remove together with
+// https://github.com/apache/incubator-kie-drools/issues/6702 (Jackson 3
migration).
+@Configuration
+public class JacksonHttpMessageConverterConfig {
+
+ @Bean
+ @ConditionalOnMissingBean(MappingJackson2HttpMessageConverter.class)
+ public MappingJackson2HttpMessageConverter
mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) {
+ return new MappingJackson2HttpMessageConverter(objectMapper) {
+ @Override
+ public boolean canWrite(Class<?> clazz, MediaType mediaType) {
+ if (clazz == String.class) {
+ return false;
+ }
+ return super.canWrite(clazz, mediaType);
+ }
+ };
+ }
+}
diff --git
a/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/KogitoOnboardingApplication.java
b/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/KogitoOnboardingApplication.java
index 6b2772ca9..633a12e86 100644
---
a/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/KogitoOnboardingApplication.java
+++
b/kogito-springboot-examples/onboarding-springboot/src/main/java/org/kie/kogito/examples/KogitoOnboardingApplication.java
@@ -19,16 +19,18 @@
package org.kie.kogito.examples;
import org.springframework.boot.SpringApplication;
-import
org.springframework.boot.actuate.autoconfigure.metrics.cache.CacheMetricsAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import
org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesCatalogWatchAutoConfiguration;
-import
org.springframework.cloud.kubernetes.fabric8.discovery.KubernetesDiscoveryClientAutoConfiguration;
+import
org.springframework.boot.cache.autoconfigure.metrics.CacheMetricsAutoConfiguration;
+import
org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8CatalogWatchAutoConfiguration;
+import
org.springframework.cloud.kubernetes.fabric8.discovery.Fabric8DiscoveryClientAutoConfiguration;
// Disabling the cache metrics for now, see:
https://github.com/infinispan/infinispan-spring-boot/issues/168
+// Spring Cloud Kubernetes 5: the Fabric8* prefix disambiguates the Fabric8
variants from the
+// Kubernetes-Client variants in the same package.
@SpringBootApplication(scanBasePackages = { "org.kie.kogito.**" },
exclude = { CacheMetricsAutoConfiguration.class,
- KubernetesDiscoveryClientAutoConfiguration.class,
- KubernetesCatalogWatchAutoConfiguration.class })
+ Fabric8DiscoveryClientAutoConfiguration.class,
+ Fabric8CatalogWatchAutoConfiguration.class })
public class KogitoOnboardingApplication {
public static void main(String[] args) {
diff --git a/kogito-springboot-examples/pom.xml
b/kogito-springboot-examples/pom.xml
index 4b9b6f46e..20200dee7 100644
--- a/kogito-springboot-examples/pom.xml
+++ b/kogito-springboot-examples/pom.xml
@@ -36,6 +36,12 @@
<properties>
<java.module.name>org.kie.kogito.examples.springboot</java.module.name>
+ <!-- Override Netty to 4.2.x for these SB examples. The shared
kogito-dependencies-bom pins 4.1.x
+ for Quarkus/Vert.x, but Infinispan 15.x's Hot Rod client needs 4.2
(uses io.netty.channel.IoHandle).
+ Per-artifact pins below are required because BOM-imported entries
cannot override the parent-
+ imported BOM's explicit versions. Mirrors the matching block in
kogito-runtimes' springboot/pom.xml.
+ TODO drop after the planned BOM split. -->
+ <version.io.netty>4.2.12.Final</version.io.netty>
</properties>
<dependencyManagement>
@@ -45,6 +51,62 @@
<artifactId>infinispan-spring-boot3-starter-remote</artifactId>
<version>${version.org.infinispan}</version>
</dependency>
+ <!-- See <properties> note above: per-artifact Netty 4.2 pins for the
Spring Boot examples. -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-buffer</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-dns</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-http2</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-codec-socks</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-common</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler-proxy</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-resolver-dns</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-transport</artifactId>
+ <version>${version.io.netty}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git
a/kogito-springboot-examples/process-decisions-rest-springboot/pom.xml
b/kogito-springboot-examples/process-decisions-rest-springboot/pom.xml
index 226fcaed8..79fd34999 100644
--- a/kogito-springboot-examples/process-decisions-rest-springboot/pom.xml
+++ b/kogito-springboot-examples/process-decisions-rest-springboot/pom.xml
@@ -53,6 +53,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
+ <!-- spring-boot-restclient: hosts RestTemplateBuilder
(org.springframework.boot.restclient). -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-restclient</artifactId>
+ </dependency>
<dependency>
<groupId>org.jbpm</groupId>
diff --git
a/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/LicenseValidationRestService.java
b/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/LicenseValidationRestService.java
index 58c54bc7a..f748c6c71 100644
---
a/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/LicenseValidationRestService.java
+++
b/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/LicenseValidationRestService.java
@@ -23,7 +23,7 @@ import java.util.Collections;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
import org.springframework.stereotype.Service;
import org.springframework.web.util.UriComponentsBuilder;
diff --git
a/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/TrafficViolationRestService.java
b/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/TrafficViolationRestService.java
index b849093bc..a3a585435 100644
---
a/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/TrafficViolationRestService.java
+++
b/kogito-springboot-examples/process-decisions-rest-springboot/src/main/java/org/kie/kogito/traffic/TrafficViolationRestService.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;
import org.springframework.web.util.UriComponentsBuilder;
diff --git
a/kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
b/kogito-springboot-examples/process-infinispan-persistence-springboot/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java
similarity index 53%
copy from
kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
copy to
kogito-springboot-examples/process-infinispan-persistence-springboot/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java
index 3905901b4..9fec3e233 100644
---
a/kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
+++
b/kogito-springboot-examples/process-infinispan-persistence-springboot/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfiguration.java
@@ -16,23 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.kie.kogito.tests;
+package org.springframework.boot.autoconfigure.cache;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
-
-@SpringBootApplication(scanBasePackages = { "org.kie.kogito.**",
"org.acme.travels.**" })
-public class KogitoInfinispanSpringbootApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(KogitoInfinispanSpringbootApplication.class,
args);
- }
-
- @Bean
- public RestTemplate restTemplate(RestTemplateBuilder builder) {
- return builder.build();
- }
+// Empty stub at the legacy FQN. infinispan-spring-boot3-starter-remote 15.2.6
declares
+// @AutoConfigureBefore(CacheAutoConfiguration.class) pointing here; the real
class lives at
+// org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration. Drop
when the Infinispan
+// starter targets that FQN.
+public class CacheAutoConfiguration {
}
diff --git
a/kogito-springboot-examples/process-monitoring-springboot/src/test/java/org/kie/kogito/examples/springboot/ProcessMetricsTest.java
b/kogito-springboot-examples/process-monitoring-springboot/src/test/java/org/kie/kogito/examples/springboot/ProcessMetricsTest.java
index 5692de7ae..d6232ffe0 100644
---
a/kogito-springboot-examples/process-monitoring-springboot/src/test/java/org/kie/kogito/examples/springboot/ProcessMetricsTest.java
+++
b/kogito-springboot-examples/process-monitoring-springboot/src/test/java/org/kie/kogito/examples/springboot/ProcessMetricsTest.java
@@ -25,7 +25,6 @@ import org.kie.kogito.Model;
import org.kie.kogito.process.Process;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
-import
org.springframework.boot.test.autoconfigure.actuate.observability.AutoConfigureObservability;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -42,7 +41,6 @@ import static
org.kie.kogito.test.utils.ProcessInstancesTestUtils.abort;
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = DemoApplication.class)
-@AutoConfigureObservability
public class ProcessMetricsTest {
private static final String PROJECT_VERSION =
ProjectMetadataProvider.getProjectVersion();
diff --git
a/kogito-springboot-examples/process-rest-service-call-springboot/pom.xml
b/kogito-springboot-examples/process-rest-service-call-springboot/pom.xml
index b6b402b47..c69403a09 100644
--- a/kogito-springboot-examples/process-rest-service-call-springboot/pom.xml
+++ b/kogito-springboot-examples/process-rest-service-call-springboot/pom.xml
@@ -55,6 +55,11 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
+ <!-- spring-boot-restclient: hosts RestTemplateBuilder
(org.springframework.boot.restclient). -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-restclient</artifactId>
+ </dependency>
<!-- jBPM -->
<dependency>
diff --git
a/kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
b/kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
index 3905901b4..baa042b9d 100644
---
a/kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
+++
b/kogito-springboot-examples/process-rest-service-call-springboot/src/main/java/org/kie/kogito/tests/KogitoInfinispanSpringbootApplication.java
@@ -20,7 +20,7 @@ package org.kie.kogito.tests;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.client.RestTemplateBuilder;
+import org.springframework.boot.restclient.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestTemplate;
diff --git
a/kogito-springboot-examples/process-usertasks-with-security-oidc-springboot/src/main/java/org/kie/kogito/springboot/DefaultWebSecurityConfig.java
b/kogito-springboot-examples/process-usertasks-with-security-oidc-springboot/src/main/java/org/kie/kogito/springboot/DefaultWebSecurityConfig.java
index 52dbc7dd0..762f3cb23 100644
---
a/kogito-springboot-examples/process-usertasks-with-security-oidc-springboot/src/main/java/org/kie/kogito/springboot/DefaultWebSecurityConfig.java
+++
b/kogito-springboot-examples/process-usertasks-with-security-oidc-springboot/src/main/java/org/kie/kogito/springboot/DefaultWebSecurityConfig.java
@@ -30,14 +30,13 @@ class DefaultWebSecurityConfig {
@Bean
public SecurityFilterChain configure(HttpSecurity http) throws Exception {
- http.authorizeHttpRequests()
- .anyRequest()
- .authenticated()
- .and()
- .oauth2ResourceServer().jwt();
- http.cors()
- .and()
- .csrf().disable();
+ http
+ .authorizeHttpRequests(authz ->
authz.anyRequest().authenticated())
+ .oauth2ResourceServer(oauth2 -> oauth2.jwt(jwt -> {
+ }))
+ .cors(cors -> {
+ })
+ .csrf(csrf -> csrf.disable());
return http.build();
}
}
diff --git
a/kogito-springboot-examples/process-usertasks-with-security-springboot/src/main/java/org/kie/kogito/tests/DefaultWebSecurityConfig.java
b/kogito-springboot-examples/process-usertasks-with-security-springboot/src/main/java/org/kie/kogito/tests/DefaultWebSecurityConfig.java
index 61b13bab9..1a2a3028a 100644
---
a/kogito-springboot-examples/process-usertasks-with-security-springboot/src/main/java/org/kie/kogito/tests/DefaultWebSecurityConfig.java
+++
b/kogito-springboot-examples/process-usertasks-with-security-springboot/src/main/java/org/kie/kogito/tests/DefaultWebSecurityConfig.java
@@ -37,11 +37,10 @@ public class DefaultWebSecurityConfig {
@Bean
public SecurityFilterChain configure(HttpSecurity http) throws Exception {
http
- .csrf().disable()
- .authorizeHttpRequests()
- .requestMatchers("/**").authenticated()
- .and()
- .httpBasic();
+ .csrf(csrf -> csrf.disable())
+ .authorizeHttpRequests(authz ->
authz.requestMatchers("/**").authenticated())
+ .httpBasic(httpBasic -> {
+ });
return http.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
