|
| 1 | +From 94ccf32b4d0eb7c3191b4e5a646605e7386c39ff Mon Sep 17 00:00:00 2001 |
| 2 | +From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> |
| 3 | +Date: Tue, 11 Mar 2025 17:29:39 +0200 |
| 4 | +Subject: Update CycloneDX plugin |
| 5 | + |
| 6 | +--- |
| 7 | + dev/make-distribution.sh | 1 - |
| 8 | + pom.xml | 7 ++++++- |
| 9 | + 2 files changed, 6 insertions(+), 2 deletions(-) |
| 10 | + |
| 11 | +diff --git a/dev/make-distribution.sh b/dev/make-distribution.sh |
| 12 | +index ef7c010e93..0f4c1c74e4 100755 |
| 13 | +--- a/dev/make-distribution.sh |
| 14 | ++++ b/dev/make-distribution.sh |
| 15 | +@@ -171,7 +171,6 @@ BUILD_COMMAND=("$MVN" clean package \ |
| 16 | + -Dmaven.javadoc.skip=true \ |
| 17 | + -Dmaven.scaladoc.skip=true \ |
| 18 | + -Dmaven.source.skip \ |
| 19 | +- -Dcyclonedx.skip=true \ |
| 20 | + $@) |
| 21 | + |
| 22 | + # Actually build the jar |
| 23 | +diff --git a/pom.xml b/pom.xml |
| 24 | +index 68e2c422a2..6216ebb08e 100644 |
| 25 | +--- a/pom.xml |
| 26 | ++++ b/pom.xml |
| 27 | +@@ -3534,7 +3534,12 @@ |
| 28 | + <plugin> |
| 29 | + <groupId>org.cyclonedx</groupId> |
| 30 | + <artifactId>cyclonedx-maven-plugin</artifactId> |
| 31 | +- <version>2.7.9</version> |
| 32 | ++ <version>2.8.0</version> |
| 33 | ++ <configuration> |
| 34 | ++ <projectType>application</projectType> |
| 35 | ++ <schemaVersion>1.5</schemaVersion> |
| 36 | ++ <skipNotDeployed>false</skipNotDeployed> |
| 37 | ++ </configuration> |
| 38 | + <executions> |
| 39 | + <execution> |
| 40 | + <phase>package</phase> |
0 commit comments