Skip to content

Commit 9d95209

Browse files
committed
Moved DependencyVersionHelper to test-utils and use it in integration-test
1 parent 2f93bf8 commit 9d95209

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

applications/spring-shell/src/test/java/org/springframework/sbm/BootUpgrade_27_30_IntegrationTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.openrewrite.maven.tree.Dependency;
2323
import org.openrewrite.maven.tree.MavenResolutionResult;
2424
import org.openrewrite.xml.tree.Xml;
25+
import org.springframework.sbm.helpers.DependencyVersionHelper;
2526

2627
import java.nio.file.Path;
2728
import java.util.List;
@@ -126,7 +127,8 @@ private void verifyJohnzonCoreDependencyIsUpgraded() {
126127

127128
assertThat(johnzonDependency.getClassifier()).isEqualTo("jakarta");
128129
assertThat(johnzonDependency.getArtifactId()).isEqualTo("johnzon-core");
129-
assertThat(johnzonDependency.getVersion()).isEqualTo("1.2.20");
130+
Optional<String> expectedJohnzonVersion = DependencyVersionHelper.getLatestReleaseVersion(johnzonDependency.getGroupId(), johnzonDependency.getArtifactId());
131+
assertThat(johnzonDependency.getVersion()).isEqualTo(expectedJohnzonVersion.get());
130132
}
131133

132134
@NotNull

pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@
8888
<artifactId>lombok</artifactId>
8989
<version>${lombok.version}</version>
9090
</dependency>
91-
<dependency>
92-
<groupId>org.apache.maven.wagon</groupId>
93-
<artifactId>wagon-http</artifactId>
94-
<version>3.5.3</version>
95-
</dependency>
96-
<dependency>
97-
<groupId>org.apache.maven.resolver</groupId>
98-
<artifactId>maven-resolver-transport-wagon</artifactId>
99-
<version>${resolverVersion}</version>
100-
</dependency>
91+
<!-- <dependency>-->
92+
<!-- <groupId>org.apache.maven.wagon</groupId>-->
93+
<!-- <artifactId>wagon-http</artifactId>-->
94+
<!-- <version>3.5.3</version>-->
95+
<!-- </dependency>-->
96+
<!-- <dependency>-->
97+
<!-- <groupId>org.apache.maven.resolver</groupId>-->
98+
<!-- <artifactId>maven-resolver-transport-wagon</artifactId>-->
99+
<!-- <version>${resolverVersion}</version>-->
100+
<!-- </dependency>-->
101101
<dependency>
102102
<groupId>org.springframework.sbm</groupId>
103103
<artifactId>test-helper</artifactId>

0 commit comments

Comments
 (0)