From 6ff6ed9734d5cfa5ebc8e362dfdb63fa55cc0dbd Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Mon, 3 Feb 2020 09:31:39 -0500 Subject: Adding Copyright to all Files Reformatting POM Files as per mvn tidy:pom Change-Id: Id90a8b5450d08ee810718cb00d9fb8b6cf38618a Issue-ID: CCSDK-2069 Signed-off-by: Singal, Kapil (ks220y) --- sdnr/wt/devicemanager-oran/feature/pom.xml | 80 ++++---- sdnr/wt/devicemanager-oran/installer/pom.xml | 226 +++++++++++---------- .../src/assembly/assemble_mvnrepo_zip.xml | 80 ++++---- sdnr/wt/devicemanager-oran/model/pom.xml | 120 +++++------ sdnr/wt/devicemanager-oran/pom.xml | 42 ++-- sdnr/wt/devicemanager-oran/provider/pom.xml | 202 +++++++++--------- .../org/opendaylight/blueprint/impl-blueprint.xml | 61 +++--- .../provider/src/main/resources/version.properties | 23 ++- .../src/test/resources/simplelogger.properties | 21 ++ 9 files changed, 454 insertions(+), 401 deletions(-) (limited to 'sdnr/wt/devicemanager-oran') diff --git a/sdnr/wt/devicemanager-oran/feature/pom.xml b/sdnr/wt/devicemanager-oran/feature/pom.xml index 1b0fa6be1..1f5e11f0b 100644 --- a/sdnr/wt/devicemanager-oran/feature/pom.xml +++ b/sdnr/wt/devicemanager-oran/feature/pom.xml @@ -1,48 +1,50 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.feature - * ================================================================================ - * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. - * 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. - * 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========================================================= - ---> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + single-feature-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-feature - 0.7.1-SNAPSHOT - feature + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-feature + 0.7.1-SNAPSHOT + feature - ccsdk-features :: ${project.artifactId} :: feature + ccsdk-features :: ${project.artifactId} - - - ${project.groupId} - sdnr-wt-devicemanager-oran-provider - ${project.version} - - + + + ${project.groupId} + sdnr-wt-devicemanager-oran-provider + ${project.version} + + diff --git a/sdnr/wt/devicemanager-oran/installer/pom.xml b/sdnr/wt/devicemanager-oran/installer/pom.xml index 49969018a..2004e02f1 100755 --- a/sdnr/wt/devicemanager-oran/installer/pom.xml +++ b/sdnr/wt/devicemanager-oran/installer/pom.xml @@ -1,125 +1,127 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.installer - * ================================================================================ - * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. - * 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. - * 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========================================================= - ---> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-installer - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-installer + 0.7.1-SNAPSHOT + pom - ccsdk-features :: ${project.artifactId} + ccsdk-features :: ${project.artifactId} - - sdnr-wt-devicemanager-oran - false - + + sdnr-wt-devicemanager-oran + false + - + + + + org.opendaylight.controller + mdsal-artifacts + ${odl.controller.mdsal.version} + pom + import + + + - - org.opendaylight.controller - mdsal-artifacts - ${odl.controller.mdsal.version} - pom - import - + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-feature + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.features.sdnr.wt + ${application.name}-provider + ${project.version} + - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-feature - ${project.version} - xml - features - - - * - * - - - - - org.onap.ccsdk.features.sdnr.wt - ${application.name}-provider - ${project.version} - - - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-nested-dependencies - - copy-dependencies - - prepare-package - - true - ${project.build.directory}/assembly/system - false - true - true - true - false - false - - - - - - + + + + maven-assembly-plugin + + + maven-repo-zip + + single + + package + + true + stage/${application.name}-${project.version} + + src/assembly/assemble_mvnrepo_zip.xml + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-nested-dependencies + + copy-dependencies + + prepare-package + + true + ${project.build.directory}/assembly/system + false + true + true + true + false + false + + + + + + diff --git a/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml b/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml index c4eb9aa25..dfe5060bf 100644 --- a/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/sdnr/wt/devicemanager-oran/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -1,49 +1,47 @@ - repo - - zip - - - - false - - - - target/assembly/ - . - - - - - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + repo + + zip + + + + false + + + + target/assembly/ + . + + + + diff --git a/sdnr/wt/devicemanager-oran/model/pom.xml b/sdnr/wt/devicemanager-oran/model/pom.xml index 6d3521533..c8c09cfe5 100644 --- a/sdnr/wt/devicemanager-oran/model/pom.xml +++ b/sdnr/wt/devicemanager-oran/model/pom.xml @@ -1,70 +1,72 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager.model - * ================================================================================ - * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. - * 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. - * 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========================================================= - ---> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-model - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-model + 0.7.1-SNAPSHOT + bundle - ccsdk-features :: ${project.artifactId} - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - true - + + true + - - + + - - - - org.jacoco - jacoco-maven-plugin - - - **/gen/** - **/generated-sources/** - **/yang-gen-sal/** - **/pax/** - - - - - + + + + org.jacoco + jacoco-maven-plugin + + + **/gen/** + **/generated-sources/** + **/yang-gen-sal/** + **/pax/** + + + + + diff --git a/sdnr/wt/devicemanager-oran/pom.xml b/sdnr/wt/devicemanager-oran/pom.xml index 4caa87b00..e10c15d2d 100755 --- a/sdnr/wt/devicemanager-oran/pom.xml +++ b/sdnr/wt/devicemanager-oran/pom.xml @@ -1,26 +1,28 @@ - * ============LICENSE_START======================================================= - * ONAP : CCSDK.sdnr.wt.devicemanager - * ================================================================================ - * Copyright (C) 2018 highstreet technologies GmbH Intellectual Property. - * 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. - * 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========================================================= - ---> 4.0.0 diff --git a/sdnr/wt/devicemanager-oran/provider/pom.xml b/sdnr/wt/devicemanager-oran/provider/pom.xml index a552e6517..7c4e628f0 100644 --- a/sdnr/wt/devicemanager-oran/provider/pom.xml +++ b/sdnr/wt/devicemanager-oran/provider/pom.xml @@ -1,103 +1,105 @@ -* ============LICENSE_START======================================================= -* ONAP : ccsdk features -* ================================================================================ -* Copyright (C) 2020 highstreet technologies GmbH Intellectual Property. -* 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. -* 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========================================================= - ---> - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - binding-parent - 1.5.2-SNAPSHOT - - + + org.onap.ccsdk.parent + binding-parent + 1.5.2-SNAPSHOT + + - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-oran-provider - 0.7.1-SNAPSHOT - bundle + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-oran-provider + 0.7.1-SNAPSHOT + bundle - ccsdk-features :: ${project.artifactId} - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - + ccsdk-features :: ${project.artifactId} + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0 + + - - true - true - yyyy-MM-dd HH:mm - ${maven.build.timestamp} UTC - 49400 - + + true + true + yyyy-MM-dd HH:mm + ${maven.build.timestamp} UTC + 49400 + - - - - org.mockito - mockito-core - test - + + + + org.mockito + mockito-core + test + - - - ${project.groupId} - sdnr-wt-devicemanager-oran-model - ${project.version} - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-devicemanager-model - ${project.version} - provided - - - ${project.groupId} - sdnr-wt-netconfnode-state-service-model - ${project.version} - provided - - - org.opendaylight.netconf - sal-netconf-connector - provided - - - org.opendaylight.mdsal - mdsal-singleton-common-api - provided - - + + + ${project.groupId} + sdnr-wt-devicemanager-oran-model + ${project.version} + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-devicemanager-model + ${project.version} + provided + + + ${project.groupId} + sdnr-wt-netconfnode-state-service-model + ${project.version} + provided + + + org.opendaylight.netconf + sal-netconf-connector + provided + + + org.opendaylight.mdsal + mdsal-singleton-common-api + provided + + - - - - src/main/resources - true - - - + + + + src/main/resources + true + + + org.jacoco jacoco-maven-plugin @@ -119,19 +121,19 @@ generate-sources exec - - - bash - - ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh - initfile - -f - ${project.build.directory}/EsInit.script - - + + + bash + + ${basedir}/../../data-provider/provider/src/main/resources/es-init.sh + initfile + -f + ${project.build.directory}/EsInit.script + + - + diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml index 799dd5f5c..21b761ce2 100644 --- a/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml +++ b/sdnr/wt/devicemanager-oran/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml @@ -1,35 +1,38 @@ - 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========================================================= - --> + - - - - - - - + + + diff --git a/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties b/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties index 80373399e..6638c04f9 100644 --- a/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties +++ b/sdnr/wt/devicemanager-oran/provider/src/main/resources/version.properties @@ -1,3 +1,24 @@ -# Proberties filled in by maven during build process +# +# ============LICENSE_START======================================================= +# ONAP : ccsdk features +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. 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. +# 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======================================================= +# +# + +# Properties filled in by maven during build process version = ${project.version} build = ${buildtime} diff --git a/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties b/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties index bdc3c1009..9af26dc96 100644 --- a/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties +++ b/sdnr/wt/devicemanager-oran/provider/src/test/resources/simplelogger.properties @@ -1,3 +1,24 @@ +# +# ============LICENSE_START======================================================= +# ONAP : ccsdk features +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. 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. +# 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======================================================= +# +# + # SLF4J's SimpleLogger configuration file # Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err. -- cgit 1.2.3-korg