From 77799145c643994be6732730c62adff15f55c4f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Hohwiller?= Date: Mon, 23 May 2022 18:00:53 +0200 Subject: [PATCH] #545: update devon4j to 2022.04.001 --- .../com/devonfw/tools/ide/migrator/Migrations.java | 12 ++++++++++-- settings/src/main/settings | 2 +- 2 files changed, 11 insertions(+), 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 index 1e473640e..878c3f9df 100644 --- 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 index f3c731c63..1e7e0ede0 160000 --- a/settings/src/main/settings +++ b/settings/src/main/settings @@ -1 +1 @@ -Subproject commit f3c731c634643c7ea4a6b33216a837a1e5e1f5ee +Subproject commit 1e7e0ede083acb1b06e55d2eebc536096c548f76