diff options
| author |   Matthieu Geerebaert <matthieu.geerebaert@orange.com> | 2019-09-02 15:59:16 +0200 |
|---|---|---|
| committer | Matthieu Geerebaert <matthieu.geerebaert@orange.com> | 2019-09-04 16:26:54 +0200 |
| commit | bc114b17c8a0cff6a0e150dcacc9bbcc475d3319 (patch) | |
| tree | 9d46be0b3ee995b230d43d37ae13e7799b9404f0 | |
| parent | 8a2baa3b0c847fcdbe25df7124587fa09256f0b7 (diff) | |
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 <matthieu.geerebaert@orange.com>
24 files changed, 359 insertions, 14 deletions
@@ -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 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <xs:schema xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns="http://orange.com/ONAPNBI/api/hub/v4/model" xmlns:xs="http://www.w3.org/2001/XMLSchema" diff --git a/docs/offeredapis/api_hub/swagger.yaml b/docs/offeredapis/api_hub/swagger.yaml index 52f5859..dc8e16b 100644 --- a/docs/offeredapis/api_hub/swagger.yaml +++ b/docs/offeredapis/api_hub/swagger.yaml @@ -1,3 +1,16 @@ +# 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" swagger: "2.0" info: description: "Provides the ability to subscribe to and unsubscribe from External\ diff --git a/docs/offeredapis/api_serviceCatalog/api.plantuml b/docs/offeredapis/api_serviceCatalog/api.plantuml index 8483238..0de0005 100644 --- a/docs/offeredapis/api_serviceCatalog/api.plantuml +++ b/docs/offeredapis/api_serviceCatalog/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 enum LifecycleStatusValues { diff --git a/docs/offeredapis/api_serviceCatalog/model.xsd b/docs/offeredapis/api_serviceCatalog/model.xsd index 4011997..8be053c 100644 --- a/docs/offeredapis/api_serviceCatalog/model.xsd +++ b/docs/offeredapis/api_serviceCatalog/model.xsd @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <xs:schema xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns="http://orange.com/ONAPNBI/api/serviceCatalog/v3/model" xmlns:xs="http://www.w3.org/2001/XMLSchema" diff --git a/docs/offeredapis/api_serviceCatalog/swagger.yaml b/docs/offeredapis/api_serviceCatalog/swagger.yaml index b9cfbc6..b810cdf 100644 --- a/docs/offeredapis/api_serviceCatalog/swagger.yaml +++ b/docs/offeredapis/api_serviceCatalog/swagger.yaml @@ -1,3 +1,16 @@ +# 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" swagger: "2.0" info: description: "serviceCatalog API designed for ONAP Beijing Release.\nThis API is\ diff --git a/docs/offeredapis/api_serviceInventory/api.plantuml b/docs/offeredapis/api_serviceInventory/api.plantuml index 3805ae9..ed869ff 100644 --- a/docs/offeredapis/api_serviceInventory/api.plantuml +++ b/docs/offeredapis/api_serviceInventory/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 enum eventType { diff --git a/docs/offeredapis/api_serviceInventory/model.xsd b/docs/offeredapis/api_serviceInventory/model.xsd index fa63c9e..0f6a3d3 100644 --- a/docs/offeredapis/api_serviceInventory/model.xsd +++ b/docs/offeredapis/api_serviceInventory/model.xsd @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <xs:schema xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns="http://orange.com/ONAPNBI/api/serviceInventory/v4/model" xmlns:xs="http://www.w3.org/2001/XMLSchema" diff --git a/docs/offeredapis/api_serviceInventory/swagger.yaml b/docs/offeredapis/api_serviceInventory/swagger.yaml index 0d85e25..8f2ebee 100644 --- a/docs/offeredapis/api_serviceInventory/swagger.yaml +++ b/docs/offeredapis/api_serviceInventory/swagger.yaml @@ -1,3 +1,16 @@ +# 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" swagger: "2.0" info: description: "Query information about instantiated services\n\nList of available\ diff --git a/docs/offeredapis/api_serviceOrder/api.plantuml b/docs/offeredapis/api_serviceOrder/api.plantuml index c13c0c5..9464f56 100644 --- a/docs/offeredapis/api_serviceOrder/api.plantuml +++ b/docs/offeredapis/api_serviceOrder/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 enum ActionType { diff --git a/docs/offeredapis/api_serviceOrder/model.xsd b/docs/offeredapis/api_serviceOrder/model.xsd index aecd8f4..61ce741 100644 --- a/docs/offeredapis/api_serviceOrder/model.xsd +++ b/docs/offeredapis/api_serviceOrder/model.xsd @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <xs:schema xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns="http://orange.com/ONAPNBI/api/serviceOrder/v4/model" xmlns:xs="http://www.w3.org/2001/XMLSchema" diff --git a/docs/offeredapis/api_serviceOrder/swagger.yaml b/docs/offeredapis/api_serviceOrder/swagger.yaml index 3485680..2108fc3 100644 --- a/docs/offeredapis/api_serviceOrder/swagger.yaml +++ b/docs/offeredapis/api_serviceOrder/swagger.yaml @@ -1,3 +1,16 @@ +# 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" swagger: "2.0" info: description: "Request the instantiation of a service\n\nA Service Order is a type\ diff --git a/docs/offeredapis/api_status/api.plantuml b/docs/offeredapis/api_status/api.plantuml index 6c5ed42..665143d 100644 --- a/docs/offeredapis/api_status/api.plantuml +++ b/docs/offeredapis/api_status/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 enum StatusValue { diff --git a/docs/offeredapis/api_status/model.xsd b/docs/offeredapis/api_status/model.xsd index c679ac2..fa6ce4a 100644 --- a/docs/offeredapis/api_status/model.xsd +++ b/docs/offeredapis/api_status/model.xsd @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <xs:schema xmlns:xmime="http://www.w3.org/2005/05/xmlmime" xmlns="http://orange.com/ONAPNBI/api/status/v4/model" xmlns:xs="http://www.w3.org/2001/XMLSchema" diff --git a/docs/offeredapis/api_status/swagger.yaml b/docs/offeredapis/api_status/swagger.yaml index c35ba4f..7f74c26 100644 --- a/docs/offeredapis/api_status/swagger.yaml +++ b/docs/offeredapis/api_status/swagger.yaml @@ -1,3 +1,16 @@ +# 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" swagger: "2.0" info: description: "Provides a healthcheck to verify that the NBI component is running\ @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> <!-- 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 @@ -419,20 +436,27 @@ <includes> <include>restclient/**</include> <include>src/**</include> - <include>./**/*.xml</include> - <include>./**/*.xml</include> - <include>./**/*.yml</include> - <include>./**/*.yaml</include> + <include>**/*.xml</include> + <include>**/*.xsd</include> + <include>**/*.yml</include> + <include>**/*.yaml</include> + <include>**/*.plantuml</include> </includes> <excludes> <!-- karate-config.js doesn't support comment, and is mandatory by karate --> <exclude>src/test/java/karate-config.js</exclude> + <exclude>releases/**/*.yaml</exclude> </excludes> <skipExistingHeaders>true</skipExistingHeaders> <skip>false</skip> <mapping> <http>SCRIPT_STYLE</http> + <xsd>XML_STYLE</xsd> + <yaml>SCRIPT_STYLE</yaml> + <yml>SCRIPT_STYLE</yml> + <feature>SCRIPT_STYLE</feature> + <plantuml>SCRIPT_STYLE</plantuml> </mapping> </configuration> <executions> 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 |