From bc114b17c8a0cff6a0e150dcacc9bbcc475d3319 Mon Sep 17 00:00:00 2001 From: Matthieu Geerebaert Date: Mon, 2 Sep 2019 15:59:16 +0200 Subject: Improve license scan result Update pom.xml with new extension for mvn license:check and license:format Change-Id: Ib3fb1334178f4e4700b84c59f4a2af928b8f6207 Issue-ID: EXTAPI-306 Signed-off-by: MatthieuGeerebaert --- .gitreview | 15 ++++++++++ docs/offeredapis/api_hub/api.plantuml | 16 +++++++++++ docs/offeredapis/api_hub/model.xsd | 17 ++++++++++++ docs/offeredapis/api_hub/swagger.yaml | 13 +++++++++ docs/offeredapis/api_serviceCatalog/api.plantuml | 16 +++++++++++ docs/offeredapis/api_serviceCatalog/model.xsd | 17 ++++++++++++ docs/offeredapis/api_serviceCatalog/swagger.yaml | 13 +++++++++ docs/offeredapis/api_serviceInventory/api.plantuml | 16 +++++++++++ docs/offeredapis/api_serviceInventory/model.xsd | 17 ++++++++++++ docs/offeredapis/api_serviceInventory/swagger.yaml | 13 +++++++++ docs/offeredapis/api_serviceOrder/api.plantuml | 16 +++++++++++ docs/offeredapis/api_serviceOrder/model.xsd | 17 ++++++++++++ docs/offeredapis/api_serviceOrder/swagger.yaml | 13 +++++++++ docs/offeredapis/api_status/api.plantuml | 16 +++++++++++ docs/offeredapis/api_status/model.xsd | 17 ++++++++++++ docs/offeredapis/api_status/swagger.yaml | 13 +++++++++ pom.xml | 32 +++++++++++++++++++--- src/test/java/joe.jpage | 10 ------- .../karatetest/features/00--ServiceCatalog.feature | 14 ++++++++++ .../features/01--ServiceInventory.feature | 14 ++++++++++ .../karatetest/features/02--ServiceOrder.feature | 14 ++++++++++ .../karatetest/features/03--Subscriber.feature | 14 ++++++++++ .../features/04--StatusRessourceTest.feature | 16 +++++++++++ .../05--ListenerResourceTestTarget.feature | 14 ++++++++++ 24 files changed, 359 insertions(+), 14 deletions(-) delete mode 100644 src/test/java/joe.jpage diff --git a/.gitreview b/.gitreview index 4ddee5c..de9a2b3 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,19 @@ +# Copyright (c) 2018 Orange +# +# 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.swagger: "2.0" + [gerrit] host=gerrit.onap.org port=29418 project=externalapi/nbi.git + diff --git a/docs/offeredapis/api_hub/api.plantuml b/docs/offeredapis/api_hub/api.plantuml index 0b0016c..b495300 100644 --- a/docs/offeredapis/api_hub/api.plantuml +++ b/docs/offeredapis/api_hub/api.plantuml @@ -1,3 +1,19 @@ +# +# Copyright (c) 2018 Orange +# +# 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. +# + @startuml diff --git a/docs/offeredapis/api_hub/model.xsd b/docs/offeredapis/api_hub/model.xsd index 1fee9df..cd7c8b1 100644 --- a/docs/offeredapis/api_hub/model.xsd +++ b/docs/offeredapis/api_hub/model.xsd @@ -1,4 +1,21 @@ + + + + + + src/test/java/karate-config.js + releases/**/*.yaml true false SCRIPT_STYLE + XML_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE + SCRIPT_STYLE diff --git a/src/test/java/joe.jpage b/src/test/java/joe.jpage deleted file mode 100644 index 0e28672..0000000 --- a/src/test/java/joe.jpage +++ /dev/null @@ -1,10 +0,0 @@ -java.io.File file = new java.io.File("/home/user/Source/starck-xsl/spec.json"); -String jsonStr = org.apache.commons.io.FileUtils.readFileToString(file); - -System.out.println(jsonStr); - -org.json.JSONObject json = new org.json.JSONObject(jsonStr); -String xml = org.json.XML.toString(json); - -System.out.println(xml); - diff --git a/src/test/resources/karatetest/features/00--ServiceCatalog.feature b/src/test/resources/karatetest/features/00--ServiceCatalog.feature index 38807e2..728d3c8 100644 --- a/src/test/resources/karatetest/features/00--ServiceCatalog.feature +++ b/src/test/resources/karatetest/features/00--ServiceCatalog.feature @@ -1,3 +1,17 @@ +# Copyright (c) 2018 Orange +# +# 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.swagger: "2.0" + # new feature # Tags: optional diff --git a/src/test/resources/karatetest/features/01--ServiceInventory.feature b/src/test/resources/karatetest/features/01--ServiceInventory.feature index eacbf2f..106d623 100644 --- a/src/test/resources/karatetest/features/01--ServiceInventory.feature +++ b/src/test/resources/karatetest/features/01--ServiceInventory.feature @@ -1,3 +1,17 @@ +# Copyright (c) 2018 Orange +# +# 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.swagger: "2.0" + # new feature # Tags: optional diff --git a/src/test/resources/karatetest/features/02--ServiceOrder.feature b/src/test/resources/karatetest/features/02--ServiceOrder.feature index 4b4891d..b827381 100644 --- a/src/test/resources/karatetest/features/02--ServiceOrder.feature +++ b/src/test/resources/karatetest/features/02--ServiceOrder.feature @@ -1,3 +1,17 @@ +# Copyright (c) 2018 Orange +# +# 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.swagger: "2.0" + # new feature # Tags: optional diff --git a/src/test/resources/karatetest/features/03--Subscriber.feature b/src/test/resources/karatetest/features/03--Subscriber.feature index 1d9bfdf..94aed0d 100644 --- a/src/test/resources/karatetest/features/03--Subscriber.feature +++ b/src/test/resources/karatetest/features/03--Subscriber.feature @@ -1,3 +1,17 @@ +# Copyright (c) 2018 Orange +# +# 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.swagger: "2.0" + # new feature # Tags: optional diff --git a/src/test/resources/karatetest/features/04--StatusRessourceTest.feature b/src/test/resources/karatetest/features/04--StatusRessourceTest.feature index a21b9b3..fdcc138 100644 --- a/src/test/resources/karatetest/features/04--StatusRessourceTest.feature +++ b/src/test/resources/karatetest/features/04--StatusRessourceTest.feature @@ -1,3 +1,19 @@ +# +# Copyright (c) 2018 Orange +# +# 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. +# + # new feature # Tags: optional diff --git a/src/test/resources/karatetest/features/05--ListenerResourceTestTarget.feature b/src/test/resources/karatetest/features/05--ListenerResourceTestTarget.feature index a42f9b7..52cc91f 100644 --- a/src/test/resources/karatetest/features/05--ListenerResourceTestTarget.feature +++ b/src/test/resources/karatetest/features/05--ListenerResourceTestTarget.feature @@ -1,3 +1,17 @@ +# Copyright (c) 2018 Orange +# +# 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.swagger: "2.0" + # new feature # Tags: optional -- cgit 1.2.3-korg