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

Jump to bottom

1.5 support #322

Merged
merged 41 commits into from
Sep 6, 2023
Merged

1.5 support #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
c9400ba
initial Changes to support 1.5
mr-zepol Feb 2, 2023
d28fd8d
Invert the VersionFilter (#261)
DarthHater Feb 3, 2023
fc2a77e
Security contact and vuln analysis time for 1.5 spec (#264)
mr-zepol Mar 2, 2023
52dd3eb
1.5 support rejected vex (#265)
mr-zepol Mar 2, 2023
9003163
Add properties on license (#262)
DarthHater Mar 2, 2023
9b65079
Add Missing Bom Properties
mr-zepol Mar 2, 2023
bb7cbab
Initial test for properties
mr-zepol Feb 17, 2023
b2096d5
Add licensing
DarthHater Feb 2, 2023
f5bb5d4
json property order
DarthHater Feb 2, 2023
0dc1b9c
The basics of the whole well it can be either of these two things, I …
DarthHater Feb 3, 2023
23c7bf1
fix example
mr-zepol Feb 17, 2023
d078fdd
Add deserializer
mr-zepol Jun 13, 2023
9b6999e
Remove initialization
mr-zepol Jun 15, 2023
330c682
Add CVSSv4 and SSVC to Method in Rating
mr-zepol Jun 19, 2023
866f3e0
Initial changes for lifecycle in metadata
mr-zepol Jun 8, 2023
0e6e3fc
Update serializer
mr-zepol Jun 13, 2023
0536c80
Update Json Schema to fix issue
mr-zepol Jun 13, 2023
7884bd3
Add serializer
mr-zepol Jun 13, 2023
fb6d816
Fix serialization
mr-zepol Jun 13, 2023
c84cf23
ANNOTATIONS
DarthHater Feb 2, 2023
8cb5e88
add missing data
mr-zepol Mar 2, 2023
77266db
Add missing testing
mr-zepol Mar 3, 2023
16498a3
Fix package name
stevespringett Jun 27, 2023
281b9e4
Schema updates to released versions
stevespringett Jun 27, 2023
b7a34fb
Version bump. Added 1.5 component types
stevespringett Jun 27, 2023
26f68ab
Synchronized test cases from specification repo
stevespringett Jun 27, 2023
54eedb0
Update schema definition and examples with info from spec
mr-zepol Jun 29, 2023
581c92e
Add additional External References
mr-zepol Jun 30, 2023
3a3389c
Adding External Reference Support for Adversary model and risk assess…
mr-zepol Jun 30, 2023
8149664
Add support for ML (#315)
mr-zepol Jul 6, 2023
7fd5d4c
Code Improvements
mr-zepol Jul 11, 2023
ad80d1d
1.5 add support formulation (#311)
mr-zepol Jul 14, 2023
1cde158
1.5 support additional compositions identity (#312)
mr-zepol Jul 14, 2023
c437f75
Simplify tests
mr-zepol Jul 15, 2023
38c76a7
1.5 deprecate tools (#316)
mr-zepol Jul 19, 2023
cd02434
Fix Issue with licenses
mr-zepol Aug 20, 2023
e3d7d0c
Remove JAXB annotations
mr-zepol Aug 22, 2023
bfe7001
Simplify Deserializers
mr-zepol Aug 24, 2023
16a22e9
1.5_add_support_for_evidence
mr-zepol Aug 24, 2023
b6a3ca0
Fix failure to deserialize `externalReferences` from XML
nscuro Sep 5, 2023
87b2af3
Merge pull request #324 from nscuro/external-references-fix
stevespringett Sep 6, 2023
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-core-java</artifactId>
<packaging>jar</packaging>
<version>7.3.3-SNAPSHOT</version>
<version>7.4.0-SNAPSHOT</version>

<name>CycloneDX Core (Java)</name>
<description>The CycloneDX core module provides a model representation of the BOM along with utilities to assist in creating, parsing, and validating BOMs.</description>
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/org/cyclonedx/BomGeneratorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import org.cyclonedx.generators.json.BomJsonGenerator12;
import org.cyclonedx.generators.json.BomJsonGenerator13;
import org.cyclonedx.generators.json.BomJsonGenerator14;
import org.cyclonedx.generators.json.BomJsonGenerator15;
import org.cyclonedx.generators.xml.BomXmlGenerator;
import org.cyclonedx.generators.xml.BomXmlGenerator10;
import org.cyclonedx.generators.xml.BomXmlGenerator11;
import org.cyclonedx.generators.xml.BomXmlGenerator12;
import org.cyclonedx.generators.xml.BomXmlGenerator13;
import org.cyclonedx.generators.xml.BomXmlGenerator14;
import org.cyclonedx.generators.xml.BomXmlGenerator15;
import org.cyclonedx.model.Bom;
import org.cyclonedx.generators.json.BomJsonGenerator;

Expand All @@ -50,8 +52,10 @@ public static BomXmlGenerator createXml(CycloneDxSchema.Version version, Bom bom
return new BomXmlGenerator12(bom);
case VERSION_13:
return new BomXmlGenerator13(bom);
default:
case VERSION_14:
return new BomXmlGenerator14(bom);
default:
return new BomXmlGenerator15(bom);
}
}

Expand All @@ -61,8 +65,10 @@ public static BomJsonGenerator createJson(final CycloneDxSchema.Version version,
return new BomJsonGenerator12(bom);
case VERSION_13:
return new BomJsonGenerator13(bom);
default:
case VERSION_14:
return new BomJsonGenerator14(bom);
default:
return new BomJsonGenerator15(bom);
}
}
}
Loading
Loading