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
index 8d3b48d78..8befe3a00 100644
--- 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
index cd1b2b6a9..841f54340 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
2.2
4.13.2
3.6.0
- 1.1.0.Final
+ 1.2.0.Final
3.10.1
33.0.2.Final
4.7.6
diff --git a/prospero-common/src/main/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolver.java b/prospero-common/src/main/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolver.java
index f9373051d..479f03b57 100644
--- a/prospero-common/src/main/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolver.java
+++ b/prospero-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 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/prospero-common/src/test/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolverTest.java b/prospero-common/src/test/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolverTest.java
index 01c5af4ef..4becf1bb9 100644
--- a/prospero-common/src/test/java/org/wildfly/prospero/actions/ProsperoManifestVersionResolverTest.java
+++ b/prospero-common/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