Merge pull request #58 from EOSC-PLATFORM/devel

merge changes from devel

CONTRIBUTING.md

@@ -2,24 +2,36 @@ Please Record your contributions here.
 
 ## Contribution History
 
-### 2024-05-02
+### 2024-05-09
+- **Change**: The `Readme.md` files:
+  - KER1j: The **CC-BY** license for the **EOSC SMS ISM Additions and improvements** has been changed to **Restricted (GDPR limitations)**.
+The URL row for **EOSC SMS ISM Additions and improvements** has been deleted.
+  - KER1k: The **CC-BY** license for the result **Additions and improvements** has been changed to **Restricted (GDPR limitations)**.
+  - KER2a: The license for the **Service Catalogue content** result has been changed from  **Apache 2.0** to **Restricted (GDPR limitations)**.
+- **Location**: This change was made in the directories:
+  - `Software-Documentation/Key Exploitation Results/#KER1j EOSC Security Coordination`
+  - `Software-Documentation/Key Exploitation Results/#KER1k EOSC Service Management System`
+  - `Software-Documentation/Key Exploitation Results/#KER2a EOSC Resource Catalogue (Service Provider Portal)`
+- **Reason**: The `Readme.md` files were updated according to e-mail correspondence.
+
+### 2024-05-08
 - **Change**: The `LICENSE.txt` files, which previously contained software licences, have now been updated to include the `CC-BY` licence.
 - **Location**: This change was made in the directories:
   - `Software-Documentation/Technical Documentation/Catalogue and Marketplace (Athena-OpenAIRE-Cyfronet)/EOSC Marketplace and Search Service (Cyfronet)/Technical Documentation`
   - `Software-Documentation/Technical Documentation/Catalogue and Marketplace (Athena-OpenAIRE-Cyfronet)/EOSC Recommender System (Athena-GRNET-PSNC)/EOSC-RS-Core/Technical Documentation`
   - `Software-Documentation/Technical Documentation/Catalogue and Marketplace (Athena-OpenAIRE-Cyfronet)/EOSC User Dashboard (Cyfronet)/Technical Documentation`
   - `Software-Documentation/Technical Documentation/Order Management (EGI-Cyfronet)/Order Management System in the EOSC Catalogue (Cyfronet)/Technical Documentation`.
 - **Reason**: The `LICENSE.txt` files were updated according to e-mail correspondence.
-- 
-### 2024-05-02
+
+### 2024-05-08
 - **Change**: Added `LICENSE.txt` with `CC-BY` license.
 - **Location**: This change was made in the directories:
   - `Software-Documentation/Technical Documentation/Accounting (GRNET-OpenAIRE)/EOSC Accounting for Services (GRNET)/Technical Documentation`,
   - `Software-Documentation/Technical Documentation/Catalogue and Marketplace (Athena-OpenAIRE-Cyfronet)/EOSC Recommender System (Athena-GRNET-PSNC)/EOSC-RS-Extensons/Technical Documentation`,
   - `Software-Documentation/Technical Documentation/Messaging (GRNET)/EOSC Messaging Service (GRNET)/Technical Documentation`.
 - **Reason**: The `LICENSE.txt` files were added according to e-mail correspondence.
 
-### 2024-05-02
+### 2024-05-08
 - **Change**: Added `README.md` for `Software-Documentation/Technical Documentation`.
 - **Location**: This change was made in the `Software-Documentation/Technical Documentation` directory.
 - **Reason**: The `README.md` added according to e-mail correspondence.

Key Exploitation Results/#KER1j EOSC Security Coordination/Readme.md

@@ -10,17 +10,16 @@ Documentation
 
 # Foreground Identification
 
-| Foreground | IP owner | license|
-|------------|----------|--------|
-|Additions and improvements resulting in the EOSC Security Operational Baseline -	Incremental additions and improvements to the AARC Policy Development Kit "Service Operations Security Policy" as evolved by UK-IRIS and WISE SCI |Nikhef (NWO-I), STFC-RAL, EGI Foundation, CERN, CSC, FZ Juelich, CESNET, GEANT|[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.es)|
-|EOSC SMS ISM Additions and improvements - Incremental additions and improvements to the EOSC Information Security Management |Nikhef (NWO-I), STFC-RAL, EGI Foundation, CERN, CSC, FZ Juelich, CESNET, GEANT |[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.es)|
+| Foreground | IP owner | license                                                                            |
+|------------|----------|------------------------------------------------------------------------------------|
+|Additions and improvements resulting in the EOSC Security Operational Baseline -	Incremental additions and improvements to the AARC Policy Development Kit "Service Operations Security Policy" as evolved by UK-IRIS and WISE SCI |Nikhef (NWO-I), STFC-RAL, EGI Foundation, CERN, CSC, FZ Juelich, CESNET, GEANT| [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.es)                   |
+|EOSC SMS ISM Additions and improvements - Incremental additions and improvements to the EOSC Information Security Management |Nikhef (NWO-I), STFC-RAL, EGI Foundation, CERN, CSC, FZ Juelich, CESNET, GEANT | Restricted (GDPR limitations) |
 
 
 # URL to Results
 | Foreground | URL |
 |------------|-----|
 |Additions and improvements resulting in the EOSC Security Operational Baseline | https://search.marketplace.eosc-portal.eu/guidelines/eosc.df8f717f77566b7adde87ede8f55b31d|
