diff --git a/README.md b/README.md index c581c36..4dcb74d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The project uses OpenRewrite, a framework for programmatically transforming and * **`Plug-and-play:`** No need to integrate this standalone tool into your own Frank!Framework project. Clone the project, and you're good to go. ## Limitations -* **`Limited version support:`** Currently we only support migrations between Frank!Framework-version 7.3.x through 9.0.x. +* **`Limited version support:`** Currently we only support migrations between Frank!Framework-version 7.3.x through 9.3.0. * **`Limited coverage:`** Currently we don't provide full coverage for all needed migrations. This project is still a work in progress and should be treated as such, don't blindly trust the output before commiting any changes to your project! ## Requirements @@ -33,7 +33,7 @@ Optionally you can provide your current Frank!Framework version if you want to r An example for migrating from 7.3.x to 9.0.x could be: -```.\runRecipes.bat ..\myproject\ 9_0 7_3``` +```.\runRecipes.bat ..\myproject\ 9_0_0 7_3``` ## How to contribute We endorse contributions to this project! If you would like to suggest any changes or even add additional missing recipes, please follow the following steps: diff --git a/installRecipes.bat b/installRecipes.bat index ca354ac..3f2ed3b 100644 --- a/installRecipes.bat +++ b/installRecipes.bat @@ -14,7 +14,7 @@ if not exist "%MVN_BAT%" ( exit /b 1 ) -set profiles=default 7_4 7_5 7_6 7_7 7_8 7_9 8_0 8_1 8_2 8_3 9_0 +set profiles=default 7_4 7_5 7_6 7_7 7_8 7_9_5 7_9_6 8_0_0 8_0_1 8_0_2 8_0_3 8_0_4 8_0_5 8_1_0 8_1_1 8_1_2 8_1_3 8_2_0 8_2_1 8_2_2 8_3_0 8_3_1 8_3_2 8_3_3 9_0_0 9_0_1 9_0_2 9_0_3 9_1_0 9_2_0 9_2_1 9_2_2 9_3_0 for %%p in (%profiles%) do ( if "%%p"=="default" ( echo Building with default profile... diff --git a/pom.xml b/pom.xml index 8c2e8a1..6e9834b 100644 --- a/pom.xml +++ b/pom.xml @@ -228,10 +228,10 @@ - 7_9 + 7_9_5 7.9.5 - ${artifactName}-7_9 + ${artifactName}-7_9_5 @@ -253,10 +253,222 @@ - 8_0 + 7_9_6 + + 7.9.6 + ${artifactName}-7_9_6 + + + + org.ibissource + ibis-adapterframework-akamai + ${iaf.version} + + + org.ibissource + ibis-adapterframework-larva + ${iaf.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + + 8_0_0 + + 8.0.0 + ${artifactName}-8_0_0 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_0_1 + + 8.0.1 + ${artifactName}-8_0_1 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_0_2 + + 8.0.2 + ${artifactName}-8_0_2 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_0_3 8.0.3 - ${artifactName}-8_0 + ${artifactName}-8_0_3 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_0_4 + + 8.0.4 + ${artifactName}-8_0_4 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_0_5 + + 8.0.5 + ${artifactName}-8_0_5 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_1_0 + + 8.1.0 + ${artifactName}-8_1_0 org.frankframework @@ -284,10 +496,72 @@ - 8_1 + 8_1_1 8.1.1 - ${artifactName}-8_1 + ${artifactName}-8_1_1 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_1_2 + + 8.1.2 + ${artifactName}-8_1_2 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + + 8_1_3 + + 8.1.3 + ${artifactName}-8_1_3 org.frankframework @@ -314,12 +588,11 @@ - - 8_2 + 8_2_0 8.2.0 - ${artifactName}-8_2 + ${artifactName}-8_2_0 org.frankframework @@ -345,12 +618,11 @@ - - 8_3 + 8_2_1 - 8.3.0 - ${artifactName}-8_3 + 8.2.1 + ${artifactName}-8_2_1 org.frankframework @@ -376,12 +648,402 @@ - - 9_0 + 8_2_2 - 9.0.0 - ${artifactName}-9_0 + 8.2.2 + ${artifactName}-8_2_2 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 8_3_0 + + 8.3.0 + ${artifactName}-8_3_0 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 8_3_1 + + 8.3.1 + ${artifactName}-8_3_1 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 8_3_2 + + 8.3.2 + ${artifactName}-8_3_2 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 8_3_3 + + 8.3.3 + ${artifactName}-8_3_3 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + + 9_0_0 + + 9.0.0 + ${artifactName}-9_0_0 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_0_1 + + 9.0.1 + ${artifactName}-9_0_1 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_0_2 + + 9.0.2 + ${artifactName}-9_0_2 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_0_3 + + 9.0.3 + ${artifactName}-9_0_3 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_1_0 + + 9.1.0 + ${artifactName}-9_1_0 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_2_0 + + 9.2.0 + ${artifactName}-9_2_0 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_2_1 + + 9.2.1 + ${artifactName}-9_2_1 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_2_2 + + 9.2.2 + ${artifactName}-9_2_2 + org.frankframework + + + + org.frankframework + frankframework-akamai + ${ff.version} + + + org.frankframework + frankframework-larva + ${ff.version} + + + org.frankframework + frankframework-batch + ${ff.version} + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + + + + + 9_3_0 + + 9.3.0 + ${artifactName}-9_3_0 org.frankframework diff --git a/rewritepom.xml b/rewritepom.xml index 6fc1692..6d8d4b3 100644 --- a/rewritepom.xml +++ b/rewritepom.xml @@ -11,7 +11,7 @@ frankrewrite org.frankrewrite.7_3_to_7_4, - org.frankrewrite.7_4_to_7_5, + org.frankrewrite.7_4_to_7_5_2, org.frankrewrite.7_5_to_7_6, org.frankrewrite.7_6_to_7_7, @@ -73,20 +73,29 @@ - 7_9 + 7_9_5 - ${artifactId}-7_9 + ${artifactId}-7_9_5 - org.frankrewrite.7_8_to_7_9, + org.frankrewrite.7_8_to_7_9_5, - 8_0 + 7_9_6 - ${artifactId}-8_0 + ${artifactId}-7_9_6 - org.frankrewrite.7_9_to_8_0, + org.frankrewrite.7_9_5_to_7_9_6, + + + + + 8_0_0 + + ${artifactId}-8_0_0 + + org.frankrewrite.7_9_6_to_8_0_0, jakarta.servlet @@ -100,11 +109,11 @@ - 8_1 + 8_0_1 - ${artifactId}-8_1 + ${artifactId}-8_0_1 - org.frankrewrite.8_0_to_8_1, + org.frankrewrite.8_0_0_to_8_0_1, jakarta.servlet @@ -118,11 +127,11 @@ - 8_2 + 8_0_2 - ${artifactId}-8_2 + ${artifactId}-8_0_2 - org.frankrewrite.8_1_to_8_2, + org.frankrewrite.8_0_1_to_8_0_2, jakarta.servlet @@ -136,11 +145,11 @@ - 8_3 + 8_0_3 - ${artifactId}-8_3 + ${artifactId}-8_0_3 - org.frankrewrite.8_2_to_8_3, + org.frankrewrite.8_0_2_to_8_0_3, jakarta.servlet @@ -154,11 +163,389 @@ - 9_0 + 8_0_4 + + ${artifactId}-8_0_4 + + org.frankrewrite.8_0_3_to_8_0_4, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_0_5 + + ${artifactId}-8_0_5 + + org.frankrewrite.8_0_4_to_8_0_5, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_1_0 + + ${artifactId}-8_1_0 + + org.frankrewrite.8_0_5_to_8_1_0, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_1_1 + + ${artifactId}-8_1_1 + + org.frankrewrite.8_1_0_to_8_1_1, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_1_2 + + ${artifactId}-8_1_2 + + org.frankrewrite.8_1_1_to_8_1_2, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_1_3 + + ${artifactId}-8_1_3 + + org.frankrewrite.8_1_2_to_8_1_3, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_2_0 + + ${artifactId}-8_2_0 + + org.frankrewrite.8_1_3_to_8_2_0, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_2_1 + + ${artifactId}-8_2_1 + + org.frankrewrite.8_2_0_to_8_2_1, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_2_2 + + ${artifactId}-8_2_2 + + org.frankrewrite.8_2_1_to_8_2_2, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_3_0 + + ${artifactId}-8_3_0 + + org.frankrewrite.8_2_2_to_8_3_0, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_3_1 + + ${artifactId}-8_3_1 + + org.frankrewrite.8_3_0_to_8_3_1, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_3_2 + + ${artifactId}-8_3_2 + + org.frankrewrite.8_3_1_to_8_3_2, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 8_3_3 + + ${artifactId}-8_3_3 + + org.frankrewrite.8_3_2_to_8_3_3, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_0_0 + + ${artifactId}-9_0_0 + + org.frankrewrite.8_3_3_to_9_0_0, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_0_1 + + ${artifactId}-9_0_1 + + org.frankrewrite.9_0_0_to_9_0_1, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_0_2 + + ${artifactId}-9_0_2 + + org.frankrewrite.9_0_1_to_9_0_2, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_0_3 + + ${artifactId}-9_0_3 + + org.frankrewrite.9_0_2_to_9_0_3, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_1_0 + + ${artifactId}-9_1_0 + + org.frankrewrite.9_0_3_to_9_1_0, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_2_0 + + ${artifactId}-9_2_0 + + org.frankrewrite.9_1_0_to_9_2_0, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_2_1 + + ${artifactId}-9_2_1 + + org.frankrewrite.9_2_0_to_9_2_1, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_2_2 + + ${artifactId}-9_2_2 + + org.frankrewrite.9_2_1_to_9_2_2, + + + jakarta.servlet + + + jakarta.servlet-api + + + 6.1.0 + + + + + 9_3_0 - ${artifactId}-9_0 + ${artifactId}-9_3 - org.frankrewrite.8_3_to_9_0, + org.frankrewrite.9_2_2_to_9_3_0, jakarta.servlet diff --git a/runRecipes.bat b/runRecipes.bat index bd526ea..c494342 100644 --- a/runRecipes.bat +++ b/runRecipes.bat @@ -28,7 +28,7 @@ set "TARGET_PROFILE=%2" set "SOURCE_VERSION=%3" REM Define the valid version list -set "VALID_VERSIONS=7_3 7_4 7_5 7_6 7_7 7_8 7_9 8_0 8_1 8_2 8_3 9_0" +set "VALID_VERSIONS=7_3 7_4 7_5 7_6 7_7 7_8 7_9_5 7_9_6 8_0_0 8_0_1 8_0_2 8_0_3 8_0_4 8_0_5 8_1_0 8_1_1 8_1_2 8_1_3 8_2_0 8_2_1 8_2_2 8_3_0 8_3_1 8_3_2 8_3_3 9_0_0 9_0_1 9_0_2 9_0_3 9_1_0 9_2_0 9_2_1 9_2_2 9_3_0" REM Ensure the target directory exists if not exist "%TARGET_DIR%" ( diff --git a/src/main/java/org/frankrewrite/recipes/FrameworkVersionRecipe.java b/src/main/java/org/frankrewrite/recipes/FrameworkVersionRecipe.java index b35d0fc..77051c9 100644 --- a/src/main/java/org/frankrewrite/recipes/FrameworkVersionRecipe.java +++ b/src/main/java/org/frankrewrite/recipes/FrameworkVersionRecipe.java @@ -62,7 +62,8 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext executionContext) { if (tagValue.isPresent() &&!tagValue.get().equals(version) &&(tag.getName().equals("iaf.version")|| - tag.getName().equals("ff.version"))) { + tag.getName().equals("ff.version")|| + tag.getName().equals("frankframework.version"))) { return tag.withValue(version); } return super.visitTag(tag, executionContext); diff --git a/src/main/java/org/frankrewrite/recipes/ConvertFilePipeRecipe.java b/src/main/java/org/frankrewrite/recipes/IntroduceLocalFileSystemPipeForFilePipeRecipe.java similarity index 84% rename from src/main/java/org/frankrewrite/recipes/ConvertFilePipeRecipe.java rename to src/main/java/org/frankrewrite/recipes/IntroduceLocalFileSystemPipeForFilePipeRecipe.java index 99b50cc..ca844a2 100644 --- a/src/main/java/org/frankrewrite/recipes/ConvertFilePipeRecipe.java +++ b/src/main/java/org/frankrewrite/recipes/IntroduceLocalFileSystemPipeForFilePipeRecipe.java @@ -15,14 +15,14 @@ */ package org.frankrewrite.recipes; -import org.frankrewrite.recipes.visitors.ConvertFilePipeVisitor; +import org.frankrewrite.recipes.visitors.IntroduceLocalFileSystemPipeForFilePipeVisitor; import org.jetbrains.annotations.NotNull; import org.openrewrite.ExecutionContext; import org.openrewrite.NlsRewrite; import org.openrewrite.Recipe; import org.openrewrite.TreeVisitor; -public class ConvertFilePipeRecipe extends Recipe { +public class IntroduceLocalFileSystemPipeForFilePipeRecipe extends Recipe { @Override public @NlsRewrite.DisplayName @NotNull String getDisplayName() { return "Convert FilePipe to LocalFileSystemPipe"; @@ -35,6 +35,6 @@ public class ConvertFilePipeRecipe extends Recipe { @Override public @NotNull TreeVisitor getVisitor() { - return new ConvertFilePipeVisitor(); + return new IntroduceLocalFileSystemPipeForFilePipeVisitor(); } } diff --git a/src/main/java/org/frankrewrite/recipes/visitors/ConvertFilePipeVisitor.java b/src/main/java/org/frankrewrite/recipes/visitors/IntroduceLocalFileSystemPipeForFilePipeVisitor.java similarity index 70% rename from src/main/java/org/frankrewrite/recipes/visitors/ConvertFilePipeVisitor.java rename to src/main/java/org/frankrewrite/recipes/visitors/IntroduceLocalFileSystemPipeForFilePipeVisitor.java index 6a98968..a6b51e1 100644 --- a/src/main/java/org/frankrewrite/recipes/visitors/ConvertFilePipeVisitor.java +++ b/src/main/java/org/frankrewrite/recipes/visitors/IntroduceLocalFileSystemPipeForFilePipeVisitor.java @@ -26,40 +26,7 @@ import static org.frankrewrite.recipes.util.TagHandler.getContent; -// public class ConvertFilePipeVisitor extends XmlIsoVisitor { -// @Override -// public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext executionContext) { -// //Find fileNameSessionKey attribute -// Optional fileNameSessionKeyAttributeOptional = TagHandler.getAttributeFromTagByKey(tag, "fileNameSessionKey"); -// Optional directoryAttributeOptional = TagHandler.getAttributeFromTagByKey(tag, "directory"); -// Optional filenameAttributeOptional = TagHandler.getAttributeFromTagByKey(tag, "filename"); - - -// //Ensure fileNameSessionKey attribute exists -// if (fileNameSessionKeyAttributeOptional.isPresent()) { -// Xml.Attribute fileNameSessionKeyAttribute = fileNameSessionKeyAttributeOptional.get(); - -// List content = getContent(tag); // To get rid of the wildcard type - -// // Determine the existing indentation level -// String parentIndent = tag.getPrefix(); // Prefix contains leading spaces & newlines -// String childIndent = parentIndent + " "; // Assuming 4-space indentation - -// // Convert fileNameSessionKey attribute value into multiple children with proper indentation -// String fileNameSessionKeyValue = fileNameSessionKeyAttribute.getValueAsString(); -// Xml.Tag value = Xml.Tag.build("") -// .withPrefix("\n" + childIndent); // Ensure correct indentation -// content.add(value); - -// return TagHandler.getTagWithoutAttribute(tag, "fileNameSessionKey")// Remove the original 'fileNameSessionKey' attribute -// .withContent(content) //Add parameters -// .withPrefix(parentIndent); // Maintain parent's indentation -// } - -// return super.visitTag(tag, executionContext); -// } -// } -public class ConvertFilePipeVisitor extends XmlIsoVisitor { +public class IntroduceLocalFileSystemPipeForFilePipeVisitor extends XmlIsoVisitor { @Override public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext executionContext) { //Find attributes diff --git a/src/main/resources/META-INF/rewrite/rewrite_7_x.yml b/src/main/resources/META-INF/rewrite/rewrite_7_x.yml index f586ed0..3344271 100644 --- a/src/main/resources/META-INF/rewrite/rewrite_7_x.yml +++ b/src/main/resources/META-INF/rewrite/rewrite_7_x.yml @@ -98,7 +98,7 @@ recipeList: attributeKeyFilter: "fileName" newKey: "filename" - org.frankrewrite.recipes.ParameterizedActionsRecipe - - org.frankrewrite.recipes.ConvertFilePipeRecipe + - org.frankrewrite.recipes.IntroduceLocalFileSystemPipeForFilePipeRecipe - org.frankrewrite.recipes.RemoveRecurringExitsRecipe - org.frankrewrite.recipes.FrameworkVersionRecipe: version: "7.6.5" @@ -192,7 +192,7 @@ recipeList: - org.frankrewrite.recipes.MoveReturnedSessionKeysRecipe --- type: specs.openrewrite.org/v1beta/recipe -name: org.frankrewrite.7_8_to_7_9 +name: org.frankrewrite.7_8_to_7_9_5 displayName: Recipe to migrate from 7.8.x to 7.9.5 description: Migrates franks from 7.8.x to 7.9.5. recipeList: @@ -211,3 +211,13 @@ recipeList: - org.openrewrite.xml.AddCommentToXmlTag: xPath: //CleanupOldFilesPipe commentText: CleanupOldFilesPipe need to be replaced by LocalFileSystemPipe +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.7_9_5_to_7_9_6 +displayName: Recipe to migrate from 7.9.5 to 7.9.6 +description: Migrates franks from 7.9.5 to 7.9.6. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "7.9.6" \ No newline at end of file diff --git a/src/main/resources/META-INF/rewrite/rewrite_8_x.yml b/src/main/resources/META-INF/rewrite/rewrite_8_x.yml index 5726e69..bd2ae65 100644 --- a/src/main/resources/META-INF/rewrite/rewrite_8_x.yml +++ b/src/main/resources/META-INF/rewrite/rewrite_8_x.yml @@ -22,9 +22,40 @@ # Notice how we can have multiple recipes in the same file, separated by `---` # You can also have multiple files in `src/main/resources/META-INF/rewrite`, each containing one or more recipes. type: specs.openrewrite.org/v1beta/recipe -name: org.frankrewrite.7_9_to_8_0 -displayName: Recipe to migrate from 7.9.x to 8.0.3 -description: Migrates franks from 7.9.x to 8.0.3. +name: org.frankrewrite.7_9_6_to_8_0_0 +displayName: Recipe to migrate from 7.9.6 to 8.0.0 +description: Migrates franks from 7.9.6 to 8.0.0. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.IntroduceBase64PipeForAttributeRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.0.0" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_0_0_to_8_0_1 +displayName: Recipe to migrate from 8.0.0 to 8.0.1 +description: Migrates franks from 8.0.0 to 8.0.1. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.0.1" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_0_1_to_8_0_2 +displayName: Recipe to migrate from 8.0.1 to 8.0.2 +description: Migrates franks from 8.0.1 to 8.0.2. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.0.2" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_0_2_to_8_0_3 +displayName: Recipe to migrate from 8.0.2 to 8.0.3 +description: Migrates franks from 8.0.2 to 8.0.3. recipeList: - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe @@ -47,9 +78,39 @@ recipeList: newArtifactId: "frankframework-webapp" --- type: specs.openrewrite.org/v1beta/recipe -name: org.frankrewrite.8_0_to_8_1 -displayName: Recipe to migrate from 8.0.x to 8.1.1 -description: Migrates franks from 8.0.x to 8.1.1. +name: org.frankrewrite.8_0_3_to_8_0_4 +displayName: Recipe to migrate from 8.0.3 to 8.0.4 +description: Migrates franks from 8.0.3 to 8.0.4. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.0.4" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_0_4_to_8_0_5 +displayName: Recipe to migrate from 8.0.4 to 8.0.5 +description: Migrates franks from 8.0.4 to 8.0.5. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.0.5" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_0_5_to_8_1_0 +displayName: Recipe to migrate from 8.0.5 to 8.1.0 +description: Migrates franks from 8.0.5 to 8.1.0. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.1.0" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_1_0_to_8_1_1 +displayName: Recipe to migrate from 8.1.0 to 8.1.1 +description: Migrates franks from 8.1.0 to 8.1.1. recipeList: - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe @@ -69,9 +130,29 @@ recipeList: newKey: "timeout" --- type: specs.openrewrite.org/v1beta/recipe -name: org.frankrewrite.8_1_to_8_2 -displayName: Recipe to migrate from 8.1.x to 8.2.0 -description: Migrates franks from 8.1.x to 8.2.0. +name: org.frankrewrite.8_1_1_to_8_1_2 +displayName: Recipe to migrate from 8.1.1 to 8.1.2 +description: Migrates franks from 8.1.1 to 8.1.2. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.1.2" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_1_2_to_8_1_3 +displayName: Recipe to migrate from 8.1.2 to 8.1.3 +description: Migrates franks from 8.1.2 to 8.1.3. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.1.3" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_1_3_to_8_2_0 +displayName: Recipe to migrate from 8.1.3 to 8.2.0 +description: Migrates franks from 8.1.3 to 8.2.0. recipeList: - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe @@ -79,7 +160,6 @@ recipeList: version: "8.2.0" - org.frankrewrite.recipes.IntroduceEchoPipeForFixedResultPipeRecipe - org.frankrewrite.recipes.IntroduceReplacerPipeForFixedResultPipeRecipe - - org.frankrewrite.recipes.IntroduceBase64PipeForAttributeRecipe - org.frankrewrite.recipes.ChangeAttributeValueToUnionTypeRecipe: attributeKey: "logLevel" tagName: "LarvaPipe" @@ -109,9 +189,29 @@ recipeList: value: "delete" --- type: specs.openrewrite.org/v1beta/recipe -name: org.frankrewrite.8_2_to_8_3 -displayName: Recipe to migrate from 8.2.x to 8.3.0 -description: Migrates franks from 8.2.x to 8.3.0. +name: org.frankrewrite.8_2_0_to_8_2_1 +displayName: Recipe to migrate from 8.2.0 to 8.2.1 +description: Migrates franks from 8.2.0 to 8.2.1. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.2.1" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_2_1_to_8_2_2 +displayName: Recipe to migrate from 8.2.1 to 8.2.2 +description: Migrates franks from 8.2.1 to 8.2.2. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.2.2" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_2_2_to_8_3_0 +displayName: Recipe to migrate from 8.2.2 to 8.3.0 +description: Migrates franks from 8.2.2 to 8.3.0. recipeList: - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe @@ -127,4 +227,34 @@ recipeList: childTagNameFilter: "forward" attributeKeyFilter: "name" attributeValueFilter: "failure" - newValue: "exception" \ No newline at end of file + newValue: "exception" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_3_0_to_8_3_1 +displayName: Recipe to migrate from 8.3.0 to 8.3.1 +description: Migrates franks from 8.3.0 to 8.3.1. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.3.1" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_3_1_to_8_3_2 +displayName: Recipe to migrate from 8.3.1 to 8.3.2 +description: Migrates franks from 8.3.1 to 8.3.2. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.3.2" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.8_3_2_to_8_3_3 +displayName: Recipe to migrate from 8.3.2 to 8.3.3 +description: Migrates franks from 8.3.2 to 8.3.3. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "8.3.3" \ No newline at end of file diff --git a/src/main/resources/META-INF/rewrite/rewrite_9_x.yml b/src/main/resources/META-INF/rewrite/rewrite_9_x.yml index ec5a95c..269f3e1 100644 --- a/src/main/resources/META-INF/rewrite/rewrite_9_x.yml +++ b/src/main/resources/META-INF/rewrite/rewrite_9_x.yml @@ -22,9 +22,9 @@ # Notice how we can have multiple recipes in the same file, separated by `---` # You can also have multiple files in `src/main/resources/META-INF/rewrite`, each containing one or more recipes. type: specs.openrewrite.org/v1beta/recipe -name: org.frankrewrite.8_3_to_9_0 -displayName: Recipe to migrate from 8.3.x to 9.0.0 -description: Migrates franks from 8.3.x to 9.0.0. +name: org.frankrewrite.8_3_3_to_9_0_0 +displayName: Recipe to migrate from 8.3.3 to 9.0.0 +description: Migrates franks from 8.3.3 to 9.0.0. recipeList: - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe @@ -52,5 +52,91 @@ recipeList: attributeKeyFilter: "authenticationRoles" newKey: "authenticationMethod" newValue: "AUTHROLE" + - org.frankrewrite.recipes.ReplaceTagNameRecipe: + oldName: "XmlIfPipe" + newName: "IfPipe" + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.0.0" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_0_0_to_9_0_1 +displayName: Recipe to migrate from 9.0.0 to 9.0.1 +description: Migrates franks from 9.0.0 to 9.0.1. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.0.1" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_0_1_to_9_0_2 +displayName: Recipe to migrate from 9.0.1 to 9.0.2 +description: Migrates franks from 9.0.1 to 9.0.2. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.0.2" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_0_2_to_9_0_3 +displayName: Recipe to migrate from 9.0.2 to 9.0.3 +description: Migrates franks from 9.0.2 to 9.0.3. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.0.3" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_0_3_to_9_1_0 +displayName: Recipe to migrate from 9.0.3 to 9.1.0 +description: Migrates franks from 9.0.3 to 9.1.0. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.1.0" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_1_0_to_9_2_0 +displayName: Recipe to migrate from 9.1.0 to 9.2.0 +description: Migrates franks from 9.1.0 to 9.2.0. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.ReplaceTagNameRecipe: + oldName: "XmlSwitchPipe" + newName: "SwitchPipe" + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.2.0" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_2_0_to_9_2_1 +displayName: Recipe to migrate from 9.2.0 to 9.2.1 +description: Migrates franks from 9.2.0 to 9.2.1. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.2.1" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_2_1_to_9_2_2 +displayName: Recipe to migrate from 9.2.1 to 9.2.2 +description: Migrates franks from 9.2.1 to 9.2.2. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.FrameworkVersionRecipe: + version: "9.2.2" +--- +type: specs.openrewrite.org/v1beta/recipe +name: org.frankrewrite.9_2_2_to_9_3_0 +displayName: Recipe to migrate from 9.2.2 to 9.3.0 +description: Migrates franks from 9.2.2 to 9.3.0. +recipeList: + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe + - org.frankrewrite.recipes.WarningAnnotationUpdaterRecipe - org.frankrewrite.recipes.FrameworkVersionRecipe: - version: "9.0.0" \ No newline at end of file + version: "9.3.0" \ No newline at end of file diff --git a/src/test/java/org/frankrewrite/recipes/ConvertFilePipeRecipeTest.java b/src/test/java/org/frankrewrite/recipes/IntroduceLocalFileSystemPipeForFilePipeRecipeTest.java similarity index 96% rename from src/test/java/org/frankrewrite/recipes/ConvertFilePipeRecipeTest.java rename to src/test/java/org/frankrewrite/recipes/IntroduceLocalFileSystemPipeForFilePipeRecipeTest.java index 1770c9e..410a74d 100644 --- a/src/test/java/org/frankrewrite/recipes/ConvertFilePipeRecipeTest.java +++ b/src/test/java/org/frankrewrite/recipes/IntroduceLocalFileSystemPipeForFilePipeRecipeTest.java @@ -21,10 +21,10 @@ import static org.openrewrite.xml.Assertions.xml; -public class ConvertFilePipeRecipeTest implements RewriteTest{ +public class IntroduceLocalFileSystemPipeForFilePipeRecipeTest implements RewriteTest{ @Override public void defaults(RecipeSpec spec) { - spec.recipe(new ConvertFilePipeRecipe()); + spec.recipe(new IntroduceLocalFileSystemPipeForFilePipeRecipe()); } @Test