From 06fa1250b4f8f109a1564c0bbc254a5c9ecc3be7 Mon Sep 17 00:00:00 2001 From: Steve Springett Date: Tue, 5 Dec 2023 20:37:18 -0600 Subject: [PATCH 01/11] Updated Ecma hero text Signed-off-by: anthonyharrison --- _data/carousel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/carousel.yml b/_data/carousel.yml index 8adc3dd..bbe8b61 100644 --- a/_data/carousel.yml +++ b/_data/carousel.yml @@ -18,4 +18,4 @@ description: Trusted by beginners and experts, CycloneDX offers an easy on-ramp to adoption and the world's most extensive collection of tools to get started. - title: CycloneDX is supported by technology leaders across the world. image: theme/assets/images/ecma_hero.jpg - description: The OWASP Foundation maintains CycloneDX and other flagship products with help from the Ecma International Technical Committee for Software & System Transparency (TC54), which includes representatives from ServiceNow, OWASP, IBM, and Bloomberg. \ No newline at end of file + description: The OWASP Foundation maintains CycloneDX with help from the Ecma International Technical Committee for Software & System Transparency (TC54), which includes representatives from Bloomberg, IBM, Lockheed Martin, and ServiceNow. \ No newline at end of file From 256c4f78b3af58f926c7ae33dc565950aa3efb6c Mon Sep 17 00:00:00 2001 From: Steve Springett Date: Tue, 5 Dec 2023 21:00:45 -0600 Subject: [PATCH 02/11] Added ecma to supporters Signed-off-by: anthonyharrison --- _data/supporters.yml | 7 ++++++- theme/assets/images/logos/ecma.svg | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 theme/assets/images/logos/ecma.svg diff --git a/_data/supporters.yml b/_data/supporters.yml index 0dcf3f1..b5646a2 100644 --- a/_data/supporters.yml +++ b/_data/supporters.yml @@ -547,4 +547,9 @@ logo: semgrep.svg websiteUrl: https://semgrep.dev categories: - - vendor \ No newline at end of file + - vendor +- name: Ecma International + logo: ecma.svg + websiteUrl: https://www.ecma-international.org/ + categories: + - supporter diff --git a/theme/assets/images/logos/ecma.svg b/theme/assets/images/logos/ecma.svg new file mode 100644 index 0000000..4cb94ec --- /dev/null +++ b/theme/assets/images/logos/ecma.svg @@ -0,0 +1,29 @@ + + + + + + + From 1d8e2558349fc1191afaf1d51f772d0c15dd6e87 Mon Sep 17 00:00:00 2001 From: Steve Springett Date: Wed, 6 Dec 2023 18:09:06 -0600 Subject: [PATCH 03/11] url update Signed-off-by: anthonyharrison --- about/working-groups/working-groups.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/working-groups/working-groups.json b/about/working-groups/working-groups.json index e02f93c..5f3ffd8 100644 --- a/about/working-groups/working-groups.json +++ b/about/working-groups/working-groups.json @@ -176,7 +176,7 @@ "twitter": "dns43", "linkedin": "dennis-roellke", "github": "dns43", - "homepage": "https://www.bloomberg.com/", + "homepage": "https://www.techatbloomberg.com/opensource", "categories": [ "industry" ] From 370fe244acf928d2594b93080f7a221df78adb50 Mon Sep 17 00:00:00 2001 From: Steve Springett Date: Thu, 14 Dec 2023 17:12:04 -0600 Subject: [PATCH 04/11] Added Vinod Signed-off-by: anthonyharrison --- about/working-groups/index.md | 2 +- about/working-groups/working-groups.json | 13 ++++++------- theme/assets/images/headshots/vinod-anandan.jpg | Bin 0 -> 29622 bytes 3 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 theme/assets/images/headshots/vinod-anandan.jpg diff --git a/about/working-groups/index.md b/about/working-groups/index.md index 591da54..b2addb1 100644 --- a/about/working-groups/index.md +++ b/about/working-groups/index.md @@ -36,7 +36,7 @@ micro_nav: false
-## Website UX & Development +## Outreach, Content Development, and UX
diff --git a/about/working-groups/working-groups.json b/about/working-groups/working-groups.json index 5f3ffd8..8511183 100644 --- a/about/working-groups/working-groups.json +++ b/about/working-groups/working-groups.json @@ -1499,17 +1499,16 @@ ] }, { - "displayName": "VinodAnandan", - "lastName": "vinodanandan", - "headshot": "https://avatars.githubusercontent.com/u/29684753?v=4", - "organization": null, + "displayName": "Vinod Anandan", + "lastName": "Anandan", + "headshot": "vinod-anandan.jpg", "description": null, - "twitter": null, - "linkedin": null, + "twitter": "_VinodAnandan", + "linkedin": "vinodna", "github": "VinodAnandan", "homepage": "https://github.com/VinodAnandan", "categories": [ - "contributors" + "ux" ] }, { diff --git a/theme/assets/images/headshots/vinod-anandan.jpg b/theme/assets/images/headshots/vinod-anandan.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3e4ae43a0950951af29021d45ccb84babbbd1891 GIT binary patch literal 29622 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 Date: Sun, 17 Dec 2023 01:14:18 +0000 Subject: [PATCH 05/11] Update contributors Signed-off-by: anthonyharrison --- about/working-groups/working-groups.json | 84 ++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/about/working-groups/working-groups.json b/about/working-groups/working-groups.json index 8511183..183d4d7 100644 --- a/about/working-groups/working-groups.json +++ b/about/working-groups/working-groups.json @@ -4069,5 +4069,89 @@ "categories": [ "contributors" ] + }, + { + "displayName": "koraytugay", + "lastName": "koraytugay", + "headshot": "https://avatars.githubusercontent.com/u/1974123?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "koraytugay", + "homepage": "https://github.com/koraytugay", + "categories": [ + "contributors" + ] + }, + { + "displayName": "llamahunter", + "lastName": "llamahunter", + "headshot": "https://avatars.githubusercontent.com/u/843173?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "llamahunter", + "homepage": "https://github.com/llamahunter", + "categories": [ + "contributors" + ] + }, + { + "displayName": "ctran", + "lastName": "ctran", + "headshot": "https://avatars.githubusercontent.com/u/491?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "ctran", + "homepage": "https://github.com/ctran", + "categories": [ + "contributors" + ] + }, + { + "displayName": "loicrouchon", + "lastName": "loicrouchon", + "headshot": "https://avatars.githubusercontent.com/u/1785348?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "loicrouchon", + "homepage": "https://github.com/loicrouchon", + "categories": [ + "contributors" + ] + }, + { + "displayName": "mLuca", + "lastName": "mluca", + "headshot": "https://avatars.githubusercontent.com/u/1850123?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "mLuca", + "homepage": "https://github.com/mLuca", + "categories": [ + "contributors" + ] + }, + { + "displayName": "vy", + "lastName": "vy", + "headshot": "https://avatars.githubusercontent.com/u/72137?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "vy", + "homepage": "https://github.com/vy", + "categories": [ + "contributors" + ] } ] \ No newline at end of file From 630d2b88d268f8900cfd008a07ec40c1c1b1a96f Mon Sep 17 00:00:00 2001 From: Robert Smigielski Date: Fri, 15 Dec 2023 11:14:50 -0500 Subject: [PATCH 06/11] Buildroot tool URL corrected Signed-off-by: Robert Smigielski Signed-off-by: anthonyharrison --- _data/tools.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/_data/tools.yml b/_data/tools.yml index a855aba..d12ff03 100644 --- a/_data/tools.yml +++ b/_data/tools.yml @@ -188,11 +188,12 @@ - opensource - build-integration - name: CycloneDX-Buildroot - publisher: alvinchchen - description: The CycloneDX-buildroot module for Python creates a valid CycloneDX - bill of materials from buildroot manifest.xlsx files - repoUrl: https://github.com/alvinchchen/cyclonedx-buildroot - websiteUrl: https://github.com/alvinchchen/cyclonedx-buildroot + publisher: CycloneDX + description: The CycloneDX-buildroot module creates a valid CycloneDX + bill of materials from buildroot manifest.csv files. Note that any formatted manifest.csv can + be parsed for an arbitrary project spread sheet of software packages as indicated in the documentation. + repoUrl: https://github.com/CycloneDX/cyclonedx-buildroot + websiteUrl: https://github.com/CycloneDX/cyclonedx-buildroot categories: - opensource - build-integration From b87a289c4d0619023ec62cdd9ddf0018f93f0a40 Mon Sep 17 00:00:00 2001 From: Greg Heartsfield Date: Sat, 9 Dec 2023 10:33:34 -0600 Subject: [PATCH 07/11] Add sbom-rs to tools list Signed-off-by: Greg Heartsfield Signed-off-by: anthonyharrison --- _data/tools.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/_data/tools.yml b/_data/tools.yml index d12ff03..3fc7d86 100644 --- a/_data/tools.yml +++ b/_data/tools.yml @@ -1827,3 +1827,12 @@ categories: - opensource - transform +- name: sbom-rs + publisher: Paul Sastrasinh + description: A group of Rust projects for interacting with and producing software bill of materials (SBOMs). + repoUrl: https://github.com/psastras/sbom-rs + websiteUrl: https://github.com/psastras/sbom-rs + categories: + - opensource + - build-integration + - github-action From 49f6ac51450bec072f7fc94db11b726b595c35af Mon Sep 17 00:00:00 2001 From: coderpatros Date: Sun, 24 Dec 2023 01:12:51 +0000 Subject: [PATCH 08/11] Update contributors Signed-off-by: anthonyharrison --- about/working-groups/working-groups.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/about/working-groups/working-groups.json b/about/working-groups/working-groups.json index 183d4d7..45cc2ab 100644 --- a/about/working-groups/working-groups.json +++ b/about/working-groups/working-groups.json @@ -4153,5 +4153,19 @@ "categories": [ "contributors" ] + }, + { + "displayName": "mtsfoni", + "lastName": "mtsfoni", + "headshot": "https://avatars.githubusercontent.com/u/80639729?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "mtsfoni", + "homepage": "https://github.com/mtsfoni", + "categories": [ + "contributors" + ] } ] \ No newline at end of file From bd672921328560b20ce115ce0870cfc8cbbe1df0 Mon Sep 17 00:00:00 2001 From: Michael Tsfoni <80639729+mtsfoni@users.noreply.github.com> Date: Tue, 19 Dec 2023 18:37:12 +0100 Subject: [PATCH 09/11] Update Michael Tsfoni (former Mike Zadik) working-groups.json Changing from my "web alias" to my real name. --------- Signed-off-by: mtsfoni Signed-off-by: anthonyharrison --- about/working-groups/working-groups.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/about/working-groups/working-groups.json b/about/working-groups/working-groups.json index 45cc2ab..0e09e10 100644 --- a/about/working-groups/working-groups.json +++ b/about/working-groups/working-groups.json @@ -84,15 +84,15 @@ ] }, { - "displayName": "Mike Zadik", - "lastName": "Zadik", + "displayName": "Michael Tsfoni", + "lastName": "Tsfoni", "headshot": "https://avatars.githubusercontent.com/u/80639729?v=4", "organization": null, "description": null, "twitter": null, - "linkedin": null, - "github": "CodeTigerCloud", - "homepage": "https://github.com/CodeTigerCloud", + "linkedin": "mtsfoni", + "github": "mtsfoni", + "homepage": null, "categories": [ "maintainers" ] @@ -4168,4 +4168,4 @@ "contributors" ] } -] \ No newline at end of file +] From 8a6a41cc067e2ca95e46aee1ad6c1f76af4aa6e7 Mon Sep 17 00:00:00 2001 From: coderpatros Date: Sun, 31 Dec 2023 01:13:26 +0000 Subject: [PATCH 10/11] Update contributors Signed-off-by: anthonyharrison --- about/working-groups/working-groups.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/about/working-groups/working-groups.json b/about/working-groups/working-groups.json index 0e09e10..eb24c8a 100644 --- a/about/working-groups/working-groups.json +++ b/about/working-groups/working-groups.json @@ -4167,5 +4167,19 @@ "categories": [ "contributors" ] + }, + { + "displayName": "andreycha", + "lastName": "andreycha", + "headshot": "https://avatars.githubusercontent.com/u/1696046?v=4", + "organization": null, + "description": null, + "twitter": null, + "linkedin": null, + "github": "andreycha", + "homepage": "https://github.com/andreycha", + "categories": [ + "contributors" + ] } -] +] \ No newline at end of file From 465caf3fb9620eab32bef64ddbfbb35cc5df16b1 Mon Sep 17 00:00:00 2001 From: anthonyharrison Date: Wed, 3 Jan 2024 22:33:46 +0000 Subject: [PATCH 11/11] feat: Add MLBOMdoc Signed-off-by: anthonyharrison --- _data/tools.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_data/tools.yml b/_data/tools.yml index 3fc7d86..87a484f 100644 --- a/_data/tools.yml +++ b/_data/tools.yml @@ -1836,3 +1836,11 @@ - opensource - build-integration - github-action +- name: MLBOMdoc + publisher: Anthony Harrison + description: A command line tool which produces a human-readable representaion of a CycloneDX ML Bill of Materials (MLBOM). Output formats include PDF and Markdown. + repoUrl: https://github.com/anthonyharrison/mlbomdoc + websiteUrl: https://pypi.org/project/mlbomdoc/ + categories: + - opensource + - analysis \ No newline at end of file