From 2a78a3757795bbbfb6ac875dc51ec3b4eb7a5364 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Mon, 21 Aug 2017 14:03:14 -0700
Subject: Refactor oparent for independent versioning

Change-Id: I543f394b360b6926986f33b48bef4b3355363beb
Issue-id: INT-103
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 checkstyle/pom.xml                                 |   2 +-
 .../src/main/resources/apache-license-2.regexp.txt |  15 -
 checkstyle/src/main/resources/check-license.xml    |  19 -
 .../onap-checkstyle/apache-license-2.regexp.txt    |  15 +
 .../resources/onap-checkstyle/check-license.xml    |  19 +
 .../resources/onap-checkstyle/onap-java-style.xml  | 220 +++++++++
 checkstyle/src/main/resources/onap-java-style.xml  | 220 ---------
 license/pom.xml                                    |   2 +-
 oparent/pom.xml                                    | 493 ++++++++++++++++++++
 pom.xml                                            | 504 ++-------------------
 version/pom.xml                                    |  41 --
 11 files changed, 791 insertions(+), 759 deletions(-)
 delete mode 100644 checkstyle/src/main/resources/apache-license-2.regexp.txt
 delete mode 100644 checkstyle/src/main/resources/check-license.xml
 create mode 100644 checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt
 create mode 100644 checkstyle/src/main/resources/onap-checkstyle/check-license.xml
 create mode 100644 checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
 delete mode 100644 checkstyle/src/main/resources/onap-java-style.xml
 create mode 100644 oparent/pom.xml
 delete mode 100644 version/pom.xml

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 00f76d6..8dd9c61 100644
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -20,7 +20,7 @@
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../version</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>checkstyle</artifactId>
   <name>oparent/checkstyle</name>