-|EOSC SMS ISM Additions and improvements | https://wiki.eoscfuture.eu/display/EOSCSMS/Information+Security+Management+-+ISM|
 
 
 # Licensing

Key Exploitation Results/#KER1k EOSC Service Management System/Readme.md

@@ -7,9 +7,9 @@ Documentation
 
 # Foreground Identification
 
-| Foreground | IP owner | license|
-|------------|----------|--------|
-|Additions and improvements - Incremental additions and improvements to processes, procedures and policies elonging to the EOSC SMS|EGI Foundation, Jisc, CINECA, LIP, NIKHEF, CESSDA|[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.es)|
+| Foreground | IP owner | license                      |
+|------------|----------|------------------------------|
+|Additions and improvements - Incremental additions and improvements to processes, procedures and policies elonging to the EOSC SMS|EGI Foundation, Jisc, CINECA, LIP, NIKHEF, CESSDA| Restricted (GDPR limitatons) |
 
 # URL to Results
 

Key Exploitation Results/#KER2a EOSC Resource Catalogue (Service Provider Portal)/Readme.md

@@ -9,14 +9,14 @@ Software and documentation.
 
 # Foreground Identification
 
-| Foreground | IP owner | license|
-|------------|----------|--------|
-|Service Registry - Service Catalogue is a component of the EOSC Catalogue and Marketplace and offers the underlying storage functionality and the interoperability tools for the programmatic access, registration, manage (CRUD) of providers, services,and catalogues. |ARC|[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)|
-|Provider Dashboard - EOSC Service Provider Dashboard or Provider Portal enables the front-end functionality for the registration of EOSC Providers, organizations entitled to publish their resources via the EOSC Catalogue, and offers them capabilities to onboard and manage EOSC resources |ARC|[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)|
-|Interoperability Framework Registry - Interoperability Framework Registry provides infrastructure for providers to onboard Interoperability Guidelines that can be linked to resources in the Service Registry, thus facilitating compatibility and composability among resources with common guidelines. |ARC|[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.es)|
-|Service catalogue documentation vocabularies and scripts |ARC|[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)|
-|Service Catalogue content (Resources and Providers) - The collection of metadata records and links in the EOSC Service Catalogue for onboarded Resources and their Providers. Also, third party Catalogues with their Resources and Providers are included|ARC|[Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)|
-|Documentation about the Service Provider Portal - Technical documentation to deploy and run the Service Provider Portal|ARC|[CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.en)|
+| Foreground | IP owner | license                                                         |
+|------------|----------|-----------------------------------------------------------------|
+|Service Registry - Service Catalogue is a component of the EOSC Catalogue and Marketplace and offers the underlying storage functionality and the interoperability tools for the programmatic access, registration, manage (CRUD) of providers, services,and catalogues. |ARC| [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)       |
+|Provider Dashboard - EOSC Service Provider Dashboard or Provider Portal enables the front-end functionality for the registration of EOSC Providers, organizations entitled to publish their resources via the EOSC Catalogue, and offers them capabilities to onboard and manage EOSC resources |ARC| [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)       |
+|Interoperability Framework Registry - Interoperability Framework Registry provides infrastructure for providers to onboard Interoperability Guidelines that can be linked to resources in the Service Registry, thus facilitating compatibility and composability among resources with common guidelines. |ARC| [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.es) |
+|Service catalogue documentation vocabularies and scripts |ARC| [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0)       |
+|Service Catalogue content (Resources and Providers) - The collection of metadata records and links in the EOSC Service Catalogue for onboarded Resources and their Providers. Also, third party Catalogues with their Resources and Providers are included|ARC|Restricted (GDPR limitations)|
+|Documentation about the Service Provider Portal - Technical documentation to deploy and run the Service Provider Portal|ARC| [CC-BY 4.0](https://creativecommons.org/licenses/by/4.0/deed.en) |
 
 # URL to Results