Skip to content

Commit 98dc0be

Browse files
committed
really hide cyclonedx plugin when building on Java 7
1 parent cc9899d commit 98dc0be

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

create-bin-dist.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ mkdir -p target/bindist-tmp/xmlunit-$1
2525
cp README.md LICENSE RELEASE_NOTES.md target/bindist-tmp/xmlunit-$1
2626
cp */target/*.jar target/bindist-tmp/xmlunit-$1
2727
cp -r target/site/apidocs target/bindist-tmp/xmlunit-$1
28-
cp xmlunit-*/target/*-sbom.json target/bindist-tmp/xmlunit-$1
29-
cp xmlunit-*/target/*-sbom.* target
28+
cp xmlunit-*/target/*-cyclonedx.json target/bindist-tmp/xmlunit-$1
29+
cp xmlunit-*/target/*-cyclonedx.* target
3030
cd target/bindist-tmp
3131
zip -r xmlunit-$1-bin.zip xmlunit-$1
3232
tar cf xmlunit-$1-bin.tar xmlunit-$1
@@ -35,7 +35,7 @@ bzip2 xmlunit-$1-bin.tar
3535
mv xmlunit-$1-bin.* ..
3636

3737
cd ..
38-
for i in *.zip *.tar.gz *.tar.bz2 *-sbom.*; do
38+
for i in *.zip *.tar.gz *.tar.bz2 *-cyclonedx.*; do
3939
sha256sum $i > $i.sha256
4040
gpg --use-agent --detach-sign --armor $i
4141
done

pom.xml

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
<!-- overridden via profile for Java 8+ -->
3737
<javadoc.additionalparam></javadoc.additionalparam>
38-
<cyclonedx.skip>true</cyclonedx.skip>
3938

4039
<!-- need to set this to be 8 so the lambdas of assertj3's javadocs are
4140
accepted -->
@@ -387,24 +386,6 @@
387386
</execution>
388387
</executions>
389388
</plugin>
390-
<plugin>
391-
<groupId>org.cyclonedx</groupId>
392-
<artifactId>cyclonedx-maven-plugin</artifactId>
393-
<executions>
394-
<execution>
395-
<id>build-cyclonedx</id>
396-
<phase>package</phase>
397-
<goals>
398-
<goal>makeBom</goal>
399-
</goals>
400-
</execution>
401-
</executions>
402-
<configuration>
403-
<outputFormat>all</outputFormat>
404-
<outputName>${project.artifactId}-${project.version}-sbom</outputName>
405-
<skip>${cyclonedx.skip}</skip>
406-
</configuration>
407-
</plugin>
408389
</plugins>
409390
</build>
410391
<profiles>
@@ -540,6 +521,27 @@
540521
<javadoc.additionalparam>-Xdoclint:html,syntax,accessibility,reference</javadoc.additionalparam>
541522
<cyclonedx.skip>false</cyclonedx.skip>
542523
</properties>
524+
<build>
525+
<plugins>
526+
<plugin>
527+
<groupId>org.cyclonedx</groupId>
528+
<artifactId>cyclonedx-maven-plugin</artifactId>
529+
<executions>
530+
<execution>
531+
<id>build-cyclonedx</id>
532+
<phase>package</phase>
533+
<goals>
534+
<goal>makeBom</goal>
535+
</goals>
536+
</execution>
537+
</executions>
538+
<configuration>
539+
<outputFormat>all</outputFormat>
540+
<outputName>${project.artifactId}-${project.version}-cyclonedx</outputName>
541+
</configuration>
542+
</plugin>
543+
</plugins>
544+
</build>
543545
</profile>
544546
<profile>
545547
<id>java14+</id>

0 commit comments

Comments
 (0)