diff --git a/checkstyle/src/main/resources/apache-license-2.regexp.txt b/checkstyle/src/main/resources/apache-license-2.regexp.txt
deleted file mode 100644
index 5b69f28..0000000
--- a/checkstyle/src/main/resources/apache-license-2.regexp.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-^/[*]+$
-^ \* Copyright .*$
-^ \*( )?$
-^ \* 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.
-^ [*]+/$
diff --git a/checkstyle/src/main/resources/check-license.xml b/checkstyle/src/main/resources/check-license.xml
deleted file mode 100644
index 2a0acd0..0000000
--- a/checkstyle/src/main/resources/check-license.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-    Checkstyle configuration that checks the license headers
-    expected by Open-O.
- -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-    <property name="severity" value="warning"/>
-
-    <module name="RegexpHeader">
-        <property name="headerFile" value="${checkstyle.header.file}"/>
-        <property name="multiLines" value="2"/>
-    </module>
-</module>
diff --git a/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt b/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt
new file mode 100644
index 0000000..5b69f28
--- /dev/null
+++ b/checkstyle/src/main/resources/onap-checkstyle/apache-license-2.regexp.txt
@@ -0,0 +1,15 @@
+^/[*]+$
+^ \* Copyright .*$
+^ \*( )?$
+^ \* 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.
+^ [*]+/$
diff --git a/checkstyle/src/main/resources/onap-checkstyle/check-license.xml b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml
new file mode 100644
index 0000000..2a0acd0
--- /dev/null
+++ b/checkstyle/src/main/resources/onap-checkstyle/check-license.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    Checkstyle configuration that checks the license headers
+    expected by Open-O.
+ -->
+
+<module name = "Checker">
+    <property name="charset" value="UTF-8"/>
+    <property name="severity" value="warning"/>
+
+    <module name="RegexpHeader">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="multiLines" value="2"/>
+    </module>
+</module>
diff --git a/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
new file mode 100644
index 0000000..32439e2
--- /dev/null
+++ b/checkstyle/src/main/resources/onap-checkstyle/onap-java-style.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0"?>
+<!--
+   Copyright (c) 2016 Huawei Technologies Co., Ltd.
+
+   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.
+-->
+<!DOCTYPE module PUBLIC
+          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+
+    Checkstyle configuration that checks the Google coding conventions from:
+
+    -  Google Java Style
+       https://google-styleguide.googlecode.com/svn-history/r130/trunk/javaguide.html
+
+    Checkstyle is very configurable. Be sure to read the documentation at
+    http://checkstyle.sf.net (or in your downloaded distribution).
+
+    Most Checks are configurable, be sure to consult the documentation.
+
+    To completely disable a check, just comment it out or delete it from the file.
+
+    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
+
+ -->
+
+<module name = "Checker">
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="warning"/>
+
+    <property name="fileExtensions" value="java, properties, xml"/>
+    <!-- Checks for whitespace                               -->
+    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="FileTabCharacter">
+            <property name="eachLine" value="true"/>
+        </module>
+
+    <module name="TreeWalker">
+        <module name="OuterTypeFilename"/>
+        <module name="IllegalTokenText">
+            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
+            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
+            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
+        </module>
+        <module name="AvoidEscapedUnicodeCharacters">
+            <property name="allowEscapesForControlCharacters" value="true"/>
+            <property name="allowByTailComment" value="true"/>
+            <property name="allowNonPrintableEscapes" value="true"/>
+        </module>
+        <module name="LineLength">
+            <property name="max" value="120"/>
+            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
+        <module name="AvoidStarImport"/>
+        <module name="OneTopLevelClass"/>
+        <module name="NoLineWrap"/>
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+        <module name="NeedBraces"/>
+        <module name="LeftCurly">
+            <property name="maxLineLength" value="120"/>
+        </module>
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="true"/>
+            <property name="allowEmptyTypes" value="true"/>
+            <property name="allowEmptyLoops" value="true"/>
+            <message key="ws.notFollowed"
+             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+             <message key="ws.notPreceded"
+             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="OneStatementPerLine"/>
+        <module name="MultipleVariableDeclarations"/>
+        <module name="ArrayTypeStyle"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="FallThrough"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="EmptyLineSeparator">
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+            <message key="name.invalidPattern"
+             value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="TypeName">
+            <message key="name.invalidPattern"
+             value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MemberName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+             value="Member name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ParameterName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+             value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="LocalVariableName">
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
+            <property name="allowOneCharVarInForLoop" value="true"/>
+            <message key="name.invalidPattern"
+             value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+             value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+             value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="NoFinalizer"/>
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+             <message key="ws.preceded"
+             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+             <message key="ws.illegalFollow"
+             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+             <message key="ws.notPreceded"
+             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="Indentation">
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="4"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="lineWrappingIndentation" value="4"/>
+            <property name="arrayInitIndent" value="4"/>
+        </module>
+        <module name="AbbreviationAsWordInName">
+            <property name="ignoreFinal" value="false"/>
+            <property name="allowedAbbreviationLength" value="1"/>
+        </module>
+        <module name="OverloadMethodsDeclarationOrder"/>
+        <module name="VariableDeclarationUsageDistance"/>
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+        </module>
+        <module name="MethodParamPad"/>
+        <module name="OperatorWrap">
+            <property name="option" value="NL"/>
+            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
+        </module>
+        <module name="AnnotationLocation">
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="allowSamelineMultipleAnnotations" value="true"/>
+        </module>
+        <module name="NonEmptyAtclauseDescription"/>
+        <module name="JavadocTagContinuationIndentation"/>
+        <module name="SummaryJavadocCheck">
+            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+        </module>
+        <module name="JavadocParagraph"/>
+        <module name="AtclauseOrder">
+            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+        </module>
+        <module name="JavadocMethod">
+            <property name="scope" value="public"/>
+            <property name="allowMissingParamTags" value="true"/>
+            <property name="allowMissingThrowsTags" value="true"/>
+            <property name="allowMissingReturnTag" value="true"/>
+            <property name="minLineCount" value="2"/>
+            <property name="allowedAnnotations" value="Override, Test"/>
+            <property name="allowThrowsTagsForSubclasses" value="true"/>
+        </module>
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+             value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+        <module name="SingleLineJavadoc">
+            <property name="ignoreInlineTags" value="false"/>
+        </module>
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="expected"/>
+        </module>
+        <module name="CommentsIndentation"/>
+    </module>
+</module>
diff --git a/checkstyle/src/main/resources/onap-java-style.xml b/checkstyle/src/main/resources/onap-java-style.xml
deleted file mode 100644
index 32439e2..0000000
--- a/checkstyle/src/main/resources/onap-java-style.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Copyright (c) 2016 Huawei Technologies Co., Ltd.
-
-   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.
--->
-<!DOCTYPE module PUBLIC
-          "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-          "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-
-<!--
-
-    Checkstyle configuration that checks the Google coding conventions from:
-
-    -  Google Java Style
-       https://google-styleguide.googlecode.com/svn-history/r130/trunk/javaguide.html
-
-    Checkstyle is very configurable. Be sure to read the documentation at
-    http://checkstyle.sf.net (or in your downloaded distribution).
-
-    Most Checks are configurable, be sure to consult the documentation.
-
-    To completely disable a check, just comment it out or delete it from the file.
-
-    Authors: Max Vetrenko, Ruslan Diachenko, Roman Ivanov.
-
- -->
-
-<module name = "Checker">
-    <property name="charset" value="UTF-8"/>
-
-    <property name="severity" value="warning"/>
-
-    <property name="fileExtensions" value="java, properties, xml"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="FileTabCharacter">
-            <property name="eachLine" value="true"/>
-        </module>
-
-    <module name="TreeWalker">
-        <module name="OuterTypeFilename"/>
-        <module name="IllegalTokenText">
-            <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
-            <property name="format" value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
-            <property name="message" value="Avoid using corresponding octal or Unicode escape."/>
-        </module>
-        <module name="AvoidEscapedUnicodeCharacters">
-            <property name="allowEscapesForControlCharacters" value="true"/>
-            <property name="allowByTailComment" value="true"/>
-            <property name="allowNonPrintableEscapes" value="true"/>
-        </module>
-        <module name="LineLength">
-            <property name="max" value="120"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        </module>
-        <module name="AvoidStarImport"/>
-        <module name="OneTopLevelClass"/>
-        <module name="NoLineWrap"/>
-        <module name="EmptyBlock">
-            <property name="option" value="TEXT"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
-        </module>
-        <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="120"/>
-        </module>
-        <module name="RightCurly">
-            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-            <property name="allowEmptyTypes" value="true"/>
-            <property name="allowEmptyLoops" value="true"/>
-            <message key="ws.notFollowed"
-             value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
-             <message key="ws.notPreceded"
-             value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="OneStatementPerLine"/>
-        <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
-        <module name="MissingSwitchDefault"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="DOT"/>
-            <property name="option" value="nl"/>
-        </module>
-        <module name="SeparatorWrap">
-            <property name="tokens" value="COMMA"/>
-            <property name="option" value="EOL"/>
-        </module>
-        <module name="PackageName">
-            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
-            <message key="name.invalidPattern"
-             value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="TypeName">
-            <message key="name.invalidPattern"
-             value="Type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-             value="Member name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ParameterName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <message key="name.invalidPattern"
-             value="Parameter name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="LocalVariableName">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
-            <property name="allowOneCharVarInForLoop" value="true"/>
-            <message key="name.invalidPattern"
-             value="Local variable name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="ClassTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-             value="Class type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="MethodTypeParameterName">
-            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
-            <message key="name.invalidPattern"
-             value="Method type name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="NoFinalizer"/>
-        <module name="GenericWhitespace">
-            <message key="ws.followed"
-             value="GenericWhitespace ''{0}'' is followed by whitespace."/>
-             <message key="ws.preceded"
-             value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
-             <message key="ws.illegalFollow"
-             value="GenericWhitespace ''{0}'' should followed by whitespace."/>
-             <message key="ws.notPreceded"
-             value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="braceAdjustment" value="0"/>
-            <property name="caseIndent" value="4"/>
-            <property name="throwsIndent" value="4"/>
-            <property name="lineWrappingIndentation" value="4"/>
-            <property name="arrayInitIndent" value="4"/>
-        </module>
-        <module name="AbbreviationAsWordInName">
-            <property name="ignoreFinal" value="false"/>
-            <property name="allowedAbbreviationLength" value="1"/>
-        </module>
-        <module name="OverloadMethodsDeclarationOrder"/>
-        <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-        </module>
-        <module name="MethodParamPad"/>
-        <module name="OperatorWrap">
-            <property name="option" value="NL"/>
-            <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR "/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF"/>
-        </module>
-        <module name="AnnotationLocation">
-            <property name="tokens" value="VARIABLE_DEF"/>
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="NonEmptyAtclauseDescription"/>
-        <module name="JavadocTagContinuationIndentation"/>
-        <module name="SummaryJavadocCheck">
-            <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
-        </module>
-        <module name="JavadocParagraph"/>
-        <module name="AtclauseOrder">
-            <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
-            <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="public"/>
-            <property name="allowMissingParamTags" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingReturnTag" value="true"/>
-            <property name="minLineCount" value="2"/>
-            <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowThrowsTagsForSubclasses" value="true"/>
-        </module>
-        <module name="MethodName">
-            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
-            <message key="name.invalidPattern"
-             value="Method name ''{0}'' must match pattern ''{1}''."/>
-        </module>
-        <module name="SingleLineJavadoc">
-            <property name="ignoreInlineTags" value="false"/>
-        </module>
-        <module name="EmptyCatchBlock">
-            <property name="exceptionVariableName" value="expected"/>
-        </module>
-        <module name="CommentsIndentation"/>
-    </module>
-</module>
diff --git a/license/pom.xml b/license/pom.xml
index 414b29e..50b2c5f 100644
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -20,7 +20,7 @@
     <groupId>org.onap.oparent</groupId>
     <artifactId>version</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../version</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <artifactId>onap-license</artifactId>
   <name>oparent/license</name>
