Merge pull request #314 from spyrkob/WFGP-289_upgrade_wf_channel

[WFGP-289] Upgrade wildfly-channels to 1.2.1.Final
wildfly · Nov 12, 2024 · 90198f2 · 90198f2
2 parents 9107e5e + e8057af
commit 90198f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/maven-plugin/src/main/java/org/wildfly/galleon/maven/AbstractFeaturePackBuildMojo.java b/maven-plugin/src/main/java/org/wildfly/galleon/maven/AbstractFeaturePackBuildMojo.java
@@ -684,11 +684,15 @@ String createYAMLChannelManifest(WildFlyFeaturePackBuild buildConfig) throws IOE
         // add a stream for this feature pack
         streams.add(new org.wildfly.channel.Stream(project.getGroupId(), project.getArtifactId(), project.getVersion()));
 
-        ChannelManifest channelManifest = new ChannelManifest(format("Manifest for %s feature pack.", project.getArtifact()),
-                project.getGroupId() + ":" + project.getArtifactId(),
-                format("Generated by org.wildfly.galleon-plugins:wildfly-galleon-maven-plugin at %s", Clock.systemUTC().instant()),
-                manifestRequirements,
-                streams);
+        ChannelManifest channelManifest = new ChannelManifest.Builder()
+                .setSchemaVersion(ChannelManifestMapper.CURRENT_SCHEMA_VERSION)
+                .setName(format("Manifest for %s feature pack.", project.getArtifact()))
+                .setId(project.getGroupId() + ":" + project.getArtifactId())
+                .setDescription(format("Generated by org.wildfly.galleon-plugins:wildfly-galleon-maven-plugin at %s", Clock.systemUTC().instant()))
+                .addManifestRequirements(manifestRequirements.toArray(new ManifestRequirement[]{}))
+                .addStreams(streams.toArray(new org.wildfly.channel.Stream[]{}))
+                .build();
+
         return ChannelManifestMapper.toYaml(channelManifest);
     }
 

diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
     <version.org.jboss.galleon>6.0.2.Final</version.org.jboss.galleon>
     <version.org.jboss.dmr>1.5.0.Final</version.org.jboss.dmr>
 
-    <version.org.wildfly.channel>1.0.5.Final</version.org.wildfly.channel>
+    <version.org.wildfly.channel>1.2.1.Final</version.org.wildfly.channel>
     <version.org.wildfly.core.wildfly-core>24.0.0.Beta3</version.org.wildfly.core.wildfly-core>
     <version.org.wildfly.maven.plugins>2.0.0.Final</version.org.wildfly.maven.plugins>