This is an automated email from the ASF dual-hosted git repository.
tzimanyi pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new b52d6f15b8 Upgrade to Spring Boot 3.4.7. (#3978)
b52d6f15b8 is described below
commit b52d6f15b88b0a3aa67f92a436b0bcb8b64edbbe
Author: Tibor Zimányi <[email protected]>
AuthorDate: Mon Jul 7 16:20:00 2025 +0200
Upgrade to Spring Boot 3.4.7. (#3978)
---
kogito-build/kogito-build-no-bom-parent/pom.xml | 2 +-
kogito-build/kogito-dependencies-bom/pom.xml | 14 +++++++-------
springboot/archetype/pom.xml | 9 +++++++--
.../AddDependencyToPomWithTextReplaceTest.groovy | 3 ++-
.../archetypes/AddDependencyToPomWithXmlTest.groovy | 7 ++++---
springboot/bom/pom.xml | 15 ++++++++++-----
6 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml
b/kogito-build/kogito-build-no-bom-parent/pom.xml
index 049178ef0f..7d72f4a661 100644
--- a/kogito-build/kogito-build-no-bom-parent/pom.xml
+++ b/kogito-build/kogito-build-no-bom-parent/pom.xml
@@ -79,7 +79,7 @@
<!-- plugin versions -->
<version.antapacheregexp>1.8.2</version.antapacheregexp>
<version.antrun.plugin>1.8</version.antrun.plugin>
- <version.archetype.plugin>3.2.1</version.archetype.plugin>
+ <version.archetype.plugin>3.4.0</version.archetype.plugin>
<version.asciidoctor.plugin>1.5.2.1</version.asciidoctor.plugin>
<version.build.helper.plugin>3.0.0</version.build.helper.plugin>
<version.clean.plugin>3.1.0</version.clean.plugin>
diff --git a/kogito-build/kogito-dependencies-bom/pom.xml
b/kogito-build/kogito-dependencies-bom/pom.xml
index fc871c7b88..fafd93f686 100644
--- a/kogito-build/kogito-dependencies-bom/pom.xml
+++ b/kogito-build/kogito-dependencies-bom/pom.xml
@@ -37,7 +37,7 @@
<!-- this version property is used in plugins but also in dependencies too
-->
<version.io.quarkus>3.20.1</version.io.quarkus>
<version.io.quarkus.quarkus-test>${version.io.quarkus}</version.io.quarkus.quarkus-test>
- <version.org.springframework.boot>3.4.6</version.org.springframework.boot>
+ <version.org.springframework.boot>3.4.7</version.org.springframework.boot>
<version.org.apache.kafka>3.9.0</version.org.apache.kafka>
<version.org.bouncycastle.bc.jdk18on>1.80</version.org.bouncycastle.bc.jdk18on>
@@ -73,7 +73,7 @@
<version.jakarta.validation-api>3.0.2</version.jakarta.validation-api>
<version.jakarta.xml.bind-api>4.0.1</version.jakarta.xml.bind-api>
- <version.io.netty>4.1.121.Final</version.io.netty>
+ <version.io.netty>4.1.122.Final</version.io.netty>
<version.io.cloudevents>3.0.0</version.io.cloudevents>
<!--
@@ -83,9 +83,9 @@
-->
<version.io.fabric8.kubernetes-client>7.1.0</version.io.fabric8.kubernetes-client>
<version.io.fabric8.openshift-mock>6.13.5</version.io.fabric8.openshift-mock>
- <version.io.micrometer>1.14.7</version.io.micrometer>
+ <version.io.micrometer>1.14.8</version.io.micrometer>
<version.org.flywaydb>11.8.0</version.org.flywaydb>
- <version.org.postgresql>42.7.5</version.org.postgresql>
+ <version.org.postgresql>42.7.7</version.org.postgresql>
<version.com.h2>2.3.232</version.com.h2> <!-- Overriding version 2.3.230
to fix https://github.com/h2database/h2database/issues/4079 -->
<version.io.serverlessworkflow>4.1.0.Final</version.io.serverlessworkflow>
<version.io.smallrye-open-api>4.0.10</version.io.smallrye-open-api>
@@ -109,7 +109,7 @@
<version.org.graalvm.nativeimage>23.1.2</version.org.graalvm.nativeimage>
- <version.org.infinispan>15.0.14.Final</version.org.infinispan>
+ <version.org.infinispan>15.0.15.Final</version.org.infinispan>
<version.org.infinispan.protostream>5.0.13.Final</version.org.infinispan.protostream>
<version.org.rocksdb>7.10.2</version.org.rocksdb>
@@ -137,8 +137,8 @@
<version.org.junit.platform>1.12.2</version.org.junit.platform><!--
otherwise Quarkus brings its own, silently disabling some tests -->
<version.org.mockito>5.17.0</version.org.mockito>
<version.org.testcontainers>1.20.6</version.org.testcontainers>
- <version.org.xmlunit-core>2.10.1</version.org.xmlunit-core>
- <version.io.rest-assured>5.5.2</version.io.rest-assured>
+ <version.org.xmlunit-core>2.10.2</version.org.xmlunit-core>
+ <version.io.rest-assured>5.5.5</version.io.rest-assured>
<version.net.byte-buddy>1.15.11</version.net.byte-buddy>
diff --git a/springboot/archetype/pom.xml b/springboot/archetype/pom.xml
index de51a35a81..d6c18802be 100644
--- a/springboot/archetype/pom.xml
+++ b/springboot/archetype/pom.xml
@@ -96,8 +96,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithTextReplaceTest.groovy
b/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithTextReplaceTest.groovy
index c67474b798..3a9148d70e 100644
---
a/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithTextReplaceTest.groovy
+++
b/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithTextReplaceTest.groovy
@@ -19,6 +19,7 @@
package org.kie.kogito.springboot.archetypes
import spock.lang.Specification
+import groovy.xml.XmlParser
import java.nio.charset.StandardCharsets
@@ -46,7 +47,7 @@ class AddDependencyToPomWithTextReplaceTest extends
Specification {
then:
Node pomXml = new XmlParser().parseText(pomFile)
- pomXml.depthFirst().dependencies.dependency.size() == 8
+ pomXml.depthFirst().dependencies.dependency.size() == 9
}
}
diff --git
a/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
b/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
index 4628e19fe4..065286d1a2 100644
---
a/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
+++
b/springboot/archetype/src/test/groovy/org/kie/kogito/springboot/archetypes/AddDependencyToPomWithXmlTest.groovy
@@ -20,6 +20,7 @@ package org.kie.kogito.springboot.archetypes
import spock.lang.Specification
+import groovy.xml.XmlParser
/*
Use this file to test the changes in the archetype-post-generate.groovy
@@ -33,7 +34,7 @@ class AddDependencyToPomWithXmlTest extends Specification {
Node pomXml = new
XmlParser().parse(this.getClass().getResourceAsStream(pomFile))
expect:
- pomXml.depthFirst().dependencies.dependency.size() == 5
+ pomXml.depthFirst().dependencies.dependency.size() == 6
}
def "Add a new dependency to original pom.xml"() {
@@ -46,7 +47,7 @@ class AddDependencyToPomWithXmlTest extends Specification {
pomXml.dependencies[0].children().add(0, newDep)
then:
- pomXml.depthFirst().dependencies.dependency.size() == 6
+ pomXml.depthFirst().dependencies.dependency.size() == 7
}
def "Add a list of new dependencies to original pom.xml"() {
@@ -64,7 +65,7 @@ class AddDependencyToPomWithXmlTest extends Specification {
}
then:
- pomXml.depthFirst().dependencies.dependency.size() == 8
+ pomXml.depthFirst().dependencies.dependency.size() == 9
}
}
\ No newline at end of file
diff --git a/springboot/bom/pom.xml b/springboot/bom/pom.xml
index c7b60b8b87..37c1d218ac 100644
--- a/springboot/bom/pom.xml
+++ b/springboot/bom/pom.xml
@@ -39,8 +39,8 @@
<version.org.springdoc>2.8.8</version.org.springdoc>
<!-- Groovy -->
<!-- must be aligned with the Archetype plugin:
https://maven.apache.org/archetype/maven-archetype-plugin/dependencies.html -->
- <version.org.codehaus.groovy>2.4.16</version.org.codehaus.groovy>
- <version.org.spockframework>1.3-groovy-2.4</version.org.spockframework>
+ <version.org.apache.groovy>4.0.27</version.org.apache.groovy>
+ <version.org.spockframework>2.2-groovy-4.0</version.org.spockframework>
<!-- Spring Boot Cloud aligned with Spring Boot Framework version. See:
https://spring.io/projects/spring-cloud -->
<!--
https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2022.0-Release-Notes
-->
<version.org.springframework.cloud>2024.0.1</version.org.springframework.cloud>
@@ -82,9 +82,14 @@
<version>${version.io.swagger.core.v3}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${version.org.codehaus.groovy}</version>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${version.org.apache.groovy}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${version.org.apache.groovy}</version>
</dependency>
<dependency>
<groupId>org.spockframework</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
