From c1bfbc373393cd1d9e05f6762513d023a73b24b4 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:47:11 -0400 Subject: [PATCH 1/4] LF Website https://github.com/cncf/foundation/blob/main/website-guidelines.md Signed-off-by: Lou DeGenaro --- README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 404c32c..eb899a3 100644 --- a/README.md +++ b/README.md @@ -75,22 +75,29 @@ Visit external site [Kubernetes WG Policy: OSCAL transformer](https://github.com ## License & Authors If you would like to see the detailed LICENSE click [here](LICENSE). -Consult [contributors](https://github.com/IBM/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. - -Note that some content referenced within this repository is under separate licenses and is annotated as such. +Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](https://github.com/oscal-compass/community/blob/main/MAINTAINERS.md) for the core team. ```text -# Copyight (c) 2021 IBM Corp. All rights reserved. +# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + ``` + +______________________________________________________________________ + +We are a Cloud Native Computing Foundation sandbox project. + +The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". + +*Trestle demo's was originally created by IBM.* From af70ce5335c0f92c6e639c81a1926c7c6df0e0a9 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 16:30:11 -0400 Subject: [PATCH 2/4] contributors link & cncf logo Signed-off-by: Lou DeGenaro --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb899a3..61ae435 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Visit external site [Kubernetes WG Policy: OSCAL transformer](https://github.com ## License & Authors If you would like to see the detailed LICENSE click [here](LICENSE). -Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](https://github.com/oscal-compass/community/blob/main/MAINTAINERS.md) for the core team. +Consult [contributors](https://github.com/oscal-compass/compliance-trestle-demos/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. ```text # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. @@ -98,6 +98,11 @@ ______________________________________________________________________ We are a Cloud Native Computing Foundation sandbox project. + + + + + The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". *Trestle demo's was originally created by IBM.* From fef2204b495df83daea87abfead2a99aff65f234 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 16:33:29 -0400 Subject: [PATCH 3/4] fix maintainers Signed-off-by: Lou DeGenaro --- MAINTAINERS.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index d5527b3..462f895 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,3 +1,11 @@ -# MAINTAINERS +Trestle demos was designed and open sourced by a team based at [IBM Research](https://www.research.ibm.com/) and others around the world. The list includes: -Christopher Ferris - chrisfer@us.ibm.com +Alejandro Jose Leiva Palomo [AleJo2995](https://github.com/AleJo2995) + +Christopher Butler [butler54](https://github.com/butler54) + +Lou Degenaro [degenaro](https://github.com/degenaro) + +Manjiree Gadgil [mrgadgil](https://github.com/mrgadgil) + +Vikas Agarwal [vikas-agarwal76](https://github.com/vikas-agarwal76) From 7f539c86cc43a6857d1303105b6395c73829966b Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Sun, 8 Sep 2024 08:22:11 -0400 Subject: [PATCH 4/4] Use maintainers identical to compliance trestle. Signed-off-by: Lou DeGenaro --- MAINTAINERS.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 462f895..da60ba7 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,4 +1,4 @@ -Trestle demos was designed and open sourced by a team based at [IBM Research](https://www.research.ibm.com/) and others around the world. The list includes: +Trestle was designed and open sourced by a team based at [IBM Research](https://www.research.ibm.com/) and others around the world. The list includes: Alejandro Jose Leiva Palomo [AleJo2995](https://github.com/AleJo2995) @@ -6,6 +6,8 @@ Christopher Butler [butler54](https://github.com/butler54) Lou Degenaro [degenaro](https://github.com/degenaro) +Jennifer Power [jpower432](https://github.com/jpower432) + Manjiree Gadgil [mrgadgil](https://github.com/mrgadgil) Vikas Agarwal [vikas-agarwal76](https://github.com/vikas-agarwal76)