Remove CycloneDX, keep SPX only for now

leplusorg · Dec 14, 2024 · e1017c5 · e1017c5
1 parent 9da8d81
commit e1017c5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 24 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -75,19 +75,13 @@ jobs:
           else
             GPG_SKIP=false
           fi
-          if [ "${{ matrix.java }}" = "8" ]
-          then
-            CYCLONEDX_SKIP=true
-          else
-            CYCLONEDX_SKIP=false
-          fi
           # Forcing dependency check version to a version compatible
           # with Java 8 since version does not matter due to
           # dependencyCheck.skip=true. But otherwise Maven initialization
           # fails with error: "java.lang.TypeNotPresentException:
           # Type org.owasp.dependencycheck.maven.CheckMojo not present".
           # shellcheck disable=SC2086
-          ./mvnw ${MAVEN_CLI_OPTS} -DdependencyCheck.version=10.0.4 -DdependencyCheck.skip=true -Dgpg.skip=${GPG_SKIP} -Dcyclonedx.skip=${CYCLONEDX_SKIP} verify
+          ./mvnw ${MAVEN_CLI_OPTS} -DdependencyCheck.version=10.0.4 -DdependencyCheck.skip=true -Dgpg.skip=${GPG_SKIP} verify
       - name: Publish site
         env:
           GITHUB_TOKEN: ${{ github.token }}

diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,6 @@ limitations under the License.
     <dependencyCheck.version>11.1.1</dependencyCheck.version>
     <dependencyCheck.skip>false</dependencyCheck.skip>
     <dependencyCheck.threshold>7</dependencyCheck.threshold>
-    <cyclonedx.skip>false</cyclonedx.skip>
   </properties>
   <dependencies>
     <dependency>
@@ -331,22 +330,6 @@ limitations under the License.
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.cyclonedx</groupId>
-        <artifactId>cyclonedx-maven-plugin</artifactId>
-        <version>2.9.1</version>
-        <configuration>
-	  <skip>${cyclonedx.skip}</skip>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>makeAggregateBom</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <reporting>