diff --git a/oparent/pom.xml b/oparent/pom.xml
new file mode 100644
index 0000000..9cde98f
--- /dev/null
+++ b/oparent/pom.xml
@@ -0,0 +1,493 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
+
+   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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.oparent</groupId>
+    <artifactId>version</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>oparent</artifactId>
+  <name>oparent/oparent</name>
+  <packaging>pom</packaging>
+  <scm>
+    <connection>scm:git:ssh://git.onap.org:29418/oparent.git</connection>
+    <developerConnection>scm:git:ssh://git.onap.org:29418/oparent.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.onap.org/display/DW/Integration+Project</url>
+  </scm>
+  <properties>
+    <jacoco.version>0.7.7.201606060606</jacoco.version>
+    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+    <!-- Default Sonar configuration -->
+    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
+    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+    <!-- If following file exist, auto-generation of swagger.json will be done -->
+    <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
+
+    <!-- If following file exist, auto-generation of sdk will be done -->
+    <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
+  </properties>
+
+  <profiles>
+        <profile>
+            <id>generate-json</id>
+            <activation>
+                <file>
+                    <exists>${swagger-properties}</exists>
+                </file>
+                <property>
+                    <name>swagger-sdk.generate-json</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>properties-maven-plugin</artifactId>
+                        <version>1.0.0</version>
+                          <executions>
+                              <execution>
+                                <phase>initialize</phase>
+                                <goals>
+                                  <goal>read-project-properties</goal>
+                                </goals>
+                                <configuration>
+                                  <files>
+                                    <file>${basedir}/src/main/resources/swagger.properties</file>
+                                  </files>
+                                </configuration>
+                              </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>com.github.kongchen</groupId>
+                        <artifactId>swagger-maven-plugin</artifactId>
+                        <version>3.1.4</version>
+                        <configuration>
+                            <apiSources>
+                              <apiSource>
+                                    <locations>${api-rest-package}</locations>
+                                    <schemes>http,https</schemes>
+                                    <host>${api-host-ip}:${api-host-port}</host>
+                                    <basePath>${api-base-path}</basePath>
+                                    <info>
+                                        <title>${api-title}</title>
+                                        <version>${api-version}</version>
+                                        <description>${api-description}</description>
+                                        <license>
+                                            <name>${api-license}</name>
+                                        </license>
+                                    </info>
+                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
+                                </apiSource>
+                            </apiSources>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>compile</phase>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <version>2.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>install-file-id</id>
+                                <phase>install</phase>
+                                <goals>
+                                    <goal>install-file</goal>
+                                </goals>
+                                <configuration>
+                                    <file>${basedir}/src/main/resources/swagger.json</file>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
+                                    <version>${project.version}</version>
+                                    <packaging>json</packaging>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+              </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>generate-sdk</id>
+            <activation>
+                <file>
+                    <exists>${swagger-json}</exists>
+                </file>
+                <property>
+                    <name>swagger-sdk.generate-java-sdk</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.8</version>
+                        <executions>
+                          <execution>
+                            <phase>initialize</phase>
+                            <id>ant-create-script</id>
+                            <configuration>
+                                <exportAntProperties>true</exportAntProperties>
+                                <tasks>
+
+                                    <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath" />
+                                    <condition property="is_windows" value="true">
+                                                <os family="windows"/>
+                                    </condition>
+                                    <condition property="isLinux" value="true">
+                                            <os family="unix" />
+                                    </condition>
+                                    <if>
+                                      <equals arg1="${is_windows}" arg2="true" />
+                                      <then>
+                                            <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
+                                            <echo file="${project.build.directory}${file.separator}generated-source-script.bat"
+                                             append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+                                            <echo file="${project.build.directory}${file.separator}generated-source-script.bat"
+                                            append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                      </then>
+                                      <else>
+                                            <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
+                                              <echo file="${project.build.directory}${file.separator}generated-source-script.sh"
+                                              append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
+                                            <echo file="${project.build.directory}${file.separator}generated-source-script.sh"
+                                            append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
+                                            <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
+                                      </else>
+                                    </if>
+                                </tasks>
+                            </configuration>
+                            <goals>
+                              <goal>run</goal>
+                            </goals>
+                          </execution>
+                        </executions>
+                        <dependencies>
+                        <dependency>
+                                    <groupId>ant-contrib</groupId>
+                                    <artifactId>ant-contrib</artifactId>
+                                    <version>1.0b3</version>
+                                    <exclusions>
+                                      <exclusion>
+                                        <artifactId>ant</artifactId>
+                                        <groupId>ant</groupId>
+                                      </exclusion>
+                                    </exclusions>
+                                  </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>io.swagger</groupId>
+                        <artifactId>swagger-codegen-maven-plugin</artifactId>
+                        <version>2.2.1</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>generate</goal>
+                                </goals>
+                                <configuration>
+                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
+                                    <output>${project.build.directory}/generated-sources</output>
+                                    <language>java</language>
+                                    <configOptions>
+                                       <dateLibrary>joda</dateLibrary>
+                                    </configOptions>
+                                    <library>jersey2</library>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
+                                    <artifactVersion>${project.version}</artifactVersion>
+                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
+                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
+                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                      <artifactId>exec-maven-plugin</artifactId>
+                      <groupId>org.codehaus.mojo</groupId>
+                      <version>1.5.0</version>
+                      <executions>
+                        <execution>
+                          <id>swagger-generate-sources</id>
+                          <phase>generate-sources</phase>
+                          <goals>
+                            <goal>exec</goal>
+                          </goals>
+                          <configuration>
+                            <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
+                          </configuration>
+                        </execution>
+                      </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-clean-plugin</artifactId>
+                        <version>3.0.0</version>
+                        <executions>
+                            <execution>
+                                <id>clean-generated-files</id>
+                                <phase>generate-sources</phase>
+                                <goals>
+                                    <goal>clean</goal>
+                                </goals>
+                                <configuration>
+                                    <filesets>
+                                        <fileset>
+                                            <directory>${project.build.directory}/generated-sources</directory>
+                                        </fileset>
+                                    </filesets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+              </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>org.onap.msb.swagger-sdk</groupId>
+                    <artifactId>swagger-sdk</artifactId>
+                    <version>1.0.0-SNAPSHOT</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.17</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.onap.oparent</groupId>
+              <artifactId>checkstyle</artifactId>
+              <version>1.0.0-SNAPSHOT</version>
+            </dependency>
+          </dependencies>
+          <executions>
+            <execution>
+              <id>check-license</id>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <phase>process-sources</phase>
+              <configuration>
+                <configLocation>onap-checkstyle/check-license.xml</configLocation>
+                <headerLocation>onap-checkstyle/apache-license-2.regexp.txt</headerLocation>
+                <includeResources>false</includeResources>
+                <includeTestSourceDirectory>true</includeTestSourceDirectory>
+                <includeTestResources>false</includeTestResources>
+                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+                <excludes>
+                </excludes>
+                <failsOnError>false</failsOnError>
+                <consoleOutput>true</consoleOutput>
+              </configuration>
+            </execution>
+            <execution>
+              <id>check-style</id>
+              <goals>
+                <goal>check</goal>
+              </goals>
+              <phase>process-sources</phase>
+              <configuration>
+		<!-- Use Google Java Style Guide:
+                     https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
+                     with minor changes -->
+		<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
+		<!-- <sourceDirectory> is needed so that checkstyle ignores the generated sources directory -->
+		<sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
+		<includeResources>true</includeResources>
+		<includeTestSourceDirectory>true</includeTestSourceDirectory>
+		<includeTestResources>true</includeTestResources>
+		<excludes>
+		</excludes>
+		<failsOnError>false</failsOnError>
+		<consoleOutput>true</consoleOutput>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>${jacoco.version}</version>
+          <configuration>
+            <!-- Note: This exclusion list should match <sonar.exclusions>
+         property above -->
+            <excludes>
+              <exclude>**/gen/**</exclude>
+              <exclude>**/generated-sources/**</exclude>
+              <exclude>**/yang-gen/**</exclude>
+              <exclude>**/pax/**</exclude>
+            </excludes>
+          </configuration>
+          <executions>
+            <!--
+        Prepares the property pointing to the JaCoCo runtime agent which
+        is passed as VM argument when Maven the Surefire plugin is executed.
+        -->
+            <execution>
+              <id>pre-unit-test</id>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <configuration>
+                <!-- Sets the path to the file which contains the execution data. -->
+                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                <!--
+            Sets the name of the property containing the settings
+            for JaCoCo runtime agent.
+        -->
+                <propertyName>surefireArgLine</propertyName>
+              </configuration>
+            </execution>
+            <!--
+        Ensures that the code coverage report for unit tests is created after
+        unit tests have been run.
+        -->
+            <execution>
+              <id>post-unit-test</id>
+              <phase>test</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+              <configuration>
+                <!-- Sets the path to the file which contains the execution data. -->
+                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                <!-- Sets the output directory for the code coverage report. -->
+                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+              </configuration>
+            </execution>
+            <execution>
+              <id>pre-integration-test</id>
+              <phase>pre-integration-test</phase>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+              <configuration>
+                <!-- Sets the path to the file which contains the execution data. -->
+                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                <!--
+            Sets the name of the property containing the settings
+            for JaCoCo runtime agent.
+        -->
+                <propertyName>failsafeArgLine</propertyName>
+              </configuration>
+            </execution>
+            <!--
+        Ensures that the code coverage report for integration tests after
+        integration tests have been run.
+        -->
+            <execution>
+              <id>post-integration-test</id>
+              <phase>post-integration-test</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+              <configuration>
+                <!-- Sets the path to the file which contains the execution data. -->
+                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                <!-- Sets the output directory for the code coverage report. -->
+                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.19.1</version>
+          <configuration>
+            <!-- Sets the VM argument line used when unit tests are run. -->
+            <argLine>${surefireArgLine}</argLine>
+            <!-- Excludes integration tests when unit tests are run. -->
+            <excludes>
+              <exclude>**/IT*.java</exclude>
+            </excludes>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-failsafe-plugin</artifactId>
+          <version>2.19.1</version>
+          <executions>
+            <!--
+        Ensures that both integration-test and verify goals of the Failsafe Maven
+        plugin are executed.
+        -->
+            <execution>
+              <id>integration-tests</id>
+              <goals>
+                <goal>integration-test</goal>
+                <goal>verify</goal>
+              </goals>
+              <configuration>
+                <!-- Sets the VM argument line used when integration tests are run. -->
+                <argLine>${failsafeArgLine}</argLine>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+    <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
+    <plugin>
+      <groupId>org.sonarsource.scanner.maven</groupId>
+      <artifactId>sonar-maven-plugin</artifactId>
+      <version>3.3.0.603</version>
+    </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.12</version>
+      </plugin>
+      <!-- Jacoco / Sonar -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
index e6f1280..4165b16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,490 +16,70 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.onap.oparent</groupId>
-    <artifactId>version</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>version</relativePath>
-  </parent>
   <name>oparent</name>
