This is an automated email from the ASF dual-hosted git repository.
JiriOndrusek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-upgrade-recipes.git
The following commit(s) were added to refs/heads/main by this push:
new accc688 Sync Spring versions from the Spring Boot BOM with
cq:sync-versions
accc688 is described below
commit accc68843001a51d30ead021d1218326cd00523d
Author: jiriOndrusek-agent <[email protected]>
AuthorDate: Thu Nov 5 10:29:45 2026 +0000
Sync Spring versions from the Spring Boot BOM with cq:sync-versions
Fixes #138
Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
.github/workflows/ci-build.yaml | 5 +++++
README.adoc | 3 +++
camel-spring-boot-upgrade-recipes/pom.xml | 20 ++++++++++++++++----
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
index a6301d0..2de75a2 100644
--- a/.github/workflows/ci-build.yaml
+++ b/.github/workflows/ci-build.yaml
@@ -74,3 +74,8 @@ jobs:
- name: Build with Maven
run: mvn -B clean install -Dno-format
+
+ - name: Check Spring versions are in sync with the Spring Boot BOMs
+ run: |
+ mvn -B -f camel-spring-boot-upgrade-recipes cq:sync-versions -N
+ git diff --exit-code
diff --git a/README.adoc b/README.adoc
index 43b79ee..7e85614 100644
--- a/README.adoc
+++ b/README.adoc
@@ -91,6 +91,9 @@ This project is released as standard Apache Camel module.
<rewrite-recipe-bom.version>3.24.0</rewrite-recipe-bom.version>
```
+NOTE: The Spring Framework, Security and Batch versions in
`camel-spring-boot-upgrade-recipes/pom.xml` are annotated with `@sync` and
derived from the matching `spring-boot-dependencies` BOM.
+After changing a `spring-boot-*version` property, run `mvn -f
camel-spring-boot-upgrade-recipes cq:sync-versions -N` from the repository root
and commit the result. CI fails if they are out of sync.
+
NOTE: The `camel-latest-version` property is automatically verified by the
test suite (`LatestCamelVersionTest`) to match the highest version recipe file.
If you add a new version recipe (e.g., `4.21.yaml`), the test will fail until
you update the property.
Check that everything is alright and run:
diff --git a/camel-spring-boot-upgrade-recipes/pom.xml
b/camel-spring-boot-upgrade-recipes/pom.xml
index 80b5655..c80a356 100644
--- a/camel-spring-boot-upgrade-recipes/pom.xml
+++ b/camel-spring-boot-upgrade-recipes/pom.xml
@@ -32,15 +32,18 @@
<description>Migration recipes (using openrewrite) for Camel Spring Boot
to make Maven migrations easier</description>
<properties>
+ <!-- Items annotated with @sync are updated by running `mvn -f
camel-spring-boot-upgrade-recipes cq:sync-versions -N`
+ from the repository root. Run it after changing a spring-boot
version, otherwise CI fails. -->
+
<!-- versions for camel-spring-boot latest, has to be kept aligned to
the latest camel-spring-boot release -->
<spring-boot-version>4.1.2</spring-boot-version>
- <springframework-version>7.0.10</springframework-version>
- <spring-security-version>7.1.2</spring-security-version>
- <spring-batch-version>6.0.6</spring-batch-version>
+ <springframework-version>7.0.10</springframework-version><!-- @sync
org.springframework.boot:spring-boot-dependencies:${spring-boot-version}
prop:spring-framework.version -->
+ <spring-security-version>7.1.2</spring-security-version><!-- @sync
org.springframework.boot:spring-boot-dependencies:${spring-boot-version}
prop:spring-security.version -->
+ <spring-batch-version>6.0.6</spring-batch-version><!-- @sync
org.springframework.boot:spring-boot-dependencies:${spring-boot-version}
prop:spring-batch.version -->
<!-- Spring versions for CSB 4.18 LTS, has to be kept aligned to
camel-spring-boot 4.18.x -->
<spring-boot-4.18-lts-version>3.5.16</spring-boot-4.18-lts-version>
-
<springframework-4.18-lts-version>6.2.19</springframework-4.18-lts-version>
+
<springframework-4.18-lts-version>6.2.19</springframework-4.18-lts-version><!--
@sync
org.springframework.boot:spring-boot-dependencies:${spring-boot-4.18-lts-version}
prop:spring-framework.version -->
</properties>
<dependencyManagement>
@@ -103,5 +106,14 @@
</includes>
</resource>
</resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.l2x6.cq</groupId>
+ <artifactId>cq-maven-plugin</artifactId>
+ <version>4.29.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file
