Skip to content

Commit d720a3c

Browse files
committed
Fix for JBEAP-35974, Adjust the generated WildFly SBOM for Bootable JAR packaging
1 parent aa48bce commit d720a3c

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public ChannelMavenArtifactRepositoryManager(List<ChannelConfiguration> channels
9999
}
100100
return remoteRepository;
101101
};
102-
VersionResolverFactory factory = new VersionResolverFactory(system, session, mapper);
102+
VersionResolverFactory factory = new VersionResolverFactory(system, session, null, mapper);
103103
channelSession = new ChannelSession(resolutionChannels, factory);
104104
localCachePath = contextSession.getLocalRepositoryManager().getRepository().getBasedir().toPath();
105105
this.system = system;

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@ Of course, patches are welcome, too. Contributors can check out the project from
6565
The WildFly Maven plugin uses WildFly Glow to generate provisioning configuration. For more information on WildFly Glow
6666
you see the [documentation](https://docs.wildfly.org/wildfly-glow/).
6767

68+
#[[##]]# SBOM generation
69+
70+
Starting with WildFly 42.0.0.Final, the SBOM file ``sbom.cdx.json.gz`` (a gzip-compressed CycloneDX JSON file)
71+
is generated during server provisioning ([${pluginPrefix}:provision](./provision-mojo.html) and [${pluginPrefix}:package](./package-mojo.html) goals).
72+
For a server installation, the file is located at the root directory. For a Bootable JAR,
73+
it is located at ``META-INF/sbom/sbom.cdx.json.gz`` inside the jar.
74+
The WildFly Galleon plugins [documentation](http://docs.wildfly.org/galleon-plugins/#_galleon_plugins)
75+
describes the file format and the usage of the ``jboss-cyclonedx[-*]`` Galleon options.
76+
6877
#[[##]]# Examples
6978

7079
To provide you with better understanding of some usages of the ${project.name}, you can take a look into the

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
<!-- WildFly/JBoss dependencies -->
7777
<version.org.jboss.logging.jboss-logging>3.6.3.Final</version.org.jboss.logging.jboss-logging>
7878
<version.org.wildfly.checkstyle-config>1.0.8.Final</version.org.wildfly.checkstyle-config>
79-
<version.org.wildfly.plugin.tools>2.0.0.Beta1</version.org.wildfly.plugin.tools>
79+
<version.org.wildfly.plugin.tools>2.1.0.Final</version.org.wildfly.plugin.tools>
8080
<!-- This version property is also retrieved by plugin at runtime to resolve CLI artifact -->
8181
<version.org.wildfly.core>32.0.0.Final</version.org.wildfly.core>
8282
<version.org.wildfly.launcher>1.0.3.Final</version.org.wildfly.launcher>
8383
<version.org.wildfly />
84-
<version.org.wildfly.channel>1.2.2.Final</version.org.wildfly.channel>
85-
<version.org.wildfly.prospero>1.3.1.Final</version.org.wildfly.prospero>
84+
<version.org.wildfly.channel>1.4.0.Final</version.org.wildfly.channel>
85+
<version.org.wildfly.prospero>1.4.0.Final</version.org.wildfly.prospero>
8686
<!-- maven dependencies -->
8787
<version.javax.inject.javax.inject>1</version.javax.inject.javax.inject>
8888
<version.org.apache.maven.maven-core>3.9.15</version.org.apache.maven.maven-core>

0 commit comments

Comments
 (0)