-  <artifactId>oparent</artifactId>
+  <groupId>org.onap.oparent</groupId>
+  <artifactId>version</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <scm>
-    <connection>scm:git:ssh://git.onap.org:29418/oparent.git</connection>
-    <developerConnection>scm:git:ssh://git.onap.org:29418/oparent.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.onap.org/display/DW/Integration+Project</url>
-  </scm>
   <modules>
     <!-- oparent tools -->
-    <module>version</module>
     <module>checkstyle</module>
     <module>license</module>
+    <module>oparent</module>
   </modules>
-  <properties>
-    <jacoco.version>0.7.7.201606060606</jacoco.version>
-    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
-    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <!-- Default Sonar configuration -->
-    <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-    <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-    <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-    <!-- If following file exist, auto-generation of swagger.json will be done -->
-    <swagger-properties>${basedir}/src/main/resources/swagger.properties</swagger-properties>
 
-    <!-- If following file exist, auto-generation of sdk will be done -->
-    <swagger-json>${basedir}/src/main/resources/swagger.json</swagger-json>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
   </properties>
 
-  <profiles>
-        <profile>
-            <id>generate-json</id>
-            <activation>
-                <file>
-                    <exists>${swagger-properties}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-json</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>properties-maven-plugin</artifactId>
-                        <version>1.0.0</version>
-                          <executions>
-                              <execution>
-                                <phase>initialize</phase>
-                                <goals>
-                                  <goal>read-project-properties</goal>
-                                </goals>
-                                <configuration>
-                                  <files>
-                                    <file>${basedir}/src/main/resources/swagger.properties</file>
-                                  </files>
-                                </configuration>
-                              </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <version>3.1.4</version>
-                        <configuration>
-                            <apiSources>
-                              <apiSource>
-                                    <locations>${api-rest-package}</locations>
-                                    <schemes>http,https</schemes>
-                                    <host>${api-host-ip}:${api-host-port}</host>
-                                    <basePath>${api-base-path}</basePath>
-                                    <info>
-                                        <title>${api-title}</title>
-                                        <version>${api-version}</version>
-                                        <description>${api-description}</description>
-                                        <license>
-                                            <name>${api-license}</name>
-                                        </license>
-                                    </info>
-                                    <swaggerDirectory>${basedir}/src/main/resources</swaggerDirectory>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-install-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <executions>
-                            <execution>
-                                <id>install-file-id</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <configuration>
-                                    <file>${basedir}/src/main/resources/swagger.json</file>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-swagger-schema</artifactId>
-                                    <version>${project.version}</version>
-                                    <packaging>json</packaging>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-              </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>generate-sdk</id>
-            <activation>
-                <file>
-                    <exists>${swagger-json}</exists>
-                </file>
-                <property>
-                    <name>swagger-sdk.generate-java-sdk</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.8</version>
-                        <executions>
-                          <execution>
-                            <phase>initialize</phase>
-                            <id>ant-create-script</id>
-                            <configuration>
-                                <exportAntProperties>true</exportAntProperties>
-                                <tasks>
+  <distributionManagement>
+    <repository>
+      <id>ecomp-releases</id>
+      <url>${onap.nexus.url}/content/repositories/releases</url>
+    </repository>
+    <snapshotRepository>
+      <id>ecomp-snapshots</id>
+      <url>${onap.nexus.url}/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
 
