This is an automated email from the ASF dual-hosted git repository.
fmariani 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 3fa8d50 Update openrewrite + Camel 4.9 recipe with pom updates (#21)
3fa8d50 is described below
commit 3fa8d50f17d254a963baf9f132eded2eedf9c96a
Author: Federico Mariani <[email protected]>
AuthorDate: Thu Jan 23 13:53:37 2025 +0100
Update openrewrite + Camel 4.9 recipe with pom updates (#21)
* Update openrewrite + Camel recipe
* Handle rewrite-spring dependency via rewrite-recipe-bom
* Update to SB 3.4.0
* Add UpgradeParentVersion for Camel
---
camel-spring-boot-upgrade-recipes/pom.xml | 11 ++++---
.../src/main/resources/META-INF/rewrite/4.9.yaml | 2 +-
.../main/resources/META-INF/rewrite/latest.yaml | 38 ++++++++++++++++++----
camel-upgrade-recipes/pom.xml | 9 +++++
.../main/resources/META-INF/rewrite/latest.yaml | 22 +++++++++----
.../apache/camel/upgrade/CamelUpdate46Test.java | 3 +-
.../apache/camel/upgrade/CamelUpdate49Test.java | 30 +++++++++++++----
pom.xml | 4 ++-
8 files changed, 91 insertions(+), 28 deletions(-)
diff --git a/camel-spring-boot-upgrade-recipes/pom.xml
b/camel-spring-boot-upgrade-recipes/pom.xml
index b0ba423..f680c8f 100644
--- a/camel-spring-boot-upgrade-recipes/pom.xml
+++ b/camel-spring-boot-upgrade-recipes/pom.xml
@@ -29,13 +29,15 @@
<artifactId>camel-spring-boot-upgrade-recipes</artifactId>
- <name>Camel Spring Boot Upgrades Recipes</name>
- <description>Migration recipes (using openrewrite) for Camel Spring Boot
to make Maven migrations easier</description>
-
<properties>
- <spring-rewrite-version>5.24.1</spring-rewrite-version>
+ <!-- Use same version as
https://github.com/apache/camel-spring-boot/blob/${project.version}/pom.xml#L111C9-L111C57
-->
+ <spring-boot-version>3.4.0</spring-boot-version>
+ <springframework-version>6.2.0</springframework-version>
</properties>
+ <name>Camel Spring Boot Upgrades Recipes</name>
+ <description>Migration recipes (using openrewrite) for Camel Spring Boot
to make Maven migrations easier</description>
+
<dependencies>
<dependency>
<groupId>org.apache.camel.upgrade</groupId>
@@ -45,7 +47,6 @@
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-spring</artifactId>
- <version>${spring-rewrite-version}</version>
</dependency>
</dependencies>
diff --git
a/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
b/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
index d500f2e..b087f11 100644
---
a/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
+++
b/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
@@ -30,4 +30,4 @@ recipeList:
- org.openrewrite.maven.UpgradeDependencyVersion:
groupId: '*camel*'
artifactId: 'camel-spring-boot-bom'
- newVersion: @project.version@
\ No newline at end of file
+ newVersion: @camel-version@
\ No newline at end of file
diff --git
a/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
b/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
index 7ef78f9..9c4b9a0 100644
---
a/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
+++
b/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
@@ -17,10 +17,11 @@
---
type: specs.openrewrite.org/v1beta/recipe
name: org.apache.camel.upgrade.CamelSpringBootMigrationRecipe
-displayName: Migrates `Camel Spring Boot` application to the latest version
-description: Migrates `Camel Spring Boot` application to the latest version
+displayName: Migrate to Apache Camel Spring Boot @camel-version@
+description: >-
+ Migrate applications to Apache Camel Spring Boot @camel-version@ and Spring
Boot @spring-boot-version@
recipeList:
- - org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3
+ - org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3 # Update once SB
3_4 is released
- org.apache.camel.upgrade.camel49.CamelMigrationRecipe
- org.apache.camel.upgrade.camel47.CamelMigrationRecipe
- org.apache.camel.upgrade.camel46.CamelMigrationRecipe
@@ -30,12 +31,37 @@ recipeList:
- org.openrewrite.maven.UpgradeDependencyVersion:
groupId: '*camel*'
artifactId: 'camel-spring-boot-bom'
- newVersion: @project.version@
+ newVersion: @camel-version@
- org.openrewrite.maven.UpgradeDependencyVersion:
groupId: 'org.apache.camel.springboot'
artifactId: 'spring-boot'
- newVersion: @project.version@
+ newVersion: @camel-version@
- org.openrewrite.maven.UpgradeDependencyVersion:
groupId: 'org.apache.camel.springboot'
artifactId: 'camel-spring-boot-dependencies'
- newVersion: @project.version@
\ No newline at end of file
+ newVersion: @camel-version@
+ - org.openrewrite.maven.UpgradeDependencyVersion:
+ groupId: 'org.apache.camel.springboot'
+ artifactId: 'camel-spring-boot-dependencies'
+ newVersion: @camel-version@
+ # Remove Spring upgrades once
org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_4 is released
+ - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+ groupId: org.springframework.boot
+ artifactId: "*"
+ newVersion: @spring-boot-version@
+ overrideManagedVersion: false
+ - org.openrewrite.maven.UpgradePluginVersion:
+ groupId: org.springframework.boot
+ artifactId: spring-boot-maven-plugin
+ newVersion: @spring-boot-version@
+ - org.openrewrite.java.dependencies.UpgradeDependencyVersion:
+ groupId: org.springframework
+ artifactId: "*"
+ newVersion: @springframework-version@
+ - org.openrewrite.maven.UpgradeParentVersion:
+ groupId: org.springframework.boot
+ artifactId: spring-boot-starter-parent
+ newVersion: @spring-boot-version@
+ - org.openrewrite.gradle.plugins.UpgradePluginVersion:
+ pluginIdPattern: org.springframework.boot
+ newVersion: @spring-boot-version@
\ No newline at end of file
diff --git a/camel-upgrade-recipes/pom.xml b/camel-upgrade-recipes/pom.xml
index 2f8dd4a..f3b9b5e 100644
--- a/camel-upgrade-recipes/pom.xml
+++ b/camel-upgrade-recipes/pom.xml
@@ -121,6 +121,15 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.yaml</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<!-- to copy the dependencies for the test -->
diff --git
a/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
similarity index 68%
copy from
camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
copy to camel-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
index d500f2e..a8e5c33 100644
---
a/camel-spring-boot-upgrade-recipes/src/main/resources/META-INF/rewrite/4.9.yaml
+++ b/camel-upgrade-recipes/src/main/resources/META-INF/rewrite/latest.yaml
@@ -16,11 +16,11 @@
#
---
type: specs.openrewrite.org/v1beta/recipe
-name: org.apache.camel.upgrade.camel49.CamelSpringBootMigrationRecipe
-displayName: Migrates `Camel Spring Boot` application to `Camel Spring Boot
4.9`
-description: Migrates `Camel Spring Boot` application to `Camel Spring Boot
4.9`
+name: org.apache.camel.upgrade.CamelMigrationRecipe
+displayName: Migrate to @camel-version@
+description: Migrates Apache Camel application to @camel-version@
recipeList:
- - org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_3
+ - org.openrewrite.java.migrate.UpgradeToJava17
- org.apache.camel.upgrade.camel49.CamelMigrationRecipe
- org.apache.camel.upgrade.camel47.CamelMigrationRecipe
- org.apache.camel.upgrade.camel46.CamelMigrationRecipe
@@ -28,6 +28,14 @@ recipeList:
- org.apache.camel.upgrade.camel44.CamelMigrationRecipe
- org.apache.camel.upgrade.camel40.CamelMigrationRecipe
- org.openrewrite.maven.UpgradeDependencyVersion:
- groupId: '*camel*'
- artifactId: 'camel-spring-boot-bom'
- newVersion: @project.version@
\ No newline at end of file
+ groupId: 'org.apache.camel'
+ artifactId: '*'
+ newVersion: @camel-version@
+ - org.openrewrite.maven.UpgradePluginVersion:
+ groupId: 'org.apache.camel'
+ artifactId: '*'
+ newVersion: @camel-version@
+ - org.openrewrite.maven.UpgradeParentVersion:
+ groupId: 'org.apache.camel'
+ artifactId: '*'
+ newVersion: @camel-version@
\ No newline at end of file
diff --git
a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate46Test.java
b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate46Test.java
index 0b78b8f..282467c 100644
---
a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate46Test.java
+++
b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate46Test.java
@@ -222,6 +222,7 @@ public class CamelUpdate46Test implements RewriteTest {
""",
"""
import
org.apache.camel.component.langchain4j.chat.LangChain4jChat;
+ import
org.apache.camel.component.langchain4j.chat.LangChain4jChatComponent;
import
org.apache.camel.component.langchain4j.chat.LangChain4jChatOperations;
import
org.apache.camel.component.langchain4j.chat.LangChain4jChatProducer;
@@ -272,7 +273,7 @@ public class CamelUpdate46Test implements RewriteTest {
LangChain4jEmbeddingsConfiguration
langChainEmbeddingsConfiguration;
LangChain4jEmbeddingsConverter
langChainEmbeddingsConverter;
org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddingsEndpoint
langChainEmbeddingsEndpoint;
-
org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddings
langChainEmbeddings;
+
org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddingsComponent
langChainEmbeddings;
org.apache.camel.component.langchain4j.embeddings.LangChain4jEmbeddingsProducer
langChainEmbeddingsProducer;
}
}
diff --git
a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate49Test.java
b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate49Test.java
index 7489b4f..b7ec599 100644
---
a/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate49Test.java
+++
b/camel-upgrade-recipes/src/test/java/org/apache/camel/upgrade/CamelUpdate49Test.java
@@ -254,18 +254,34 @@ public class CamelUpdate49Test implements RewriteTest {
}
""",
"""
- import
org.apache.camel.component.debezium.configuration.MongodbConnectorEmbeddedDebeziumConfiguration;
- import
org.apache.camel.component.debezium.configuration.SqlserverConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.component.debezium.db2.*;
- import
org.apache.camel.component.debezium.db2.configuration.Db2ConnectorEmbeddedDebeziumConfiguration;
+ import
org.apache.camel.component.debezium.configuration.MongodbConnectorEmbeddedDebeziumConfiguration;
import org.apache.camel.component.debezium.mongodb.*;
- import org.apache.camel.component.debezium.mysql.*;
+ import
org.apache.camel.component.debezium.mysql.DebeziumMySqlComponent;
+ import
org.apache.camel.component.debezium.mysql.DebeziumMySqlEndpointUriFactory;
import
org.apache.camel.component.debezium.mysql.configuration.MySqlConnectorEmbeddedDebeziumConfiguration;
- import org.apache.camel.component.debezium.oracle.*;
+ import
org.apache.camel.component.debezium.oracle.DebeziumOracleComponent;
+ import
org.apache.camel.component.debezium.oracle.DebeziumOracleEndpointUriFactory;
import
org.apache.camel.component.debezium.oracle.configuration.OracleConnectorEmbeddedDebeziumConfiguration;
- import org.apache.camel.component.debezium.postgres.*;
+ import
org.apache.camel.component.debezium.postgres.DebeziumPostgresComponent;
+ import
org.apache.camel.component.debezium.postgres.DebeziumPostgresEndpointUriFactory;
import
org.apache.camel.component.debezium.postgres.configuration.PostgresConnectorEmbeddedDebeziumConfiguration;
- import org.apache.camel.component.debezium.sqlserver.*;
+ import
org.apache.camel.component.debezium.sqlserver.DebeziumSqlserverComponent;
+ import
org.apache.camel.component.debezium.mysql.DebeziumMySqlComponentConfigurer;
+ import
org.apache.camel.component.debezium.mysql.DebeziumMySqlEndpoint;
+ import
org.apache.camel.component.debezium.mysql.DebeziumMySqlEndpointConfigurer;
+ import
org.apache.camel.component.debezium.oracle.DebeziumOracleComponentConfigurer;
+ import
org.apache.camel.component.debezium.oracle.DebeziumOracleEndpoint;
+ import
org.apache.camel.component.debezium.oracle.DebeziumOracleEndpointConfigurer;
+ import
org.apache.camel.component.debezium.postgres.DebeziumPostgresComponentConfigurer;
+ import
org.apache.camel.component.debezium.postgres.DebeziumPostgresEndpoint;
+ import
org.apache.camel.component.debezium.postgres.DebeziumPostgresEndpointConfigurer;
+ import
org.apache.camel.component.debezium.configuration.SqlserverConnectorEmbeddedDebeziumConfiguration;
+ import
org.apache.camel.component.debezium.db2.configuration.Db2ConnectorEmbeddedDebeziumConfiguration;
+ import
org.apache.camel.component.debezium.sqlserver.DebeziumSqlserverComponentConfigurer;
+ import
org.apache.camel.component.debezium.sqlserver.DebeziumSqlserverEndpoint;
+ import
org.apache.camel.component.debezium.sqlserver.DebeziumSqlserverEndpointConfigurer;
+ import
org.apache.camel.component.debezium.sqlserver.DebeziumSqlserverEndpointUriFactory;
public class DebeziumTest {
diff --git a/pom.xml b/pom.xml
index 6c5ab6a..af4a295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,9 @@
<camel4.6-version>4.6.0</camel4.6-version>
<camel4.8-version>4.8.0</camel4.8-version>
- <rewrite-recipe-bom.version>2.21.1</rewrite-recipe-bom.version>
+ <camel-version>${project.version}</camel-version>
+
+ <rewrite-recipe-bom.version>2.23.1</rewrite-recipe-bom.version>
<lombok.version>1.18.34</lombok.version>
<slf4j.version>1.7.36</slf4j.version>
