#545: update devon4j to 2022.04.001 (#762)

devonfw · May 23, 2022 · 0bf3e8e · 0bf3e8e
1 parent 173f2c2
commit 0bf3e8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/configurator/src/main/java/com/devonfw/tools/ide/migrator/Migrations.java b/configurator/src/main/java/com/devonfw/tools/ide/migrator/Migrations.java
@@ -162,8 +162,8 @@ public static MigrationImpl devon4j() {
         .pom().replaceProperty("devon4j.version", "2020.04.001") //
         .replaceDependency(new VersionIdentifier("com.devonfw.java.modules", "devon4j-beanmapping", null),
             new VersionIdentifier("com.devonfw.java.modules", "devon4j-beanmapping-dozer", null))
-        .and().java().replace("this.flyway.setTarget(this.migrationVersion);", "//TODO: remove the empty if")
-        .and().java().replace("new PageRequest", "PageRequest.of").replace("new Sort", "Sort.by").and().next()
+        .and().java().replace("this.flyway.setTarget(this.migrationVersion);", "//TODO: remove the empty if").and()
+        .java().replace("new PageRequest", "PageRequest.of").replace("new Sort", "Sort.by").and().next()
         .to(VersionIdentifier.ofDevon4j("2020.04.002")).pom().replaceProperty("devon4j.version", "2020.04.002") //
         .replaceDependency(
             new VersionIdentifier("com.devonfw.java.modules", "devon4j-test", null, VersionIdentifier.SCOPE_TEST),
@@ -195,6 +195,14 @@ public static MigrationImpl devon4j() {
         .next().to(VersionIdentifier.ofDevon4j("2021.04.003")).pom() //
         .replaceProperty("devon4j.version", "2021.04.003") //
         .and() //
+        .next().to(VersionIdentifier.ofDevon4j("2022.04.001")).pom() //
+        .replaceProperty("devon4j.version", "2022.04.001") //
+        .replaceProperty("spring.boot.version", "2.6.7") //
+        .replaceProperty("spring.cloud.dependencies.version", "2021.0.1") //
+        .replaceProperty("jackson.version", "2.13.2.20220328") //
+        .replaceProperty("guava.version", "31.1-jre") //
+        .replaceProperty("cxf.version", "3.5.2") //
+        .and() //
         .next().build();
   }
 

diff --git a/settings/src/main/settings b/settings/src/main/settings
+2 −2		devon/conf/.m2/settings.xml
+1 −1		eclipse/archetype-catalog.xml
+0 −1		eclipse/plugins/anyedit.properties
+1 −2		eclipse/plugins/checkstyle.properties
+1 −1		eclipse/plugins/eclipsepde.properties
+2 −2		eclipse/plugins/freemarker.properties
+1 −1		eclipse/plugins/pydev.properties
+1 −1		eclipse/plugins/regexutil.properties
+1 −2		eclipse/plugins/spotbugs.properties
+2 −2		eclipse/plugins/swtbot.properties
+3 −0		eclipse/workspace/setup/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
+2 −0		intellij/plugins/scala.properties
+1 −2		projects/cobigen.properties