-                                    <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath" />
-                                    <condition property="is_windows" value="true">
-                                                <os family="windows"/>
-                                    </condition>
-                                    <condition property="isLinux" value="true">
-                                            <os family="unix" />
-                                    </condition>
-                                    <if>
-                                      <equals arg1="${is_windows}" arg2="true" />
-                                      <then>
-                                            <property name="swagger.sdk.script.file" value="generated-source-script.bat"/>
-                                            <echo file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                             append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                            <echo file="${project.build.directory}${file.separator}generated-source-script.bat"
-                                            append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                      </then>
-                                      <else>
-                                            <property name="swagger.sdk.script.file" value="generated-source-script.sh"/>
-                                              <echo file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                              append="true" message="cd ${project.build.directory}${file.separator}generated-sources${line.separator}" />
-                                            <echo file="${project.build.directory}${file.separator}generated-source-script.sh"
-                                            append="true" message="mvn clean install -Dmaven.test.skip=true${line.separator}" />
-                                            <chmod file="${project.build.directory}${file.separator}generated-source-script.sh" perm="755"/>
-                                      </else>
-                                    </if>
-                                </tasks>
-                            </configuration>
-                            <goals>
-                              <goal>run</goal>
-                            </goals>
-                          </execution>
-                        </executions>
-                        <dependencies>
-                        <dependency>
-                                    <groupId>ant-contrib</groupId>
-                                    <artifactId>ant-contrib</artifactId>
-                                    <version>1.0b3</version>
-                                    <exclusions>
-                                      <exclusion>
-                                        <artifactId>ant</artifactId>
-                                        <groupId>ant</groupId>
-                                      </exclusion>
-                                    </exclusions>
-                                  </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-codegen-maven-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                                <configuration>
-                                    <inputSpec>${basedir}/src/main/resources/swagger.json</inputSpec>
-                                    <output>${project.build.directory}/generated-sources</output>
-                                    <language>java</language>
-                                    <configOptions>
-                                       <dateLibrary>joda</dateLibrary>
-                                    </configOptions>
-                                    <library>jersey2</library>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}-java-sdk</artifactId>
-                                    <artifactVersion>${project.version}</artifactVersion>
-                                    <modelPackage>${project.groupId}.${project.artifactId}.client.model</modelPackage>
-                                    <apiPackage>${project.groupId}.${project.artifactId}.client.api</apiPackage>
-                                    <invokerPackage>${project.groupId}.${project.artifactId}.client.invoker</invokerPackage>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                      <artifactId>exec-maven-plugin</artifactId>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <version>1.5.0</version>
-                      <executions>
-                        <execution>
-                          <id>swagger-generate-sources</id>
-                          <phase>generate-sources</phase>
-                          <goals>
-                            <goal>exec</goal>
-                          </goals>
-                          <configuration>
-                            <executable>${project.build.directory}${file.separator}${swagger.sdk.script.file}</executable>
-                          </configuration>
-                        </execution>
-                      </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-clean-plugin</artifactId>
-                        <version>3.0.0</version>
-                        <executions>
-                            <execution>
-                                <id>clean-generated-files</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>clean</goal>
-                                </goals>
-                                <configuration>
-                                    <filesets>
-                                        <fileset>
-                                            <directory>${project.build.directory}/generated-sources</directory>
-                                        </fileset>
-                                    </filesets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-              </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.onap.msb.swagger-sdk</groupId>
-                    <artifactId>swagger-sdk</artifactId>
-                    <version>1.0.0-SNAPSHOT</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
-          <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.17</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.onap.oparent</groupId>
-              <artifactId>checkstyle</artifactId>
-              <version>1.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.onap.oparent</groupId>
-              <artifactId>onap-license</artifactId>
-              <version>1.0.0-SNAPSHOT</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <!-- Use Google Java Style Guide:
-                https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml
-                with minor changes -->
-            <configLocation>onap-java-style.xml</configLocation>
-            <!-- <sourceDirectory> is needed so that checkstyle ignores the
-                 generated sources directory -->
-            <sourceDirectory>${project.build.sourceDirectory}/src/main/java</sourceDirectory>
-            <includeResources>true</includeResources>
-            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-            <includeTestResources>true</includeTestResources>
-            <excludes>
-            </excludes>
-            <failsOnError>false</failsOnError>
-            <consoleOutput>true</consoleOutput>
-          </configuration>
-          <executions>
-            <execution>
-              <id>check-license</id>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-              <configuration>
-                <configLocation>check-license.xml</configLocation>
-                <headerLocation>apache-license-2.regexp.txt</headerLocation>
-                <includeResources>false</includeResources>
-                <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                <includeTestResources>false</includeTestResources>
-                <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-                <excludes>
-                </excludes>
-                <failsOnError>false</failsOnError>
-                <consoleOutput>true</consoleOutput>
-              </configuration>
-            </execution>
-            <execution>
-              <id>check-style</id>
-              <goals>
-                <goal>check</goal>
-              </goals>
-              <phase>process-sources</phase>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.jacoco</groupId>
-          <artifactId>jacoco-maven-plugin</artifactId>
-          <version>${jacoco.version}</version>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+          <version>1.6.7</version>
+          <extensions>true</extensions>
           <configuration>
