chore: update algorithm families by github-actions[bot] · Pull Request #893 · CycloneDX/specification

github-actions · 2026-03-26T18:33:22Z

This PR updates schema/cryptography-defs.schema.json with the latest algorithm families generated from schema/cryptography-defs.json.

Signed-off-by: Steve Springett <steve@springett.us>

Syncing with master to incoporate v1.7 spec

This reverts commit bde33b2.

Signed-off-by: Steve Springett <steve@springett.us>

…ment patterns. Signed-off-by: Steve Springett <steve@springett.us>

Signed-off-by: Steve Springett <steve@springett.us>

) - Resolves #928

# Migrate enveloped signature support from JSF to JSS (ITU-T X.590) ## Summary - Replaced legacy JSON Signature Format (JSF) with JSON Signature Scheme (JSS) per ITU-T X.590 (10/2023). Added CycloneDX 2.0 model schema that implements JSS - Updated all schema files referencing signatures to use the new `signatures` array (JSS) instead of singular `signature` object (JSF) - Removed old JSF test (`valid-signatures-2.0.json`) and added 18 targeted JSS test cases (8 valid, 10 invalid) This PR closes #851 All tests are **structural validations only**. Keys, certificates, thumbprints, and signature values are illustrative and may not be cryptographically valid. No content validation is performed.

+        const absoluteRootPath = path.resolve(rootSchemaPath);
+
+        // Verify paths exist
+        await fs.access(absoluteModelsDir);


+
+        // Verify paths exist
+        await fs.access(absoluteModelsDir);
+        await fs.access(absoluteRootPath);


+        console.log(`Output (minified): ${minifiedPath}\n`);
+
+        // Read all schema files in the models directory
+        const files = await fs.readdir(absoluteModelsDir);


+            const schemaPath = path.join(absoluteModelsDir, file);
+            console.log(`  Reading ${file}...`);
+
+            const content = await fs.readFile(schemaPath, 'utf8');


+
+        // Read the root schema
+        console.log(`\nReading root schema...`);
+        const rootContent = await fs.readFile(absoluteRootPath, 'utf8');


+        console.log('\nWriting bundled schema...');
+        const prettyJson = JSON.stringify(finalSchema, null, 2);
+        await fs.writeFile(bundledPath, prettyJson);
+        const bundledStats = await fs.stat(bundledPath);


+        const lineCount = minifiedJson.split('\n').length;
+        console.log(`  Minified JSON is on ${lineCount} line(s)`);
+
+        await fs.writeFile(minifiedPath, minifiedJson);


+        console.log(`  Minified JSON is on ${lineCount} line(s)`);
+
+        await fs.writeFile(minifiedPath, minifiedJson);
+        const minifiedStats = await fs.stat(minifiedPath);


+    // Pattern for markdown links at the end
+    const markdownLinkPattern = /\]\([^)]+\)$/;
+
+    return urlPattern.test(text) || markdownLinkPattern.test(text);


+    // Pattern for markdown links at the end
+    const markdownLinkPattern = /\]\([^)]+\)$/;
+
+    return urlPattern.test(text) || markdownLinkPattern.test(text);


Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

test scripts were split between CycloneDX v1.x and v2.x (v2 tests do not exist, yet) --------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

- [x] Java tests - functional - [x] JS tests - functional - WIP - found some false-positives/false-negatives - due to errors in test resources - [x] JS tests - schema validate - includes #996 - includes #992 - JS tests - semantics - [x] #998 - [x] #995 - [x] PHP tests - functional added tests only, no schema/res fixes - they are prepared in - #997 - #1001 --------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

merge latest master and fix conflicts caused by #652 (comment) ---- there are currently some conflicts in the `.github/workflows/*` ```text This branch has conflicts that must be resolved Use the command line to resolve conflicts before continuing. .github/workflows/bundle_2.0_schemas.yml .github/workflows/test_java.yml .github/workflows/test_js.yml .github/workflows/test_php.yml .github/workflows/test_proto.yml docgen/json/templates/cyclonedx/base.html docgen/json/templates/cyclonedx/section_properties.html docgen/proto/templates/html.tmpl docgen/xml/xs3p.xsl tools/src/test/js/json-schema-functional-tests.js tools/src/test/js/json-schema-lint-tests.js ``` i will sort this out soon. basically this is a file being moved in our(`2.0-dev`) branch, and a dependabot updating an action in their's(`master`) branch. similar with tests and QA tools ... but i have no idea what to do with the docs - i guess we use "ours"? --------- Signed-off-by: wievdndr <wiebe.vandendriessche@ugent.be> Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> Signed-off-by: Basil Hess <bhe@zurich.ibm.com> Signed-off-by: Mehrn0ush <mehrnoush.vaseghi@gmail.com> Signed-off-by: Steve Springett <steve@springett.us> Signed-off-by: Joachim Vandersmissen <git@jvdsn.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: wievdndr <wiebe.vandendriessche@ugent.be> Co-authored-by: Wiebe Vandendriessche <146532897+wiebe-vandendriessche@users.noreply.github.com> Co-authored-by: Basil Hess <bhe@zurich.ibm.com> Co-authored-by: Mehrn0ush <mehrnoush.vaseghi@gmail.com> Co-authored-by: Steve Springett <steve@springett.us> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Joachim Vandersmissen <git@jvdsn.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…-20260704-2

