Create SBOM only for agent

inspectIT · Mar 30, 2022 · bf2a3d9 · bf2a3d9
1 parent 0f8c4de
commit bf2a3d9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -52,14 +52,14 @@ jobs:
     working_directory: ~/inspectit
     steps:
       - attach_repo
-      - run: cd repo && ./gradlew assemble bootJarWithFrontend packageDemo cyclonedxBom :inspectit-ocelot-eum-server:bootJar -PbuildVersion=${CIRCLE_TAG}
+      - run: cd repo && ./gradlew assemble bootJarWithFrontend packageDemo :inspectit-ocelot-core:cyclonedxBom :inspectit-ocelot-eum-server:bootJar -PbuildVersion=${CIRCLE_TAG}
       - run: mkdir artifacts
       - run: cp ~/inspectit/repo/inspectit-ocelot-agent/build/inspectit-ocelot-agent-${CIRCLE_TAG}.jar ~/inspectit/artifacts
       - run: cp ~/inspectit/repo/inspectit-ocelot-demo/build/inspectit-ocelot-demo-${CIRCLE_TAG}.zip ~/inspectit/artifacts
       - run: cp ~/inspectit/repo/components/inspectit-ocelot-configurationserver/build/libs/inspectit-ocelot-configurationserver-${CIRCLE_TAG}.jar ~/inspectit/artifacts
       - run: cp ~/inspectit/repo/components/inspectit-ocelot-eum-server/build/libs/inspectit-ocelot-eum-server-${CIRCLE_TAG}.jar ~/inspectit/artifacts
-      - run: cp ~/inspectit/repo/build/reports/bom.json ~/inspectit/artifacts
-      - run: cp ~/inspectit/repo/build/reports/bom.xml ~/inspectit/artifacts
+      - run: cp ~/inspectit/repo/inspectit-ocelot-core/build/reports/bom.json ~/inspectit/artifacts/inspectit-ocelot-agent-bom.json
+      - run: cp ~/inspectit/repo/inspectit-ocelot-core/build/reports/bom.xml ~/inspectit/artifacts/inspectit-ocelot-agent-bom.xml
       - run:
           name: Calculate checksums of release artifacts
           working_directory: ~/inspectit/artifacts

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,6 @@ import com.github.jk1.license.render.TextReportRenderer
 
 plugins {
     id 'com.github.jk1.dependency-license-report' version '2.0'
-    id "org.cyclonedx.bom" version "1.5.0"
 }
 
 licenseReport {
@@ -31,13 +30,6 @@ allprojects {
     version = "$buildVersion"
 }
 
-cyclonedxBom {
-    // includeConfigs is the list of configuration names to include when generating the BOM (leave empty to include every configuration)
-    // includeConfigs += ["runtimeClasspath"]
-    // skipConfigs is a list of configuration names to exclude when generating the BOM
-    // skipConfigs += ["compileClasspath", "testCompileClasspath"]
-}
-
 task codeCoverageReport(type: JacocoReport) {
     group = 'Verification'
     description = 'Generates a combined report from all subprojects'

diff --git a/inspectit-ocelot-core/build.gradle b/inspectit-ocelot-core/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id "me.champeau.gradle.jmh" version "0.5.3"
+    id "org.cyclonedx.bom" version "1.5.0"
 }
 
 configurations {
@@ -150,6 +151,11 @@ task generateVersionFile {
     }
 }
 
+cyclonedxBom {
+    // includeConfigs is the list of configuration names to include when generating the BOM (leave empty to include every configuration)
+    includeConfigs += ["runtimeClasspath"]
+}
+
 jar.dependsOn checkDependencyJavaVersions
 jar.dependsOn generateVersionFile