From 84343282ba818008f44bfd4d335f5e75ba52e502 Mon Sep 17 00:00:00 2001 From: Andrei Shakirin Date: Thu, 18 Aug 2022 18:17:59 +0200 Subject: [PATCH 1/4] Updated test container dependency --- applications/spring-shell/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/spring-shell/pom.xml b/applications/spring-shell/pom.xml index cc8911851..f6bae19cd 100644 --- a/applications/spring-shell/pom.xml +++ b/applications/spring-shell/pom.xml @@ -79,7 +79,7 @@ test - com.github.testcontainers.testcontainers-java + org.testcontainers testcontainers ${testcontainers.version} test diff --git a/pom.xml b/pom.xml index 66a3b9dc1..651080e8c 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.9.1 2.7.2 0.9.3 - 9baedef17589ff70f7a585c809e0b1beb27eff62 + 1.17.3 3.2.0 3.1.4 1.18.24 From c6624e4371c28b89609255832556b12103fdf7fa Mon Sep 17 00:00:00 2001 From: Andrei Shakirin Date: Thu, 18 Aug 2022 19:18:42 +0200 Subject: [PATCH 2/4] Revert "Updated test container dependency" This reverts commit 84343282ba818008f44bfd4d335f5e75ba52e502. --- applications/spring-shell/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/spring-shell/pom.xml b/applications/spring-shell/pom.xml index f6bae19cd..cc8911851 100644 --- a/applications/spring-shell/pom.xml +++ b/applications/spring-shell/pom.xml @@ -79,7 +79,7 @@ test - org.testcontainers + com.github.testcontainers.testcontainers-java testcontainers ${testcontainers.version} test diff --git a/pom.xml b/pom.xml index 651080e8c..66a3b9dc1 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.9.1 2.7.2 0.9.3 - 1.17.3 + 9baedef17589ff70f7a585c809e0b1beb27eff62 3.2.0 3.1.4 1.18.24 From 4411cc3625c03e3b0e1a6872e32d34ae0ae74005 Mon Sep 17 00:00:00 2001 From: Andrei Shakirin Date: Mon, 19 Sep 2022 16:02:47 +0200 Subject: [PATCH 3/4] Added check for not found unmanaged dependency --- .../maven/spring/UpgradeUnmanagedSpringProject.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/sbm-openrewrite/src/main/java/org/openrewrite/maven/spring/UpgradeUnmanagedSpringProject.java b/components/sbm-openrewrite/src/main/java/org/openrewrite/maven/spring/UpgradeUnmanagedSpringProject.java index ae26374da..16a6526d9 100644 --- a/components/sbm-openrewrite/src/main/java/org/openrewrite/maven/spring/UpgradeUnmanagedSpringProject.java +++ b/components/sbm-openrewrite/src/main/java/org/openrewrite/maven/spring/UpgradeUnmanagedSpringProject.java @@ -149,8 +149,10 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext executionContext) { Xml.Tag resultTag = super.visitTag(tag, executionContext); if (isManagedDependencyTag()) { ResolvedManagedDependency managedDependency = findManagedDependency(resultTag); - String key = managedDependency.getGroupId() + ":" + managedDependency.getArtifactId(); - mayBeUpdateVersion(key, resultTag); + if (managedDependency != null) { + String key = managedDependency.getGroupId() + ":" + managedDependency.getArtifactId(); + mayBeUpdateVersion(key, resultTag); + } } if (isDependencyTag()) { ResolvedDependency dependency = findDependency(resultTag); From f27f6cb8b4cb06277628b3a5e9f186420475de28 Mon Sep 17 00:00:00 2001 From: Andrei Shakirin Date: Tue, 20 Sep 2022 15:21:56 +0200 Subject: [PATCH 4/4] Formatting --- .../BootUpgrade_27_30_ManuallyManaged_IntegrationTest.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_ManuallyManaged_IntegrationTest.java b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_ManuallyManaged_IntegrationTest.java index d0d51312e..0ed8e2984 100644 --- a/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_ManuallyManaged_IntegrationTest.java +++ b/applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_ManuallyManaged_IntegrationTest.java @@ -70,10 +70,6 @@ private void verifyManagedDependency(Xml.Document mavenAsXMLDocument, String art assertThat(managedDependency.get().getVersion()).isEqualTo(version); } - private void verifyDependency(Xml.Document mavenAsXMLDocument, String artifactId, String version) { - verifyDependencyWithClassifier(mavenAsXMLDocument, artifactId, version, null); - } - private void verifyDependencyWithClassifier(Xml.Document mavenAsXMLDocument, String artifactId, String version, String classifier) { Optional dependency = getDependencyByArtifactId(mavenAsXMLDocument, artifactId); assertThat(dependency).isPresent();