-            <!-- Note: This exclusion list should match <sonar.exclusions>
-         property above -->
-            <excludes>
-              <exclude>**/gen/**</exclude>
-              <exclude>**/generated-sources/**</exclude>
-              <exclude>**/yang-gen/**</exclude>
-              <exclude>**/pax/**</exclude>
-            </excludes>
+            <nexusUrl>${onap.nexus.url}</nexusUrl>
+            <stagingProfileId>176c31dfe190a</stagingProfileId>
+            <serverId>ecomp-staging</serverId>
           </configuration>
-          <executions>
-            <!--
-        Prepares the property pointing to the JaCoCo runtime agent which
-        is passed as VM argument when Maven the Surefire plugin is executed.
-        -->
-            <execution>
-              <id>pre-unit-test</id>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
-                <!--
-            Sets the name of the property containing the settings
-            for JaCoCo runtime agent.
-        -->
-                <propertyName>surefireArgLine</propertyName>
-              </configuration>
-            </execution>
-            <!--
-        Ensures that the code coverage report for unit tests is created after
-        unit tests have been run.
-        -->
-            <execution>
-              <id>post-unit-test</id>
-              <phase>test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
-                <!-- Sets the output directory for the code coverage report. -->
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-              </configuration>
-            </execution>
-            <execution>
-              <id>pre-integration-test</id>
-              <phase>pre-integration-test</phase>
-              <goals>
-                <goal>prepare-agent</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
-                <!--
-            Sets the name of the property containing the settings
-            for JaCoCo runtime agent.
-        -->
-                <propertyName>failsafeArgLine</propertyName>
-              </configuration>
-            </execution>
-            <!--
-        Ensures that the code coverage report for integration tests after
-        integration tests have been run.
-        -->
-            <execution>
-              <id>post-integration-test</id>
-              <phase>post-integration-test</phase>
-              <goals>
-                <goal>report</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the path to the file which contains the execution data. -->
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
-                <!-- Sets the output directory for the code coverage report. -->
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
+	</plugin>
+	<plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.19.1</version>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter -->
           <configuration>
-            <!-- Sets the VM argument line used when unit tests are run. -->
-            <argLine>${surefireArgLine}</argLine>
-            <!-- Excludes integration tests when unit tests are run. -->
-            <excludes>
-              <exclude>**/IT*.java</exclude>
-            </excludes>
+            <skip />
           </configuration>
-        </plugin>
+	</plugin>
+      </plugins>
+    </pluginManagement>
+      <plugins>
         <plugin>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+	</plugin>
+	<plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.19.1</version>
-          <executions>
-            <!--
-        Ensures that both integration-test and verify goals of the Failsafe Maven
-        plugin are executed.
-        -->
-            <execution>
-              <id>integration-tests</id>
-              <goals>
-                <goal>integration-test</goal>
-                <goal>verify</goal>
-              </goals>
-              <configuration>
-                <!-- Sets the VM argument line used when integration tests are run. -->
-                <argLine>${failsafeArgLine}</argLine>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-    <!-- https://mvnrepository.com/artifact/org.sonarsource.scanner.maven/sonar-maven-plugin -->
-    <plugin>
-      <groupId>org.sonarsource.scanner.maven</groupId>
-      <artifactId>sonar-maven-plugin</artifactId>
-      <version>3.3.0.603</version>
-    </plugin>
+          <artifactId>maven-deploy-plugin</artifactId>
+	</plugin>
       </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.12</version>
-      </plugin>
-      <!-- Jacoco / Sonar -->
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-      </plugin>
-    </plugins>
   </build>
 </project>
diff --git a/version/pom.xml b/version/pom.xml
deleted file mode 100644
index a88b9d4..0000000
--- a/version/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (c) 2016-2017 Huawei Technologies Co., Ltd.
-
-   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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.onap.oparent</groupId>
-  <artifactId>version</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>oparent/version</name>
-  <packaging>pom</packaging>
-  <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
-  </properties>
-  <distributionManagement>
-    <repository>
-      <id>ecomp-releases</id>
-      <url>${onap.nexus.url}/content/repositories/releases</url>
-    </repository>
-    <snapshotRepository>
-      <id>ecomp-snapshots</id>
-      <url>${onap.nexus.url}/content/repositories/snapshots</url>
-    </snapshotRepository>
-  </distributionManagement>
-</project>
-- 
cgit 1.2.3-korg