Merge pull request #42 from jfdenise/JBEAP-35974

Fix for JBEAP-35974, Adjust the generated WildFly SBOM for Bootable JAR packaging

Author: jfdenise

plugin/src/main/java/org/wildfly/plugin/provision/ChannelMavenArtifactRepositoryManager.java

@@ -99,7 +99,7 @@ public ChannelMavenArtifactRepositoryManager(List<ChannelConfiguration> channels
             }
             return remoteRepository;
         };
-        VersionResolverFactory factory = new VersionResolverFactory(system, session, mapper);
+        VersionResolverFactory factory = new VersionResolverFactory(system, session, null, mapper);
         channelSession = new ChannelSession(resolutionChannels, factory);
         localCachePath = contextSession.getLocalRepositoryManager().getRepository().getBasedir().toPath();
         this.system = system;

plugin/src/site/markdown/index.md.vm

@@ -65,6 +65,15 @@ Of course, patches are welcome, too. Contributors can check out the project from
 The WildFly Maven plugin uses WildFly Glow to generate provisioning configuration. For more information on WildFly Glow
 you see the [documentation](https://docs.wildfly.org/wildfly-glow/).
 
+#[[##]]# SBOM generation
+
+Starting with WildFly 42.0.0.Final, the SBOM file ``sbom.cdx.json.gz`` (a gzip-compressed CycloneDX JSON file) 
+is generated during server provisioning ([${pluginPrefix}:provision](./provision-mojo.html) and [${pluginPrefix}:package](./package-mojo.html) goals).
+For a server installation, the file is located at the root directory. For a Bootable JAR, 
+it is located at ``META-INF/sbom/sbom.cdx.json.gz`` inside the jar. 
+The WildFly Galleon plugins [documentation](http://docs.wildfly.org/galleon-plugins/#_galleon_plugins) 
+describes the file format and the usage of the ``jboss-cyclonedx[-*]`` Galleon options.
+
 #[[##]]# Examples
 
   To provide you with better understanding of some usages of the ${project.name}, you can take a look into the

pom.xml

@@ -76,13 +76,13 @@
         <!-- WildFly/JBoss dependencies -->
         <version.org.jboss.logging.jboss-logging>3.6.3.Final</version.org.jboss.logging.jboss-logging>
         <version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
-        <version.org.wildfly.plugin.tools>2.0.0.Beta1</version.org.wildfly.plugin.tools>
+        <version.org.wildfly.plugin.tools>2.1.0.Final</version.org.wildfly.plugin.tools>
         <!-- This version property is also retrieved by plugin at runtime to resolve CLI artifact -->
         <version.org.wildfly.core>32.0.0.Final</version.org.wildfly.core>
         <version.org.wildfly.launcher>1.0.3.Final</version.org.wildfly.launcher>
         <version.org.wildfly />
-        <version.org.wildfly.channel>1.2.2.Final</version.org.wildfly.channel>
-        <version.org.wildfly.prospero>1.3.1.Final</version.org.wildfly.prospero>
+        <version.org.wildfly.channel>1.4.0.Final</version.org.wildfly.channel>
+        <version.org.wildfly.prospero>1.4.0.Final</version.org.wildfly.prospero>
         <!-- maven dependencies -->
         <version.javax.inject.javax.inject>1</version.javax.inject.javax.inject>
         <version.org.apache.maven.maven-core>3.9.15</version.org.apache.maven.maven-core>