From 553523fd98bea8aa6adf712cdc948d58853eaa1b Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Tue, 12 Nov 2019 13:39:40 +0100 Subject: [PATCH] Fix licensing issues Change-Id: I7a3e772afc16d4991b8f7ff1551bf6f5407a3d22 Issue-ID: NONRTRIC-69 Signed-off-by: RehanRaza --- .gitignore | 1 + near-rt-ric-simulator/LICENSES.txt | 14 ++++++++++++++ near-rt-ric-simulator/a1-med-api/pom.xml | 19 +++++++++++++++++++ near-rt-ric-simulator/nearric-service/pom.xml | 20 ++++++++++++++++++++ .../onap/nearric/simulator/controller/A1PApi.java | 19 +++++++++++++++++++ .../src/main/resources/application.properties | 16 ++++++++++++++++ near-rt-ric-simulator/pom.xml | 20 ++++++++++++++++++++ sdnc-a1-controller/LICENSES.txt | 18 ++++++++++++++++++ sdnc-a1-controller/northbound/.scanignore | 6 ------ sdnc-a1-controller/northbound/README.md | 16 ++++++++++++++++ .../features/features-nonrt-ric-api/pom.xml | 2 +- .../northbound/nonrt-ric-api/features/pom.xml | 2 +- .../features/sdnc-nonrt-ric-api/pom.xml | 2 +- .../northbound/nonrt-ric-api/installer/pom.xml | 2 +- .../northbound/nonrt-ric-api/model/pom.xml | 2 +- .../model/scripts/python/yang2props.py | 17 +++++++++++++++++ .../model/src/main/yang/NONRT-RIC-API.yang | 21 ++++++++++++++++++++- sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml | 2 +- .../northbound/nonrt-ric-api/provider/pom.xml | 2 +- sdnc-a1-controller/northbound/pom.xml | 19 +++++++++++++++++++ sdnc-a1-controller/oam/README.md | 17 +++++++++++++++++ sdnc-a1-controller/oam/installation/pom.xml | 19 +++++++++++++++++++ sdnc-a1-controller/oam/installation/sdnc/pom.xml | 19 +++++++++++++++++++ .../installation/src/main/yaml/docker-compose.yml | 15 +++++++++++++++ .../oam/platform-logic/installer/pom.xml | 19 +++++++++++++++++++ sdnc-a1-controller/oam/platform-logic/pom.xml | 19 +++++++++++++++++++ sdnc-a1-controller/oam/platform-logic/setup/pom.xml | 19 +++++++++++++++++++ sdnc-a1-controller/oam/pom.xml | 19 +++++++++++++++++++ sdnc-a1-controller/pom.xml | 2 +- 29 files changed, 353 insertions(+), 15 deletions(-) create mode 100644 near-rt-ric-simulator/LICENSES.txt create mode 100644 sdnc-a1-controller/LICENSES.txt delete mode 100644 sdnc-a1-controller/northbound/.scanignore diff --git a/.gitignore b/.gitignore index c1089daf..67d6d0f1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .idea/ .tox docs/_build/ +.DS_STORE diff --git a/near-rt-ric-simulator/LICENSES.txt b/near-rt-ric-simulator/LICENSES.txt new file mode 100644 index 00000000..90b80827 --- /dev/null +++ b/near-rt-ric-simulator/LICENSES.txt @@ -0,0 +1,14 @@ +LICENSES.txt + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the "Software License"); +you may not use this software except in compliance with the Software +License. You may obtain a copy of the Software License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the Software License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the Software License for the specific language governing permissions +and limitations under the Software License. diff --git a/near-rt-ric-simulator/a1-med-api/pom.xml b/near-rt-ric-simulator/a1-med-api/pom.xml index 8c25392f..4030c1c5 100644 --- a/near-rt-ric-simulator/a1-med-api/pom.xml +++ b/near-rt-ric-simulator/a1-med-api/pom.xml @@ -1,4 +1,23 @@ + diff --git a/near-rt-ric-simulator/nearric-service/pom.xml b/near-rt-ric-simulator/nearric-service/pom.xml index 85650f45..dbf17231 100644 --- a/near-rt-ric-simulator/nearric-service/pom.xml +++ b/near-rt-ric-simulator/nearric-service/pom.xml @@ -1,3 +1,23 @@ + + diff --git a/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java index 5254c1de..4f8b31e5 100644 --- a/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java +++ b/near-rt-ric-simulator/nearric-service/src/main/java/org/onap/nearric/simulator/controller/A1PApi.java @@ -1,3 +1,22 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2019 Nordix Foundation. + * ================================================================================ + * 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 + * + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ /** * NOTE: This class is auto generated by the swagger code generator program (3.0.8). * https://github.com/swagger-api/swagger-codegen diff --git a/near-rt-ric-simulator/nearric-service/src/main/resources/application.properties b/near-rt-ric-simulator/nearric-service/src/main/resources/application.properties index cbb8218b..b6c85b58 100644 --- a/near-rt-ric-simulator/nearric-service/src/main/resources/application.properties +++ b/near-rt-ric-simulator/nearric-service/src/main/resources/application.properties @@ -1,3 +1,19 @@ +# ========================LICENSE_START================================= +# %% +# Copyright (C) 2019 Nordix Foundation +# %% +# 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 +# +# 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. +# ========================LICENSE_END=================================== spring.security.user.name=admin spring.security.user.password=admin spring.jackson.property-naming-strategy=SNAKE_CASE \ No newline at end of file diff --git a/near-rt-ric-simulator/pom.xml b/near-rt-ric-simulator/pom.xml index b8752c69..ce73b7ac 100644 --- a/near-rt-ric-simulator/pom.xml +++ b/near-rt-ric-simulator/pom.xml @@ -1,3 +1,23 @@ + + diff --git a/sdnc-a1-controller/LICENSES.txt b/sdnc-a1-controller/LICENSES.txt new file mode 100644 index 00000000..9706e3a6 --- /dev/null +++ b/sdnc-a1-controller/LICENSES.txt @@ -0,0 +1,18 @@ +LICENSES.txt + +The content of this sub-directory is based on ONAP SDNC project, +with appropriate licenses specified in the individual files. +The modifications are covered by the following license: + +Unless otherwise specified, all software contained herein is licensed +under the Apache License, Version 2.0 (the "Software License"); +you may not use this software except in compliance with the Software +License. You may obtain a copy of the Software License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the Software License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the Software License for the specific language governing permissions +and limitations under the Software License. diff --git a/sdnc-a1-controller/northbound/.scanignore b/sdnc-a1-controller/northbound/.scanignore deleted file mode 100644 index eeb990cb..00000000 --- a/sdnc-a1-controller/northbound/.scanignore +++ /dev/null @@ -1,6 +0,0 @@ -vnfapi/model/src/main/yang/VNF-API.yang: leaf aic-clli { -vnfapi/model/src/main/yang/VNF-API.yang: leaf aic-cloud-region { -vnfapi/model/src/main/yang/VNF-API.yang: description "The AIC cloud region which maps to contrail versions"; -vnfapi/model/src/main/yang/VNF-API.yang: leaf aic-clli { -vnfapi/model/src/main/yang/VNF-API.yang: leaf aic-cloud-region { -vnfapi/model/src/main/yang/VNF-API.yang: description "The AIC cloud region which maps to contrail versions"; diff --git a/sdnc-a1-controller/northbound/README.md b/sdnc-a1-controller/northbound/README.md index 64be1de0..f5ae1290 100644 --- a/sdnc-a1-controller/northbound/README.md +++ b/sdnc-a1-controller/northbound/README.md @@ -5,4 +5,20 @@ To compile this code: 2. To compile, run "mvn clean install". +## License + +Copyright (C) 2019 Nordix Foundation. +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 + +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. + +For more information about license please see the [LICENSE](LICENSE.txt) file for details. diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml index 635b4f78..8a2a5160 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml @@ -1,7 +1,7 @@ 4.0.0 diff --git a/sdnc-a1-controller/oam/README.md b/sdnc-a1-controller/oam/README.md index 98b67fb0..2cabf6bd 100644 --- a/sdnc-a1-controller/oam/README.md +++ b/sdnc-a1-controller/oam/README.md @@ -11,4 +11,21 @@ To compile this code: 2. To compile, run "mvn clean install". +## License + +Copyright (C) 2019 Nordix Foundation. +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 + +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. + +For more information about license please see the [LICENSE](LICENSE.txt) file for details. + diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml index 301d0bb7..e8a0e51b 100644 --- a/sdnc-a1-controller/oam/installation/pom.xml +++ b/sdnc-a1-controller/oam/installation/pom.xml @@ -1,4 +1,23 @@ + diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml index 352fe172..16f6bc8c 100644 --- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml +++ b/sdnc-a1-controller/oam/installation/sdnc/pom.xml @@ -1,4 +1,23 @@ + diff --git a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml index 9ec77923..a747d1b3 100644 --- a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml +++ b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml @@ -1,3 +1,18 @@ +# ================================================================================== +# Modifications Copyright (c) 2019 Nordix Foundation. +# +# 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 +# +# 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. +# ================================================================================== version: '2.1' networks: diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml index 1bc0a03a..10555242 100644 --- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml @@ -1,4 +1,23 @@ + 4.0.0 diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml index be067fc9..c309d393 100644 --- a/sdnc-a1-controller/oam/platform-logic/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/pom.xml @@ -1,4 +1,23 @@ + 4.0.0 diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml index 2efbb2ce..03c5615d 100644 --- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml @@ -1,4 +1,23 @@ + 4.0.0 diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml index 5b86ce5b..24be9a07 100755 --- a/sdnc-a1-controller/oam/pom.xml +++ b/sdnc-a1-controller/oam/pom.xml @@ -1,4 +1,23 @@ + 4.0.0 diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml index 349041dc..b67bcaf7 100644 --- a/sdnc-a1-controller/pom.xml +++ b/sdnc-a1-controller/pom.xml @@ -1,7 +1,7 @@