Skip to content

Commit 90198f2

Browse files
authored
Merge pull request #314 from spyrkob/WFGP-289_upgrade_wf_channel
[WFGP-289] Upgrade wildfly-channels to 1.2.1.Final
2 parents 9107e5e + e8057af commit 90198f2

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

maven-plugin/src/main/java/org/wildfly/galleon/maven/AbstractFeaturePackBuildMojo.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -684,11 +684,15 @@ String createYAMLChannelManifest(WildFlyFeaturePackBuild buildConfig) throws IOE
684684
// add a stream for this feature pack
685685
streams.add(new org.wildfly.channel.Stream(project.getGroupId(), project.getArtifactId(), project.getVersion()));
686686

687-
ChannelManifest channelManifest = new ChannelManifest(format("Manifest for %s feature pack.", project.getArtifact()),
688-
project.getGroupId() + ":" + project.getArtifactId(),
689-
format("Generated by org.wildfly.galleon-plugins:wildfly-galleon-maven-plugin at %s", Clock.systemUTC().instant()),
690-
manifestRequirements,
691-
streams);
687+
ChannelManifest channelManifest = new ChannelManifest.Builder()
688+
.setSchemaVersion(ChannelManifestMapper.CURRENT_SCHEMA_VERSION)
689+
.setName(format("Manifest for %s feature pack.", project.getArtifact()))
690+
.setId(project.getGroupId() + ":" + project.getArtifactId())
691+
.setDescription(format("Generated by org.wildfly.galleon-plugins:wildfly-galleon-maven-plugin at %s", Clock.systemUTC().instant()))
692+
.addManifestRequirements(manifestRequirements.toArray(new ManifestRequirement[]{}))
693+
.addStreams(streams.toArray(new org.wildfly.channel.Stream[]{}))
694+
.build();
695+
692696
return ChannelManifestMapper.toYaml(channelManifest);
693697
}
694698

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<version.org.jboss.galleon>6.0.2.Final</version.org.jboss.galleon>
8080
<version.org.jboss.dmr>1.5.0.Final</version.org.jboss.dmr>
8181

82-
<version.org.wildfly.channel>1.0.5.Final</version.org.wildfly.channel>
82+
<version.org.wildfly.channel>1.2.1.Final</version.org.wildfly.channel>
8383
<version.org.wildfly.core.wildfly-core>24.0.0.Beta3</version.org.wildfly.core.wildfly-core>
8484
<version.org.wildfly.maven.plugins>2.0.0.Final</version.org.wildfly.maven.plugins>
8585

0 commit comments

Comments
 (0)