From 5e478c120100f2559fe4969b6195d4d3d4c9848a Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 10:58:27 -0400 Subject: [PATCH 01/12] LF footer website guidelines https://github.com/cncf/foundation/blob/main/website-guidelines.md Signed-off-by: Lou DeGenaro --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2407cf760..88ffd823b 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ 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](MAINTAINERS.md) for the core team. ```text -# Copyright (c) 2020 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. @@ -127,3 +127,11 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph # 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)". + +*OSCAL Compass was originally contributed by IBM and Red Hat.* From 3de7de82ba6ba279832d9804e5fbbd8e4423a4ae Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:08:46 -0400 Subject: [PATCH 02/12] make mdformat Signed-off-by: Lou DeGenaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88ffd823b..4ced03a97 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph ``` ------ +______________________________________________________________________ We are a Cloud Native Computing Foundation sandbox project. From 36f547070c6807b767bf52d2d2c33de26bd1bf56 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:16:30 -0400 Subject: [PATCH 03/12] Trestle created Signed-off-by: Lou DeGenaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ced03a97..2b1cd0335 100644 --- a/README.md +++ b/README.md @@ -134,4 +134,4 @@ 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)". -*OSCAL Compass was originally contributed by IBM and Red Hat.* +*Trestle was originally created by IBM and Red Hat.* From a72fe2a6d0874977a4739240e2501957363be4f0 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:26:16 -0400 Subject: [PATCH 04/12] fix maintainers link Signed-off-by: Lou DeGenaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b1cd0335..525b824f3 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ Participation in the OSCAL Compass community is governed by the [Code of Conduct ## 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](MAINTAINERS.md) for the core team. +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 # Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. From 9f33b75b01f299f350fad219c4029212ea8ffef3 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:30:27 -0400 Subject: [PATCH 05/12]
Signed-off-by: Lou DeGenaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 525b824f3..59bbbb34f 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph ``` -______________________________________________________________________ +
We are a Cloud Native Computing Foundation sandbox project. From a9cb3211c6596d58c0295a5afd403a1ec416ed59 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:58:09 -0400 Subject: [PATCH 06/12] remove hr Signed-off-by: Lou DeGenaro --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 59bbbb34f..af1f6f9a5 100644 --- a/README.md +++ b/README.md @@ -125,10 +125,9 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph # 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. From 1324fcab6ad73c7ab1914422726f29039eac9e57 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 15:29:53 -0400 Subject: [PATCH 07/12] fix maintainers reference Signed-off-by: Lou DeGenaro --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index af1f6f9a5..1193b68f1 100644 --- a/README.md +++ b/README.md @@ -108,8 +108,7 @@ Participation in the OSCAL Compass community is governed by the [Code of Conduct ## 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/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. From c25a3bc18070588e66c8249e3c82c34a452e4dcc Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 15:33:40 -0400 Subject: [PATCH 08/12] And license. Signed-off-by: Lou DeGenaro --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1193b68f1..a12c0745f 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ Participation in the OSCAL Compass community is governed by the [Code of Conduct ## 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](MAINTAINERS.md) for the core team. ```text From 6ba55b2254535de421a7a0569a3231cc4fbbc501 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 15:47:30 -0400 Subject: [PATCH 09/12] add cncf logo Signed-off-by: Lou DeGenaro --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index a12c0745f..a80dc752a 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,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 was originally created by IBM and Red Hat.* From 1d730026d5bcec78743d9234b6b81c7faa152707 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 17:00:11 -0400 Subject: [PATCH 10/12] fix trestle website too Signed-off-by: Lou DeGenaro --- docs/index.md | 14 ++++++++++++-- docs/maintainers.md | 14 +++++++++++++- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index bee864d33..9874bc708 100644 --- a/docs/index.md +++ b/docs/index.md @@ -85,7 +85,7 @@ 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](maintainers/) for the core team. ```text -# Copyright (c) 2020 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. @@ -98,5 +98,15 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph # 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)". diff --git a/docs/maintainers.md b/docs/maintainers.md index c279e3448..da60ba7e1 100644 --- a/docs/maintainers.md +++ b/docs/maintainers.md @@ -1 +1,13 @@ -{!MAINTAINERS.md!} +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) + +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) From d97ac7e68a1597f13de2e7a96b95549b6bc56d52 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Mon, 2 Sep 2024 07:20:31 -0400 Subject: [PATCH 11/12] restore maintainers.md Signed-off-by: Lou DeGenaro --- docs/maintainers.md | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/docs/maintainers.md b/docs/maintainers.md index da60ba7e1..c279e3448 100644 --- a/docs/maintainers.md +++ b/docs/maintainers.md @@ -1,13 +1 @@ -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) - -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) +{!MAINTAINERS.md!} From 86553f7ad30e109aeb933c4c0a5cab0491f27aac Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Tue, 3 Sep 2024 16:09:59 -0400 Subject: [PATCH 12/12] remove Red Hat from footer, per Red Hat request Signed-off-by: Lou DeGenaro --- README.md | 2 +- docs/index.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a80dc752a..5dd0d97d3 100644 --- a/README.md +++ b/README.md @@ -138,4 +138,4 @@ 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 was originally created by IBM and Red Hat.* +*Trestle was originally created by IBM.* diff --git a/docs/index.md b/docs/index.md index 9874bc708..4c8f7e3b4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -110,3 +110,5 @@ 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 was originally created by IBM.*