fix mergeconflicts

stevespringett and others added 30 commits June 14, 2025 20:17

Initial commit

eac0ac6

Signed-off-by: Steve Springett <steve@springett.us>

Merge remote-tracking branch 'origin/master' into 2.0-dev

028c9df

Syncing with master to incoporate v1.7 spec

Syncing with master

bde33b2

Revert "Syncing with master"

dae213a

This reverts commit bde33b2.

Added schema bundler and updated readme.

fbaf3de

Signed-off-by: Steve Springett <steve@springett.us>

Adding GitHub Action to combine schemas

0d74d96

Signed-off-by: Steve Springett <steve@springett.us>

Updated branches

51fbf49

Signed-off-by: Steve Springett <steve@springett.us>

Updating action

b4721e1

Signed-off-by: Steve Springett <steve@springett.us>

chore: update bundled schema [skip ci]

91ec8e0

Updated docgen for 2.0

c4d6c82

Signed-off-by: Steve Springett <steve@springett.us>

Added minified bundling

b6fed22

Signed-off-by: Steve Springett <steve@springett.us>

chore: update bundled schemas [skip ci]

173a276

Added further optimization to minified version

0427839

Signed-off-by: Steve Springett <steve@springett.us>

chore: update bundled schemas [skip ci]

8668856

Fixed resolution issues

c46624c

Signed-off-by: Steve Springett <steve@springett.us>

chore: update bundled schemas [skip ci]

ed3eb38

Added ref verification

7aceff4

Signed-off-by: Steve Springett <steve@springett.us>

Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

70ea2fa

Updated JSON Schema for Humans

dd45ceb

Signed-off-by: Steve Springett <steve@springett.us>

Initial commit of CycloneDX linter

b8abb0c

Signed-off-by: Steve Springett <steve@springett.us>

Moved bundler

f0c447b

Signed-off-by: Steve Springett <steve@springett.us>

Added lock file

41ad354

Signed-off-by: Steve Springett <steve@springett.us>

Omitting a few properties from being bundled.

319ed73

Signed-off-by: Steve Springett <steve@springett.us>

chore: update bundled schemas [skip ci]

47f0ec2

Added comment check

f0fcf97

Signed-off-by: Steve Springett <steve@springett.us>

Added schema version check

625b757

Signed-off-by: Steve Springett <steve@springett.us>

Ported metadata minus deprecations.

90de7cd

Signed-off-by: Steve Springett <steve@springett.us>

Ported multiple models minus deprecations and standardized id and com…

38547b6

…ment patterns. Signed-off-by: Steve Springett <steve@springett.us>

Ported model card

9be3484

Signed-off-by: Steve Springett <steve@springett.us>

Updating indent check. Added two new checks.

4e77988

Signed-off-by: Steve Springett <steve@springett.us>

github-actions Bot and others added 7 commits June 28, 2026 22:24

chore: update bundled schemas [skip ci]

ab843c6

Merge branch '2.0-dev' into 2.0-dev-conditional-components

d823abb

Added support for conditional components and associated unit tests (#929

51d086c

) - Resolves #928

chore: update bundled schemas [skip ci]

dd0a040

Merge branch '2.0-dev' into 2.0-dev-x590

6e2c045

chore: update bundled schemas [skip ci]

bbbcaec

github-actions Bot force-pushed the update-algorithm-families branch from 3f6d144 to 547aeea Compare June 28, 2026 23:38

github-advanced-security AI found potential problems Jun 28, 2026

View reviewed changes

jkowalleck and others added 12 commits July 29, 2026 19:44

chore: mark generated

62dee9e

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

chore: mark generated

2a86067

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

fix: prevent refType/refLinkType from being a Bom-Link

2c43df6

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

feat: common elementLink

97eec28

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

refactor: use elementLink

85c554d

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

fix: use elementLink according to description

4cdefa6

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

docs

72384fd

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

refactor

17bc865

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

fix: linked elemenets

34f1df7

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

fix: linked elemenets

1606d88

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

[2.0] Tests: split schema 1.x 2.x (#999)

e1c91b7

test scripts were split between CycloneDX v1.x and v2.x (v2 tests do not exist, yet) --------- Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

github-actions Bot force-pushed the update-algorithm-families branch from 547aeea to 4cd1f2f Compare August 4, 2026 16:06

github-actions Bot force-pushed the update-algorithm-families branch from 4cd1f2f to b59f256 Compare August 4, 2026 16:13

jkowalleck and others added 4 commits August 4, 2026 18:17

Merge remote-tracking branch 'origin/master' into 2.0-dev_mergemaster…

ffae620

…-20260704-2

2.0 dev mergemaster 20260704 2 (#1003)

f9a5002

fix mergeconflicts

Merge branch '2.0-dev' into 2.0-dev-refType-nonconflicting-bom-link

674b6a6

chore: update algorithm families [skip ci]

df66fdb

github-actions Bot force-pushed the update-algorithm-families branch 2 times, most recently from 2764c07 to df66fdb Compare August 4, 2026 17:00

Navigation Menu

Uh oh!

Uh oh!

chore: update algorithm families - #893

chore: update algorithm families#893
github-actions[bot] wants to merge 148 commits into
masterfrom
update-algorithm-families

github-actions Bot commented Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

github-actions Bot commented Mar 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants