Use logical-version field in manifest

wildfly-extras · Oct 15, 2024 · 17e2283 · 17e2283
1 parent 2404088
commit 17e2283
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/integration-tests/src/test/java/org/wildfly/prospero/it/cli/CacheManifestTest.java b/integration-tests/src/test/java/org/wildfly/prospero/it/cli/CacheManifestTest.java
@@ -102,7 +102,7 @@ public void setUp() throws Exception {
         ));
 
         // create and deploy second manifest
-        secondManifest = new ChannelManifest(null, null, null, null,
+        secondManifest = new ChannelManifest(null, null, null, null, null,
                 List.of(new Stream("org.wildfly.core", "wildfly-controller", UPGRADE_VERSION)));
         repositoryUtils.deployArtifact(new DefaultArtifact(
                 "org.test.channels",

diff --git a/pom.xml b/pom.xml
@@ -74,7 +74,7 @@
         <version.org.yaml.snakeyaml>2.2</version.org.yaml.snakeyaml>
         <version.junit>4.13.2</version.junit>
         <version.maven-shade-plugin>3.6.0</version.maven-shade-plugin>
-        <version.org.wildfly.channel>1.1.0.Final</version.org.wildfly.channel>
+        <version.org.wildfly.channel>1.2.0.Final</version.org.wildfly.channel>
         <version.maven-compiler-plugin>3.10.1</version.maven-compiler-plugin>
         <version.org.wildfly.galleon-pack>33.0.2.Final</version.org.wildfly.galleon-pack>
         <version.info.picocli>4.7.6</version.info.picocli>

diff --git a/...ro-common/src/main/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolver.java b/...ro-common/src/main/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolver.java
@@ -19,6 +19,7 @@
 
 import org.jboss.logging.Logger;
 import org.wildfly.channel.Channel;
+import org.wildfly.channel.ChannelManifest;
 import org.wildfly.channel.ChannelManifestMapper;
 import org.wildfly.channel.MavenArtifact;
 import org.wildfly.channel.MavenCoordinate;
@@ -84,7 +85,13 @@ public ManifestVersionRecord getCurrentVersions(List<Channel> channels) throws I
                     if (LOG.isDebugEnabled()) {
                         LOG.debugf("Manifest %s resolved in currently resolve artifacts, recording.", manifestCoord);
                     }
-                    final String description = ChannelManifestMapper.from(version.getFile().toURI().toURL()).getName();
+                    final ChannelManifest manifest = ChannelManifestMapper.from(version.getFile().toURI().toURL());
+                    final String description;
+                    if (manifest.getSchemaVersion().equals(ChannelManifestMapper.SCHEMA_VERSION_1_0_0)) {
+                        description = manifest.getName();
+                    } else {
+                        description = manifest.getLogicalVersion();
+                    }
                     record.addManifest(new ManifestVersionRecord.MavenManifest(
                             manifestCoord.getGroupId(),
                             manifestCoord.getArtifactId(),

diff --git a/...ommon/src/test/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolverTest.java b/...ommon/src/test/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolverTest.java
@@ -65,7 +65,7 @@ public class ProsperoManifestVersionResolverTest {
     public void setUp() throws Exception {
         manifestFile = temp.newFile("test");
         Files.writeString(manifestFile.toPath(), ChannelManifestMapper.toYaml(
-                new ChannelManifest("test-name", "test-id", "desc", null)));
+                new ChannelManifest("test-name", "test-id", "test-version", "desc", null, null)));
 
         // when the fallback resolver is called return an empty record to make the test pass
         when(manifestVersionResolver.getCurrentVersions(any())).thenReturn(new ManifestVersionRecord());
@@ -86,7 +86,7 @@ public void versionResolvedDuringProvisioning() throws Exception {
                 .containsOnly(A_VERSION);
         assertThat(currentVersions.getMavenManifests())
                 .map(ManifestVersionRecord.MavenManifest::getDescription)
-                .containsOnly("test-name");
+                .containsOnly("test-version");
     }
 
     @Test