Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps: update dependency org.cyclonedx:cyclonedx-core-java to v9 #8645

Merged
merged 1 commit into from
May 30, 2024
Merged

deps: update dependency org.cyclonedx:cyclonedx-core-java to v9 #8645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ asciidoctorjPdf = "2.3.15"
clikt = "4.4.0"
commonsCompress = "1.26.2"
cvssCalculator = "1.4.3"
cyclonedx = "8.0.3"
cyclonedx = "9.0.2"
diffUtils = "4.12"
diskLruCache = "2.0.2"
exposed = "0.50.1"
Expand Down
30 changes: 25 additions & 5 deletions plugins/reporters/cyclonedx/src/funTest/assets/cyclonedx-reporter-expected-result.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
<copyright>Copyright 1, Copyright 2</copyright>
<purl>pkg:npm/%40ort/[email protected]?classifier=sources</purl>
<modified>false</modified>
<externalReferences><reference type="website"><url>https://github.com/oss-review-toolkit/ort</url></reference></externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
<externalReferences>
<reference type="website">
<url>https://github.com/oss-review-toolkit/ort</url>
</reference>
</externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
</component>
<component type="library" bom-ref="NPM:@ort:declared-license:1.0">
<group>@ort</group>
Expand Down Expand Up @@ -192,7 +196,11 @@ THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<copyright>Copyright 1</copyright>
<purl>pkg:npm/%40ort/[email protected]?classifier=sources</purl>
<modified>false</modified>
<externalReferences><reference type="website"><url>https://github.com/oss-review-toolkit/ort</url></reference></externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
<externalReferences>
<reference type="website">
<url>https://github.com/oss-review-toolkit/ort</url>
</reference>
</externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
</component>
<component type="library" bom-ref="NPM:@ort:license-file:1.0">
<group>@ort</group>
Expand Down Expand Up @@ -229,7 +237,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
<copyright>Copyright 1, Copyright 2</copyright>
<purl>pkg:npm/%40ort/[email protected]?classifier=sources</purl>
<modified>false</modified>
<externalReferences><reference type="website"><url>https://github.com/oss-review-toolkit/ort</url></reference></externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
<externalReferences>
<reference type="website">
<url>https://github.com/oss-review-toolkit/ort</url>
</reference>
</externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
</component>
<component type="library" bom-ref="NPM:@ort:license-file-and-additional-licenses:1.0">
<group>@ort</group>
Expand Down Expand Up @@ -294,7 +306,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
<copyright>Copyright 1, Copyright 2, Copyright 3</copyright>
<purl>pkg:npm/%40ort/[email protected]?classifier=sources</purl>
<modified>false</modified>
<externalReferences><reference type="website"><url>https://github.com/oss-review-toolkit/ort</url></reference></externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
<externalReferences>
<reference type="website">
<url>https://github.com/oss-review-toolkit/ort</url>
</reference>
</externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
</component>
<component type="library" bom-ref="NPM:@ort:no-license-file:1.0">
<group>@ort</group>
Expand Down Expand Up @@ -328,7 +344,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
<copyright>Copyright 1</copyright>
<purl>pkg:npm/%40ort/[email protected]</purl>
<modified>false</modified>
<externalReferences><reference type="website"><url>https://github.com/oss-review-toolkit/ort</url></reference></externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
<externalReferences>
<reference type="website">
<url>https://github.com/oss-review-toolkit/ort</url>
</reference>
</externalReferences><ort:dependencyType xmlns:ort="http://www.w3.org/1999/xhtml">direct</ort:dependencyType>
</component>
</components>
<vulnerabilities>
Expand Down
19 changes: 10 additions & 9 deletions plugins/reporters/cyclonedx/src/main/kotlin/CycloneDxReporter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import java.util.Date
import java.util.SortedSet
import java.util.UUID

import org.cyclonedx.BomGeneratorFactory
import org.cyclonedx.CycloneDxSchema
import org.cyclonedx.Version
import org.cyclonedx.generators.BomGeneratorFactory
import org.cyclonedx.model.AttachmentText
import org.cyclonedx.model.Bom
import org.cyclonedx.model.Component
Expand All @@ -35,6 +35,7 @@ import org.cyclonedx.model.Hash
import org.cyclonedx.model.License
import org.cyclonedx.model.LicenseChoice
import org.cyclonedx.model.Metadata
import org.cyclonedx.model.license.Expression
import org.cyclonedx.model.metadata.ToolInformation

import org.ossreviewtoolkit.model.FileFormat
Expand Down Expand Up @@ -68,7 +69,7 @@ import org.ossreviewtoolkit.utils.spdx.SpdxLicense
*/
class CycloneDxReporter : Reporter {
companion object {
val DEFAULT_SCHEMA_VERSION = CycloneDxSchema.Version.VERSION_15
val DEFAULT_SCHEMA_VERSION = Version.VERSION_15
val DEFAULT_DATA_LICENSE = SpdxLicense.CC0_1_0

const val REPORT_BASE_FILENAME = "bom.cyclonedx"
Expand Down Expand Up @@ -140,7 +141,7 @@ class CycloneDxReporter : Reporter {
val projects = input.ortResult.getProjects(omitExcluded = true).sortedBy { it.id }
val packages = input.ortResult.getPackages(omitExcluded = true).sortedBy { it.metadata.id }

val schemaVersion = CycloneDxSchema.Version.entries.find {
val schemaVersion = Version.entries.find {
it.versionString == config.options[OPTION_SCHEMA_VERSION]
} ?: DEFAULT_SCHEMA_VERSION

Expand All @@ -163,7 +164,7 @@ class CycloneDxReporter : Reporter {
}
)
}
licenseChoice = LicenseChoice().apply { expression = dataLicense }
licenses = LicenseChoice().apply { expression = Expression(dataLicense) }
}

if (createSingleBom) {
Expand Down Expand Up @@ -326,7 +327,7 @@ class CycloneDxReporter : Reporter {
hashes = listOfNotNull(hash)

// TODO: Support license expressions once we have fully converted to them.
licenseChoice = LicenseChoice().apply { licenses = licenseObjects }
licenses = LicenseChoice().apply { licenses = licenseObjects }

// TODO: Find a way to associate copyrights to the license they belong to, see
// https://github.com/CycloneDX/cyclonedx-core-java/issues/58
Expand All @@ -348,7 +349,7 @@ class CycloneDxReporter : Reporter {

private fun writeBom(
bom: Bom,
schemaVersion: CycloneDxSchema.Version,
schemaVersion: Version,
outputDir: File,
outputName: String,
requestedOutputFileFormats: Set<FileFormat>
Expand All @@ -373,13 +374,13 @@ class CycloneDxReporter : Reporter {
// Clear the "dependencyType".
component.extensibleTypes = null

component.licenseChoice.licenses.forEach { license ->
component.licenses.licenses.forEach { license ->
// Clear the "origin".
license.extensibleTypes = null
}

// Remove duplicates that may occur due to clearing the distinguishing extensive type.
component.licenseChoice.licenses = component.licenseChoice.licenses.distinct()
component.licenses.licenses = component.licenses.licenses.distinct()
}
}

Expand Down
Loading