From 300a4e8eed045ffd242f41c6eafbba32f16bc5d4 Mon Sep 17 00:00:00 2001
From: Russ Poetker <rpoetke1@jh.edu>
Date: Thu, 21 Nov 2024 08:34:42 -0500
Subject: [PATCH 1/3] Add cyclonedx maven plugin

---
 pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pom.xml b/pom.xml
index fd73b7a..c09e212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,7 @@
     <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
     <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
     <tidy-maven-plugin.version>1.3.0</tidy-maven-plugin.version>
+    <cyclonedx-maven-plugin.version>2.8.2</cyclonedx-maven-plugin.version>
 
     <checkstyle.version>8.41.1</checkstyle.version>
     <duraspace-codestyle.version>1.1.0</duraspace-codestyle.version>
@@ -282,6 +283,26 @@
           <version>${maven-failsafe-plugin.version}</version>
         </plugin>
 
+        <plugin>
+          <groupId>org.cyclonedx</groupId>
+          <artifactId>cyclonedx-maven-plugin</artifactId>
+          <version>${cyclonedx-maven-plugin.version}</version>
+          <executions>
+            <execution>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>makeAggregateBom</goal>
+              </goals>
+              <configuration>
+                <projectType>application</projectType>
+                <outputDirectory>${project.build.outputDirectory}/META-INF/sbom</outputDirectory>
+                <outputFormat>json</outputFormat>
+                <outputName>application.cdx</outputName>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+
       </plugins>
     </pluginManagement>
 

From bcebbb612f39998ff1035aa24307478af4abeac1 Mon Sep 17 00:00:00 2001
From: Russ Poetker <rpoetke1@jh.edu>
Date: Thu, 21 Nov 2024 13:31:09 -0500
Subject: [PATCH 2/3] Clean pom

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index c09e212..6673113 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,38 +22,38 @@
       <name>Jim Martino</name>
       <email>jrm@jhu.edu</email>
       <organization>The Sheridan Libraries, Johns Hopkins University</organization>
-      <organizationUrl>https://www.library.jhu.edu/</organizationUrl>
+      <organizationUrl>https://library.jhu.edu/</organizationUrl>
     </developer>
     <developer>
       <name>Mark Patton</name>
       <email>mpatton@jhu.edu</email>
       <organization>The Sheridan Libraries, Johns Hopkins University</organization>
-      <organizationUrl>https://www.library.jhu.edu/</organizationUrl>
+      <organizationUrl>https://library.jhu.edu/</organizationUrl>
     </developer>
     <developer>
       <name>John Abrahams</name>
       <email>jabrah20@jhu.edu</email>
       <organization>The Sheridan Libraries, Johns Hopkins University</organization>
-      <organizationUrl>https://www.library.jhu.edu/</organizationUrl>
+      <organizationUrl>https://library.jhu.edu/</organizationUrl>
     </developer>
     <developer>
       <name>Tim Sanders</name>
       <email>tsande16@jhu.edu</email>
       <organization>The Sheridan Libraries, Johns Hopkins University</organization>
-      <organizationUrl>https://www.library.jhu.edu/</organizationUrl>
+      <organizationUrl>https://library.jhu.edu/</organizationUrl>
     </developer>
     <developer>
       <name>Russ Poetker</name>
       <email>rpoetke1@jhu.edu</email>
       <organization>The Sheridan Libraries, Johns Hopkins University</organization>
-      <organizationUrl>https://www.library.jhu.edu/</organizationUrl>
+      <organizationUrl>https://library.jhu.edu/</organizationUrl>
     </developer>
   </developers>
 
   <scm>
     <connection>scm:git:git://github.com/eclipse-pass/main.git</connection>
     <developerConnection>scm:git:ssh://github.com:eclipse-pass/main.git</developerConnection>
-    <url>http://github.com/eclipse-pass/main/tree/main</url>
+    <url>https://github.com/eclipse-pass/main/tree/main</url>
     <tag>HEAD</tag>
   </scm>
   <distributionManagement>

From 47b0509729f47a9458c0dcd809a70edb7a53d31f Mon Sep 17 00:00:00 2001
From: Russ Poetker <rpoetke1@jh.edu>
Date: Thu, 21 Nov 2024 14:36:40 -0500
Subject: [PATCH 3/3] Use makeBom since creating sboms in modules specifically

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6673113..f367f04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -291,7 +291,7 @@
             <execution>
               <phase>generate-resources</phase>
               <goals>
-                <goal>makeAggregateBom</goal>
+                <goal>makeBom</goal>
               </goals>
               <configuration>
                 <projectType>application</projectType>