Mapper (VESadapter) java upgrade 35/110435/8
authormukesh.paliwal1@huawei.com <mukesh.paliwal1@huawei.com>
Wed, 22 Jul 2020 08:41:49 +0000 (14:11 +0530)
committerMukesh Paliwal <mukesh.paliwal1@huawei.com>
Thu, 30 Jul 2020 04:46:39 +0000 (04:46 +0000)
Issue-ID: DCAEGEN2-2283

Signed-off-by: mukesh.paliwal1@huawei.com <mukesh.paliwal1@huawei.com>
Change-Id: Ib65f50299dbc86521db99b06739f6ce850b3a1e2

UniversalVesAdapter/pom.xml
UniversalVesAdapter/src/test/java/org/onap/universalvesadapter/adapter/UniversalEventAdapterTest.java
pom.xml
version.properties

index a0e120d..31039bf 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-* ============LICENSE_START=======================================================\r
-* ONAP : DCAEGEN2\r
-* ================================================================================\r
-* Copyright 2018-2019 TechMahindra\r
-*=================================================================================\r
-* Licensed under the Apache License, Version 2.0 (the "License");\r
-* you may not use this file except in compliance with the License.\r
-* You may obtain a copy of the License at\r
-*\r
-*     http://www.apache.org/licenses/LICENSE-2.0\r
-*\r
-* Unless required by applicable law or agreed to in writing, software\r
-* distributed under the License is distributed on an "AS IS" BASIS,\r
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-* See the License for the specific language governing permissions and\r
-* limitations under the License.\r
-* ============LICENSE_END=========================================================\r
- -->\r
-\r
-<project xmlns="http://maven.apache.org/POM/4.0.0"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-       <modelVersion>4.0.0</modelVersion>\r
-\r
-       <groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>\r
-       <artifactId>UniversalVesAdapter</artifactId>\r
-       <version>1.0.1-SNAPSHOT</version>\r
-\r
-\r
-       <parent>\r
-               <groupId>org.onap.dcaegen2.services.mapper</groupId>\r
-               <artifactId>mapper</artifactId>\r
-               <version>1.0.1-SNAPSHOT</version>\r
-       </parent>\r
-\r
-       <properties>\r
-\r
-               <!-- PROJECT SETTINGS -->\r
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-               <java.version>8</java.version>\r
-               <docker.image.name>onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor</docker.image.name>\r
-\r
-               <!-- PLUGIN SETTINGS -->\r
-               <dependency.locations.enabled>false</dependency.locations.enabled>\r
-\r
-               <!-- NEXUS RELATED SETTINGS -->\r
-               <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-               <snapshots.path>content/repositories/snapshots/</snapshots.path>\r
-               <releases.path>content/repositories/releases/</releases.path>\r
-               <site.path>\r
-                       content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}\r
-               </site.path>\r
-               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>\r
-\r
-               <!-- DCAE SDK version -->\r
-               <sdk.version>1.1.6</sdk.version>\r
-\r
-       </properties>\r
-       <dependencies>\r
-               <!-- Junit, Mockito, PowerMock -->\r
-               <dependency>\r
-                       <groupId>junit</groupId>\r
-                       <artifactId>junit</artifactId>\r
-                       <version>4.12</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.mockito</groupId>\r
-                       <artifactId>mockito-core</artifactId>\r
-                       <version>2.0.5-beta</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-api-mockito</artifactId>\r
-                       <version>1.6.2</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.powermock</groupId>\r
-                       <artifactId>powermock-module-junit4</artifactId>\r
-                       <version>1.6.2</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.javassist</groupId>\r
-                       <artifactId>javassist</artifactId>\r
-                       <version>3.18.2-GA</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.googlecode.json-simple</groupId>\r
-                       <artifactId>json-simple</artifactId>\r
-                       <version>1.1.1</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.guava</groupId>\r
-                       <artifactId>guava</artifactId>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>commons-configuration</groupId>\r
-                       <artifactId>commons-configuration</artifactId>\r
-                       <version>1.10</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.code.gson</groupId>\r
-                       <artifactId>gson</artifactId>\r
-                       <version>2.8.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.inject</groupId>\r
-                       <artifactId>guice</artifactId>\r
-                       <version>4.2.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.commons</groupId>\r
-                       <artifactId>commons-lang3</artifactId>\r
-                       <version>3.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.google.inject.extensions</groupId>\r
-                       <artifactId>guice-assistedinject</artifactId>\r
-                       <version>4.2.0</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.milyn</groupId>\r
-                       <artifactId>milyn-smooks-all</artifactId>\r
-                       <version>1.7.0</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>javax.servlet</groupId>\r
-                                       <artifactId>servlet-api</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>ognl</groupId>\r
-                                       <artifactId>ognl</artifactId>\r
-                               </exclusion>\r
-                               <exclusion>\r
-                                       <groupId>javax.jms</groupId>\r
-                                       <artifactId>jms</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>ognl</groupId>\r
-                       <artifactId>ognl</artifactId>\r
-                       <version>3.1.12</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>\r
-                       <artifactId>dmaapClient</artifactId>\r
-                       <version>1.1.3</version>\r
-                       <exclusions>\r
-                               <exclusion>\r
-                                       <groupId>javax.jms</groupId>\r
-                                       <artifactId>jms</artifactId>\r
-                               </exclusion>\r
-                       </exclusions>\r
-               </dependency>\r
-               <!-- Database dependency -->\r
-               <dependency>\r
-                       <groupId>org.postgresql</groupId>\r
-                       <artifactId>postgresql</artifactId>\r
-                       <version>42.2.5</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework</groupId>\r
-                       <artifactId>spring-jdbc</artifactId>\r
-                       <version>5.1.3.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.boot</groupId>\r
-                       <artifactId>spring-boot-starter-web</artifactId>\r
-                       <version>2.1.1.RELEASE</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.boot</groupId>\r
-                       <artifactId>spring-boot-starter-test</artifactId>\r
-                       <version>2.1.1.RELEASE</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.springframework.data</groupId>\r
-                       <artifactId>spring-data-commons</artifactId>\r
-                       <version>2.1.3.RELEASE</version>\r
-               </dependency>\r
-               <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->\r
-               <dependency>\r
-                       <groupId>org.slf4j</groupId>\r
-                       <artifactId>slf4j-api</artifactId>\r
-                       <version>1.7.25</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.codehaus.groovy</groupId>\r
-                       <artifactId>groovy-all</artifactId>\r
-                       <version>2.4.14</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.jayway.jsonpath</groupId>\r
-                       <artifactId>json-path</artifactId>\r
-                       <version>2.4.0</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>com.fasterxml.jackson.core</groupId>\r
-                       <artifactId>jackson-databind</artifactId>\r
-                       <version>2.9.7</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>hsqldb</groupId>\r
-                       <artifactId>hsqldb</artifactId>\r
-                       <version>1.8.0.10</version>\r
-                       <scope>test</scope>\r
-               </dependency>\r
-               <!-- https://mvnrepository.com/artifact/xalan/xalan -->\r
-               <dependency>\r
-                       <groupId>xalan</groupId>\r
-                       <artifactId>xalan</artifactId>\r
-                       <version>2.7.2</version>\r
-               </dependency>\r
-               <!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->\r
-               <dependency>\r
-                       <groupId>xerces</groupId>\r
-                       <artifactId>xercesImpl</artifactId>\r
-                       <version>2.12.0</version>\r
-               </dependency>\r
-               <!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->\r
-               <dependency>\r
-                       <groupId>com.thoughtworks.xstream</groupId>\r
-                       <artifactId>xstream</artifactId>\r
-                       <version>1.4.10</version>\r
-               </dependency>\r
-               <!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->\r
-               <dependency>\r
-                       <groupId>xml-apis</groupId>\r
-                       <artifactId>xml-apis</artifactId>\r
-                       <version>1.4.01</version>\r
-               </dependency>\r
-               <!-- http client -->\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpclient</artifactId>\r
-                       <version>${httpclient.version}</version>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.apache.httpcomponents</groupId>\r
-                       <artifactId>httpmime</artifactId>\r
-                       <version>${httpclient.version}</version>\r
-                       <scope>compile</scope>\r
-               </dependency>\r
-               <!-- <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId> \r
-                       <version>1.2.0</version> </dependency> -->\r
-               <dependency>\r
-                       <groupId>org.springframework.boot</groupId>\r
-                       <artifactId>spring-boot-configuration-processor</artifactId>\r
-                       <optional>true</optional>\r
-                       <version>2.1.1.RELEASE</version>\r
-               </dependency>\r
-\r
-               <!-- DCAE sdk dependency -->\r
-\r
-               <dependency>\r
-                       <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>\r
-                       <artifactId>cbs-client</artifactId>\r
-                       <version>${sdk.version}</version>\r
-               </dependency>\r
-               \r
-       </dependencies>\r
-\r
-       <build>\r
-               <pluginManagement>\r
-                       <plugins>\r
-                               <plugin>\r
-                                       <artifactId>maven-assembly-plugin</artifactId>\r
-                                       <version>3.1.0</version>\r
-                               </plugin>\r
-                               <plugin>\r
-                                       <groupId>com.spotify</groupId>\r
-                                       <artifactId>docker-maven-plugin</artifactId>\r
-                                       <version>1.0.0</version>\r
-                               </plugin>\r
-                       </plugins>\r
-               </pluginManagement>\r
-               <plugins>\r
-                       <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> \r
-                               <configuration> <reuseForks>false</reuseForks> <forkCount>1</forkCount> </configuration> \r
-                               </plugin> -->\r
-\r
-\r
-\r
-                       <plugin>\r
-                               <artifactId>maven-assembly-plugin</artifactId>\r
-                               <configuration>\r
-                                       <descriptors>\r
-                                               <descriptor>src/assembly/dep.xml</descriptor>\r
-                                       </descriptors>\r
-                                       <attach>false</attach>\r
-                                       <appendAssemblyId>false</appendAssemblyId>\r
-                                       <updateOnly>true</updateOnly>\r
-                               </configuration>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>make-assembly</id>\r
-                                               <phase>package</phase>\r
-                                               <goals>\r
-                                                       <goal>single</goal>\r
-                                               </goals>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>com.spotify</groupId>\r
-                               <artifactId>docker-maven-plugin</artifactId>\r
-                               <version>1.0.0</version>\r
-                               <configuration>\r
-                                       <skipDockerBuild>false</skipDockerBuild>\r
-                                       <serverId>${onap.nexus.dockerregistry.daily}</serverId>\r
-                                       <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>\r
-                                       <imageTags>\r
-                                               <tag>latest</tag>\r
-                                               <tag>${project.version}-${maven.build.timestamp}Z</tag>\r
-                                               <tag>${project.version}</tag>\r
-                                       </imageTags>\r
-                                       <baseImage>alpine:3.8</baseImage>\r
-                                       <env>\r
-                                               <HOSTALIASES>/etc/host.aliases</HOSTALIASES>\r
-                                       </env>\r
-                                       <workdir>/opt/app/VESAdapter</workdir>\r
-                                       <resources>\r
-                                               <resource>\r
-                                                       <targetPath>.</targetPath>\r
-                                                       <directory>${project.build.directory}/${project.artifactId}-${project.version}</directory>\r
-                                               </resource>\r
-                                       </resources>\r
-                                       <runs>\r
-                                               <run>chmod +x bin/run.sh</run>\r
-                                               <run>\r
-                            <![CDATA[apk update && apk add curl && apk add --no-cache openjdk8 && apk add vim]]>\r
-                                               </run>\r
-                                       </runs>\r
-                                       <exposes>\r
-                                               <expose>8080</expose>\r
-                                               <expose>8443</expose>\r
-                                       </exposes>\r
-                                       <entryPoint>bin/run.sh</entryPoint>\r
-\r
-                               </configuration>\r
-                               <!--<executions> <execution> <id>build-image</id> <phase>package</phase> \r
-                                       <goals> <goal>build</goal> </goals> </execution> <execution> <id>tag-and-push-image-latest</id> \r
-                                       <phase>deploy</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> \r
-                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName> \r
-                                       <pushImage>true</pushImage> </configuration> </execution> <execution> <id>tag-and-push-image-with-version</id> \r
-                                       <phase>deploy</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> \r
-                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version} \r
-                                       </newName> <pushImage>true</pushImage> </configuration> </execution> <execution> \r
-                                       <id>tag-and-push-image-with-version-and-date</id> <phase>deploy</phase> <goals> \r
-                                       <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> \r
-                                       <newName> ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z \r
-                                       </newName> <pushImage>true</pushImage> </configuration> </execution> </executions> -->\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.springframework.boot</groupId>\r
-                               <artifactId>spring-boot-maven-plugin</artifactId>\r
-                               <version>2.1.1.RELEASE</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <goals>\r
-                                                       <goal>repackage</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <mainClass>org.onap.universalvesadapter.Application</mainClass>\r
-                                               </configuration>\r
-                                       </execution>\r
-                               </executions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.codehaus.mojo</groupId>\r
-                               <artifactId>build-helper-maven-plugin</artifactId>\r
-                               <version>1.9.1</version>\r
-                               <executions>\r
-                                       <execution>\r
-                                               <id>add-source</id>\r
-                                               <phase>generate-sources</phase>\r
-                                               <goals>\r
-                                                       <goal>add-source</goal>\r
-                                               </goals>\r
-                                               <configuration>\r
-                                                       <sources>\r
-                                                               <source>src/gen/java</source>\r
-                                                       </sources>\r
-                                               </configuration>\r
-                                       </execution>\r
-                                       <!-- <execution> <id>regex-property</id> <goals> <goal>regex-property</goal> \r
-                                               </goals> <configuration> <name>docker.version</name> <value>${project.version}</value> \r
-                                               <regex>(^[0-9]+.[0-9]+.[0-9]+$)</regex> <replacement>$1-STAGING</replacement> \r
-                                               <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> -->\r
-                               </executions>\r
-                       </plugin>\r
-               </plugins>\r
-               <!-- <finalName>UniversalVesAdapter</finalName> -->\r
-       </build>\r
-\r
-       <profiles>\r
-               <profile>\r
-                       <id>with-system-proxy</id>\r
-                       <build>\r
-                               <plugins>\r
-                                       <plugin>\r
-                                               <groupId>com.spotify</groupId>\r
-                                               <artifactId>docker-maven-plugin</artifactId>\r
-                                               <configuration>\r
-                                                       <buildArgs>\r
-                                                               <http_proxy>${env.http_proxy}</http_proxy>\r
-                                                       </buildArgs>\r
-                                               </configuration>\r
-                                       </plugin>\r
-                               </plugins>\r
-                       </build>\r
-               </profile>\r
-       </profiles>\r
-\r
-\r
-       <repositories>\r
-               <repository>\r
-                       <id>spring-releases</id>\r
-                       <url>https://repo.spring.io/libs-release</url>\r
-               </repository>\r
-       </repositories>\r
-       <pluginRepositories>\r
-               <pluginRepository>\r
-                       <id>spring-releases</id>\r
-                       <url>https://repo.spring.io/libs-release</url>\r
-               </pluginRepository>\r
-       </pluginRepositories>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* ============LICENSE_START=======================================================
+* ONAP : DCAEGEN2
+* ================================================================================
+* Copyright 2018-2019 TechMahindra
+* Copyright (C) 2020 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.
+* ============LICENSE_END=========================================================
+ -->
+
+<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>
+
+       <groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
+       <artifactId>UniversalVesAdapter</artifactId>
+       <version>1.1.0-SNAPSHOT</version>
+
+
+       <parent>
+               <groupId>org.onap.dcaegen2.services.mapper</groupId>
+               <artifactId>mapper</artifactId>
+               <version>1.1.0-SNAPSHOT</version>
+       </parent>
+
+       <properties>
+
+               <!-- PROJECT SETTINGS -->
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+               <java.version>11</java.version>
+               <docker.image.name>onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor</docker.image.name>
+
+               <!-- PLUGIN SETTINGS -->
+               <dependency.locations.enabled>false</dependency.locations.enabled>
+
+               <!-- NEXUS RELATED SETTINGS -->
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshots.path>content/repositories/snapshots/</snapshots.path>
+               <releases.path>content/repositories/releases/</releases.path>
+               <site.path>
+                       content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}
+               </site.path>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
+
+               <!-- DCAE SDK version -->
+               <sdk.version>1.1.6</sdk.version>
+
+       </properties>
+       <dependencies>
+               <!-- Junit, Mockito, PowerMock -->
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>4.12</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.mockito</groupId>
+                       <artifactId>mockito-core</artifactId>
+                       <version>2.0.5-beta</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-api-mockito</artifactId>
+                       <version>1.6.2</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.powermock</groupId>
+                       <artifactId>powermock-module-junit4</artifactId>
+                       <version>1.6.2</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.javassist</groupId>
+                       <artifactId>javassist</artifactId>
+                       <version>3.18.2-GA</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.googlecode.json-simple</groupId>
+                       <artifactId>json-simple</artifactId>
+                       <version>1.1.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.guava</groupId>
+                       <artifactId>guava</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>commons-configuration</groupId>
+                       <artifactId>commons-configuration</artifactId>
+                       <version>1.10</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.code.gson</groupId>
+                       <artifactId>gson</artifactId>
+                       <version>2.8.5</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.inject</groupId>
+                       <artifactId>guice</artifactId>
+                       <version>4.2.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-lang3</artifactId>
+                       <version>3.5</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.google.inject.extensions</groupId>
+                       <artifactId>guice-assistedinject</artifactId>
+                       <version>4.2.0</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.milyn</groupId>
+                       <artifactId>milyn-smooks-all</artifactId>
+                       <version>1.7.0</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>javax.servlet</groupId>
+                                       <artifactId>servlet-api</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>ognl</groupId>
+                                       <artifactId>ognl</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>javax.jms</groupId>
+                                       <artifactId>jms</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <dependency>
+                       <groupId>ognl</groupId>
+                       <artifactId>ognl</artifactId>
+                       <version>3.1.12</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
+                       <artifactId>dmaapClient</artifactId>
+                       <version>1.1.3</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>javax.jms</groupId>
+                                       <artifactId>jms</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+               <!-- Database dependency -->
+               <dependency>
+                       <groupId>org.postgresql</groupId>
+                       <artifactId>postgresql</artifactId>
+                       <version>42.2.5</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework</groupId>
+                       <artifactId>spring-jdbc</artifactId>
+                       <version>5.1.3.RELEASE</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-web</artifactId>
+                       <version>2.1.1.RELEASE</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-starter-test</artifactId>
+                       <version>2.1.1.RELEASE</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.data</groupId>
+                       <artifactId>spring-data-commons</artifactId>
+                       <version>2.1.3.RELEASE</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <version>1.7.25</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.codehaus.groovy</groupId>
+                       <artifactId>groovy-all</artifactId>
+                       <version>2.4.14</version>
+               </dependency>
+               <dependency>
+                       <groupId>com.jayway.jsonpath</groupId>
+                       <artifactId>json-path</artifactId>
+                       <version>2.4.0</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>com.fasterxml.jackson.core</groupId>
+                       <artifactId>jackson-databind</artifactId>
+                       <version>2.9.7</version>
+               </dependency>
+               <dependency>
+                       <groupId>hsqldb</groupId>
+                       <artifactId>hsqldb</artifactId>
+                       <version>1.8.0.10</version>
+                       <scope>test</scope>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/xalan/xalan -->
+               <dependency>
+                       <groupId>xalan</groupId>
+                       <artifactId>xalan</artifactId>
+                       <version>2.7.2</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
+               <dependency>
+                       <groupId>xerces</groupId>
+                       <artifactId>xercesImpl</artifactId>
+                       <version>2.12.0</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream -->
+               <dependency>
+                       <groupId>com.thoughtworks.xstream</groupId>
+                       <artifactId>xstream</artifactId>
+                       <version>1.4.10</version>
+               </dependency>
+               <!-- https://mvnrepository.com/artifact/xml-apis/xml-apis -->
+               <dependency>
+                       <groupId>xml-apis</groupId>
+                       <artifactId>xml-apis</artifactId>
+                       <version>1.4.01</version>
+               </dependency>
+               <!-- http client -->
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpclient</artifactId>
+                       <version>${httpclient.version}</version>
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpmime</artifactId>
+                       <version>${httpclient.version}</version>
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.springframework.boot</groupId>
+                       <artifactId>spring-boot-configuration-processor</artifactId>
+                       <optional>true</optional>
+                       <version>2.1.1.RELEASE</version>
+               </dependency>
+
+               <!-- DCAE sdk dependency -->
+
+               <dependency>
+                       <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
+                       <artifactId>cbs-client</artifactId>
+                       <version>${sdk.version}</version>
+               </dependency>
+               
+       </dependencies>
+
+       <build>
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       <artifactId>maven-assembly-plugin</artifactId>
+                                       <version>3.1.0</version>
+                               </plugin>
+                               <plugin>
+                                       <groupId>com.spotify</groupId>
+                                       <artifactId>docker-maven-plugin</artifactId>
+                                       <version>1.0.0</version>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptors>
+                                               <descriptor>src/assembly/dep.xml</descriptor>
+                                       </descriptors>
+                                       <attach>false</attach>
+                                       <appendAssemblyId>false</appendAssemblyId>
+                                       <updateOnly>true</updateOnly>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>make-assembly</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>com.spotify</groupId>
+                               <artifactId>docker-maven-plugin</artifactId>
+                               <version>1.0.0</version>
+                               <configuration>
+                                       <skipDockerBuild>false</skipDockerBuild>
+                                       <serverId>${onap.nexus.dockerregistry.daily}</serverId>
+                                       <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}</imageName>
+                                       <imageTags>
+                                               <tag>latest</tag>
+                                               <tag>${project.version}-${maven.build.timestamp}Z</tag>
+                                               <tag>${project.version}</tag>
+                                       </imageTags>
+                                       <baseImage>onap/integration-java11:7.0.0</baseImage>
+                                       <env>
+                                               <HOSTALIASES>/etc/host.aliases</HOSTALIASES>
+                                       </env>
+                                       <workdir>/opt/app/VESAdapter</workdir>
+                                       <resources>
+                                               <resource>
+                                                       <targetPath>.</targetPath>
+                                                       <directory>${project.build.directory}/${project.artifactId}-${project.version}</directory>
+                                               </resource>
+                                       </resources>
+                                       <runs>
+                                               <run>chmod +x bin/run.sh</run>
+                                               <run>
+                            <![CDATA[apk update && apk add curl && apk add --no-cache openjdk11 && apk add vim]]>
+                                               </run>
+                                       </runs>
+                                       <exposes>
+                                               <expose>8080</expose>
+                                               <expose>8443</expose>
+                                       </exposes>
+                                       <entryPoint>bin/run.sh</entryPoint>
+
+                               </configuration>
+                               <!--<executions> <execution> <id>build-image</id> <phase>package</phase> 
+                                       <goals> <goal>build</goal> </goals> </execution> <execution> <id>tag-and-push-image-latest</id> 
+                                       <phase>deploy</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> 
+                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName> 
+                                       <pushImage>true</pushImage> </configuration> </execution> <execution> <id>tag-and-push-image-with-version</id> 
+                                       <phase>deploy</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> 
+                                       <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version} 
+                                       </newName> <pushImage>true</pushImage> </configuration> </execution> <execution> 
+                                       <id>tag-and-push-image-with-version-and-date</id> <phase>deploy</phase> <goals> 
+                                       <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> 
+                                       <newName> ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z 
+                                       </newName> <pushImage>true</pushImage> </configuration> </execution> </executions> -->
+                       </plugin>
+                       <plugin>
+                               <groupId>org.springframework.boot</groupId>
+                               <artifactId>spring-boot-maven-plugin</artifactId>
+                               <version>2.1.1.RELEASE</version>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>repackage</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <mainClass>org.onap.universalvesadapter.Application</mainClass>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>build-helper-maven-plugin</artifactId>
+                               <version>1.9.1</version>
+                               <executions>
+                                       <execution>
+                                               <id>add-source</id>
+                                               <phase>generate-sources</phase>
+                                               <goals>
+                                                       <goal>add-source</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <sources>
+                                                               <source>src/gen/java</source>
+                                                       </sources>
+                                               </configuration>
+                                       </execution>
+                                       <!-- <execution> <id>regex-property</id> <goals> <goal>regex-property</goal> 
+                                               </goals> <configuration> <name>docker.version</name> <value>${project.version}</value> 
+                                               <regex>(^[0-9]+.[0-9]+.[0-9]+$)</regex> <replacement>$1-STAGING</replacement> 
+                                               <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> -->
+                               </executions>
+                       </plugin>
+               </plugins>
+               <!-- <finalName>UniversalVesAdapter</finalName> -->
+       </build>
+
+       <profiles>
+               <profile>
+                       <id>with-system-proxy</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>com.spotify</groupId>
+                                               <artifactId>docker-maven-plugin</artifactId>
+                                               <configuration>
+                                                       <buildArgs>
+                                                               <http_proxy>${env.http_proxy}</http_proxy>
+                                                       </buildArgs>
+                                               </configuration>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
+
+
+       <repositories>
+               <repository>
+                       <id>spring-releases</id>
+                       <url>https://repo.spring.io/libs-release</url>
+               </repository>
+       </repositories>
+       <pluginRepositories>
+               <pluginRepository>
+                       <id>spring-releases</id>
+                       <url>https://repo.spring.io/libs-release</url>
+               </pluginRepository>
+       </pluginRepositories>
 </project>
\ No newline at end of file
index 459047a..2b79fc7 100644 (file)
@@ -3,6 +3,7 @@
  * ONAP : DCAE
  * ================================================================================
  * Copyright 2018-2019 TechMahindra
+ * Copyright (C) 2020 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.
@@ -35,6 +36,7 @@ import org.onap.universalvesadapter.exception.VesException;
 import org.onap.universalvesadapter.service.VESAdapterInitializer;
 import org.onap.universalvesadapter.utils.CollectorConfigPropertyRetrieval;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.slf4j.Logger;
@@ -43,6 +45,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 @RunWith(PowerMockRunner.class)
 @SpringBootTest(classes = Application.class)
+@PowerMockIgnore("jdk.internal.reflect.*")
 public class UniversalEventAdapterTest {
 
     private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
diff --git a/pom.xml b/pom.xml
index e546663..e59f68d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
-<?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-* ============LICENSE_START=======================================================\r
-* ONAP : DCAEGEN2/services/mapper\r
-* ================================================================================\r
-* Copyright 2018-2019 TechMahindra\r
-*=================================================================================\r
-* Licensed under the Apache License, Version 2.0 (the "License");\r
-* you may not use this file except in compliance with the License.\r
-* You may obtain a copy of the License at\r
-*\r
-*     http://www.apache.org/licenses/LICENSE-2.0\r
-*\r
-* Unless required by applicable law or agreed to in writing, software\r
-* distributed under the License is distributed on an "AS IS" BASIS,\r
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-* See the License for the specific language governing permissions and\r
-* limitations under the License.\r
-* ============LICENSE_END=========================================================\r
- -->\r
-<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">\r
-    <modelVersion>4.0.0</modelVersion>\r
-\r
-    <parent>\r
-      <groupId>org.onap.oparent</groupId>\r
-      <artifactId>oparent</artifactId>\r
-      <version>2.0.0</version>\r
-      <relativePath/>\r
-    </parent>\r
-\r
-    <groupId>org.onap.dcaegen2.services.mapper</groupId>\r
-    <artifactId>mapper</artifactId>\r
-    <version>1.0.1-SNAPSHOT</version>\r
-    <packaging>pom</packaging>\r
-\r
-    <name>dcaegen2-services-mapper</name>\r
-    <description>Universal VES mapper for DCAE Analytics Service</description>\r
-\r
-    <licenses>\r
-        <license>\r
-            <name>The Apache Software License, Version 2.0</name>\r
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>\r
-        </license>\r
-    </licenses>\r
-\r
-    <properties>\r
-\r
-        <!-- PROJECT SETTINGS-->\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>\r
-        <main.basedir>${project.basedir}</main.basedir>\r
-\r
-        <!--TEST SETTINGS -->\r
-        <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>\r
-\r
-        <slf4j.version>1.7.25</slf4j.version>\r
-        <jackson.json.version>2.9.4</jackson.json.version>\r
-\r
-        <netty.http.version>0.16.0</netty.http.version>\r
-        <gson.version>2.2.4</gson.version>\r
-        <guava.version>13.0.1</guava.version>\r
-        <guice.version>3.0</guice.version>\r
-        <logback.version>1.0.9</logback.version>\r
-        <findbugs.jsr305.version>2.0.1</findbugs.jsr305.version>\r
-        <findbugs.annotations.version>3.0.0</findbugs.annotations.version>\r
-        <lombok.version>1.16.10</lombok.version>\r
-\r
-        <json.path.version>2.2.0</json.path.version>\r
-        <quartz.version>2.2.0</quartz.version>\r
-        <httpclient.version>4.5.6</httpclient.version>\r
-        <commons.lang3.version>3.5</commons.lang3.version>\r
-\r
-        <docker.maven.version>1.0.0</docker.maven.version>\r
-\r
-        <!--TESTING DEPENDENCIES -->\r
-        <junit.version>4.12</junit.version>\r
-        <jayway.jsonpath.version>2.2.0</jayway.jsonpath.version>\r
-        <jsonassert.version>1.4.0</jsonassert.version>\r
-        <mockito.version>2.5.7</mockito.version>\r
-        <cucumber.version>1.2.5</cucumber.version>\r
-\r
-\r
-        <!-- PLUGINS VERSIONS -->\r
-        <compiler.plugin.version>3.3</compiler.plugin.version>\r
-        <!--  <surefire.plugin.version>2.19.1</surefire.plugin.version> -->\r
-        <failsafe.plugin.version>2.19.1</failsafe.plugin.version>\r
-        <bundle.plugin.version>2.5.4</bundle.plugin.version>\r
-        <autorun.plugin.version>1.7</autorun.plugin.version>\r
-        <eclipe.plugin.version>2.10</eclipe.plugin.version>\r
-        <findbugs.plugin.version>3.0.2</findbugs.plugin.version>\r
-        <pmd.plugin.version>3.5</pmd.plugin.version>\r
-        <!--  <surefire.report.plugin.version>2.19.1</surefire.report.plugin.version> -->\r
-        <checkstyle.plugin.version>2.16</checkstyle.plugin.version>\r
-        <javadoc.plugin.version>2.10.4</javadoc.plugin.version>\r
-        <source.plugin.version>2.4</source.plugin.version>\r
-        <jar.plugin.version>2.4</jar.plugin.version>\r
-        <lombok.plugin.version>1.16.10.0</lombok.plugin.version>\r
-        <jgitflow.plugin.version>1.0-m5.1</jgitflow.plugin.version>\r
-        <gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>\r
-        <maven.site.plugin>3.5.1</maven.site.plugin>\r
-        <jxr.plugin.version>2.5</jxr.plugin.version>\r
-        <project.info.reports.plugin.version>2.7</project.info.reports.plugin.version>\r
-\r
-        <!--PLUGIN SETTINGS -->\r
-        <!-- <compiler.source.version>1.7</compiler.source.version>\r
-        <compiler.target.version>1.7</compiler.target.version> -->\r
-         <compiler.source.version>1.8</compiler.source.version>\r
-        <compiler.target.version>1.8</compiler.target.version>\r
-        <unit.test.pattern>**/*Test.java</unit.test.pattern>\r
-        <skip.unit.tests>false</skip.unit.tests>\r
-        <integration.test.pattern>**/*IT.java</integration.test.pattern>\r
-        <skip.integration.tests>true</skip.integration.tests>\r
-       <!--  <pmd.violation.buildfail>true</pmd.violation.buildfail> -->\r
-        <findbugs.failOnError>true</findbugs.failOnError>\r
-        <checkstyle.failOnViolation>true</checkstyle.failOnViolation>\r
-        <checkstyle.file.name>checkstyle.xml</checkstyle.file.name>\r
-        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>\r
-        <dependency.locations.enabled>false</dependency.locations.enabled>\r
-        <nexusproxy>https://nexus.onap.org</nexusproxy>\r
-        <snapshots.path>content/repositories/snapshots/</snapshots.path>\r
-        <releases.path>content/repositories/releases/</releases.path>\r
-        <site.path>\r
-            content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}\r
-        </site.path>\r
-       <sonar.coverage.jacoco.xmlReportPaths>\r
-         ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml\r
-       </sonar.coverage.jacoco.xmlReportPaths>\r
-    </properties>\r
-\r
-    <dependencyManagement>\r
-\r
-        <dependencies>\r
-\r
-            <!-- LOGGING -->\r
-         <!--    <dependency>\r
-                <groupId>org.slf4j</groupId>\r
-                <artifactId>slf4j-api</artifactId>\r
-                <version>${slf4j.version}</version>\r
-                <scope>provided</scope>\r
-            </dependency> -->\r
-\r
-\r
-<!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->\r
-<dependency>\r
-    <groupId>com.googlecode.json-simple</groupId>\r
-    <artifactId>json-simple</artifactId>\r
-    <version>1.1</version>\r
-</dependency>\r
-\r
-            <!-- UTILITIES -->\r
-            <dependency>\r
-                <groupId>org.apache.commons</groupId>\r
-                <artifactId>commons-lang3</artifactId>\r
-                <version>${commons.lang3.version}</version>\r
-            </dependency>\r
-\r
-            <!-- JACKSON JSON -->\r
-          <!-- <dependency>\r
-                <groupId>com.fasterxml.jackson.core</groupId>\r
-                <artifactId>jackson-core</artifactId>\r
-                <version>${jackson.json.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.fasterxml.jackson.core</groupId>\r
-                <artifactId>jackson-databind</artifactId>\r
-                <version>${jackson.json.version}</version>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.fasterxml.jackson.core</groupId>\r
-                <artifactId>jackson-annotations</artifactId>\r
-                <version>${jackson.json.version}</version>\r
-            </dependency>\r
-\r
-            JSON PATH\r
-            <dependency>\r
-                <groupId>com.jayway.jsonpath</groupId>\r
-                <artifactId>json-path</artifactId>\r
-                <version>${json.path.version}</version>\r
-            </dependency>  -->\r
-\r
-\r
-            <!-- TEST DEPENDENCIES -->\r
-\r
-            <dependency>\r
-                <groupId>junit</groupId>\r
-                <artifactId>junit</artifactId>\r
-                <version>${junit.version}</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-\r
-            <dependency>\r
-                <groupId>org.mockito</groupId>\r
-                <artifactId>mockito-core</artifactId>\r
-                <version>${mockito.version}</version>\r
-            </dependency>\r
-\r
-            <dependency>\r
-                <groupId>com.jayway.jsonpath</groupId>\r
-                <artifactId>json-path-assert</artifactId>\r
-                <version>${jayway.jsonpath.version}</version>\r
-                <scope>test</scope>\r
-            </dependency>\r
-            <dependency>\r
-                <groupId>com.spotify</groupId>\r
-                <artifactId>docker-maven-plugin</artifactId>\r
-                <version>${docker.maven.version}</version>\r
-            </dependency>\r
-\r
-        </dependencies>\r
-\r
-    </dependencyManagement>\r
-\r
-\r
-    <build>\r
-\r
-        <resources>\r
-            <resource>\r
-                <directory>${project.basedir}/src/main/resources</directory>\r
-            </resource>\r
-            <resource>\r
-                <directory>${project.build.directory}/git</directory>\r
-            </resource>\r
-        </resources>\r
-\r
-        <extensions>\r
-            <extension>\r
-                <groupId>org.apache.maven.wagon</groupId>\r
-                <artifactId>wagon-webdav-jackrabbit</artifactId>\r
-                <version>1.0-beta-7</version>\r
-            </extension>\r
-        </extensions>\r
-\r
-        <pluginManagement>\r
-\r
-            <plugins>\r
-\r
-                <!-- COMPILER PLUGIN -->\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-compiler-plugin</artifactId>\r
-                    <version>${compiler.plugin.version}</version>\r
-                    <configuration>\r
-                        <source>${compiler.target.version}</source>\r
-                        <target>${compiler.source.version}</target>\r
-                    </configuration>\r
-                </plugin>\r
-\r
-                <!-- MAVEN SOURCE PLUGIN -->\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-source-plugin</artifactId>\r
-                    <version>${source.plugin.version}</version>\r
-                    <configuration>\r
-                        <excludeResources>true</excludeResources>\r
-                    </configuration>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>attach-sources</id>\r
-                            <phase>verify</phase>\r
-                            <goals>\r
-                                <goal>jar-no-fork</goal>\r
-                            </goals>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin>\r
-\r
-\r
-                <!-- MAVEN JAVADOC PLUGIN -->\r
-               <!--  <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-javadoc-plugin</artifactId>\r
-                    <version>${javadoc.plugin.version}</version>\r
-                    <configuration>\r
-                        minimize console output messages\r
-                        <quiet>true</quiet>\r
-                        <verbose>false</verbose>\r
-                        <useStandardDocletOptions>false</useStandardDocletOptions>\r
-                    </configuration>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>aggregate</id>\r
-                            <phase>site</phase>\r
-                            <goals>\r
-                                <goal>aggregate</goal>\r
-                            </goals>\r
-                        </execution>\r
-                        <execution>\r
-                            <id>attach-javadoc</id>\r
-                            <goals>\r
-                                <goal>jar</goal>\r
-                            </goals>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin> -->\r
-\r
-                <!-- MAVEN BUNDLE PLUGIN -->\r
-                <plugin>\r
-                    <groupId>org.apache.felix</groupId>\r
-                    <artifactId>maven-bundle-plugin</artifactId>\r
-                    <version>${bundle.plugin.version}</version>\r
-                    <extensions>true</extensions>\r
-                    <configuration>\r
-                        <instructions>\r
-                            <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>\r
-                            <Embed-Transitive>true</Embed-Transitive>\r
-                            <Embed-Directory>lib</Embed-Directory>\r
-                        </instructions>\r
-                    </configuration>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>Bundling mapper Jar</id>\r
-                            <phase>package</phase>\r
-                            <goals>\r
-                                <goal>bundle</goal>\r
-                            </goals>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin>\r
-\r
-                <!-- MAVEN AUTO RUN PLUGIN -->\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-antrun-plugin</artifactId>\r
-                    <version>${autorun.plugin.version}</version>\r
-                </plugin>\r
-\r
-                <!-- SUREFIRE TEST PLUGIN -->\r
-                <!-- <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-surefire-plugin</artifactId>\r
-                    <version>${surefire.plugin.version}</version>\r
-                    <configuration>\r
-                        <skipTests>${skip.unit.tests}</skipTests>\r
-                        <argLine>-Xmx2048m -Djava.awt.headless=true -XX:+UseConcMarkSweepGC\r
-                            -XX:OnOutOfMemoryError="kill -9 %p" -XX:+HeapDumpOnOutOfMemoryError\r
-                        </argLine>\r
-                        <redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>\r
-                        <parallel>methods</parallel>\r
-                        <threadCount>8</threadCount>\r
-                        <forkCount>8</forkCount>\r
-                        <reuseForks>true</reuseForks>\r
-                        <reportFormat>xml</reportFormat>\r
-                        <trimStackTrace>false</trimStackTrace>\r
-                        <systemPropertyVariables>\r
-                            <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>\r
-                            <logback.configurationFile>\r
-                                ${basedir}/src/test/resources/logback-test.xml\r
-                            </logback.configurationFile>\r
-                            <HADOOP_HOME>${project.build.directory}</HADOOP_HOME>\r
-                        </systemPropertyVariables>\r
-                        <includes>\r
-                            <include>${unit.test.pattern}</include>\r
-                        </includes>\r
-                        <excludes>\r
-                            <exclude>${integration.test.pattern}</exclude>\r
-                        </excludes>\r
-                        Sets the VM argument line used when unit tests are run.\r
-                        <argLine>${surefireArgLine}</argLine>\r
-                    </configuration>\r
-                    <dependencies>\r
-                        <dependency>\r
-                            <groupId>org.apache.maven.surefire</groupId>\r
-                            <artifactId>surefire-junit47</artifactId>\r
-                            <version>${surefire.plugin.version}</version>\r
-                        </dependency>\r
-                    </dependencies>\r
-                </plugin>\r
- -->\r
-                <!-- FAIL SAFE PLUGIN FOR INTEGRATION TEST -->\r
-                <!-- <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-failsafe-plugin</artifactId>\r
-                    <version>${failsafe.plugin.version}</version>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>integration-tests</id>\r
-                            <goals>\r
-                                <goal>integration-test</goal>\r
-                                <goal>verify</goal>\r
-                            </goals>\r
-                            <configuration>\r
-                                <skipTests>${skip.integration.tests}</skipTests>\r
-                                Sets the VM argument line used when integration tests are run.\r
-                                suppress MavenModelInspection\r
-                                <argLine>${failsafeArgLine}</argLine>\r
-                            </configuration>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin> -->\r
-\r
-                <!-- FIND BUGS (STATIC CODE ANALYSIS) PLUGIN -->\r
-                <!-- <plugin>\r
-                    <groupId>org.codehaus.mojo</groupId>\r
-                    <artifactId>findbugs-maven-plugin</artifactId>\r
-                    <version>${findbugs.plugin.version}</version>\r
-                    <configuration>\r
-                        <effort>Max</effort>\r
-                        <threshold>Low</threshold>\r
-                        <xmlOutput>true</xmlOutput>\r
-                        BUILD FAIL ON FINDBUGS ERRORS\r
-                        <failOnError>${findbugs.failOnError}</failOnError>\r
-                        <excludeFilterFile>${main.basedir}/findbugs-exclude.xml</excludeFilterFile>\r
-                        <outputDirectory>${project.reporting.outputDirectory}/findbugs</outputDirectory>\r
-                        <findbugsXmlOutputDirectory>${project.reporting.outputDirectory}/findbugs\r
-                        </findbugsXmlOutputDirectory>\r
-                    </configuration>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>analyze-compile</id>\r
-                            <phase>compile</phase>\r
-                            <goals>\r
-                                <goal>check</goal>\r
-                            </goals>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin> -->\r
-\r
-                <!-- PMD PLUGIN SETUP -->\r
-               <!--  <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-pmd-plugin</artifactId>\r
-                    <version>${pmd.plugin.version}</version>\r
-                    <configuration>\r
-                        <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>\r
-                        <targetJdk>${compiler.target.version}</targetJdk>\r
-                        <linkXRef>false</linkXRef>\r
-                        <excludes>\r
-                            IGNORE PMD & CPD ANALYTICS MODEL FACADE OBJECTS\r
-                            <exclude>**/model/facade/**/*.java</exclude>\r
-                        </excludes>\r
-                        BUILD FAIL ON PMD VIOLATION\r
-                        <failOnViolation>${pmd.violation.buildfail}</failOnViolation>\r
-                        <targetDirectory>${project.reporting.outputDirectory}/pmd</targetDirectory>\r
-                    </configuration>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>pmd-check</id>\r
-                            <goals>\r
-                                <goal>check</goal>\r
-                            </goals>\r
-                            <configuration>\r
-                                <printFailingErrors>true</printFailingErrors>\r
-                                <excludeFromFailureFile>${main.basedir}/pmd-exclude.properties</excludeFromFailureFile>\r
-                            </configuration>\r
-                        </execution>\r
-                        <execution>\r
-                            <id>cpd-check</id>\r
-                            <goals>\r
-                                <goal>cpd-check</goal>\r
-                            </goals>\r
-                            <configuration>\r
-                                <printFailingErrors>true</printFailingErrors>\r
-                                <excludeFromFailureFile>${main.basedir}/cpd-exclude.properties</excludeFromFailureFile>\r
-                            </configuration>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin> -->\r
-\r
-                <!-- CHECKSTYLE PLUGIN -->\r
-               <!--  <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-checkstyle-plugin</artifactId>\r
-                    <version>${checkstyle.plugin.version}</version>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>validate</id>\r
-                            <phase>validate</phase>\r
-                            <configuration>\r
-                                <configLocation>${checkstyle.file.name}</configLocation>\r
-                                <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation>\r
-                                <encoding>UTF-8</encoding>\r
-                                <consoleOutput>true</consoleOutput>\r
-                                BUILD FAIL ON CHECKSTYLE VIOLATION\r
-                                <failOnViolation>${checkstyle.failOnViolation}</failOnViolation>\r
-                                <includeTestSourceDirectory>true</includeTestSourceDirectory>\r
-                                <outputFile>${project.reporting.outputDirectory}/checkstyle</outputFile>\r
-                            </configuration>\r
-                            <goals>\r
-                                <goal>check</goal>\r
-                            </goals>\r
-                        </execution>\r
-                    </executions>\r
-                    <dependencies>\r
-                        <dependency>\r
-                            <groupId>com.puppycrawl.tools</groupId>\r
-                            <artifactId>checkstyle</artifactId>\r
-                            <version>6.19</version>\r
-                        </dependency>\r
-                    </dependencies>\r
-                </plugin>\r
- -->\r
-                <!-- ECLIPSE PLUGIN -->\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-eclipse-plugin</artifactId>\r
-                    <version>${eclipe.plugin.version}</version>\r
-                </plugin>\r
-\r
-\r
-\r
-                <!-- GIT COMMIT ID PLUGIN -->\r
-                <!-- <plugin>\r
-                    <groupId>pl.project13.maven</groupId>\r
-                    <artifactId>git-commit-id-plugin</artifactId>\r
-                    <version>${gitcommitid.plugin.version}</version>\r
-                    <executions>\r
-                        <execution>\r
-                            <id>generate-git-properties</id>\r
-                            <phase>generate-resources</phase>\r
-                            <goals>\r
-                                <goal>revision</goal>\r
-                            </goals>\r
-                            <configuration>\r
-                                <failOnNoGitDirectory>false</failOnNoGitDirectory>\r
-                                <generateGitPropertiesFile>true</generateGitPropertiesFile>\r
-                                <generateGitPropertiesFilename>\r
-                                    ${project.build.directory}/git/git.properties\r
-                                </generateGitPropertiesFilename>\r
-                            </configuration>\r
-                        </execution>\r
-                    </executions>\r
-                </plugin> -->\r
-\r
-\r
-                <!-- JAR PLUGIN -->\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-jar-plugin</artifactId>\r
-                    <version>${jar.plugin.version}</version>\r
-                    <configuration>\r
-                        <archive>\r
-                            <manifest>\r
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>\r
-                            </manifest>\r
-                            <manifestEntries>\r
-                                <Implementation-Build-Version>${project.version}</Implementation-Build-Version>\r
-                            </manifestEntries>\r
-                        </archive>\r
-                    </configuration>\r
-                </plugin>\r
-\r
-                <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-site-plugin</artifactId>\r
-                    <version>${maven.site.plugin}</version>\r
-                </plugin>\r
-\r
-                <!-- <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-jxr-plugin</artifactId>\r
-                    <version>${jxr.plugin.version}</version>\r
-                </plugin>\r
- -->\r
-                <!-- <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-project-info-reports-plugin</artifactId>\r
-                    <version>${project.info.reports.plugin.version}</version>\r
-                    <configuration>\r
-                        <dependencyDetailsEnabled>false</dependencyDetailsEnabled>\r
-                        <dependencyLocationsEnabled>false</dependencyLocationsEnabled>\r
-                    </configuration>\r
-                </plugin> -->\r
-\r
-                <!-- <plugin>\r
-                    <groupId>org.apache.maven.plugins</groupId>\r
-                    <artifactId>maven-surefire-report-plugin</artifactId>\r
-                    <version>${surefire.report.plugin.version}</version>\r
-                </plugin> -->\r
-\r
-                <plugin>\r
-                    <groupId>com.spotify</groupId>\r
-                    <artifactId>docker-maven-plugin</artifactId>\r
-                    <version>${docker.maven.version}</version>\r
-                    <configuration>\r
-                        <skipDockerBuild>true</skipDockerBuild>\r
-                    </configuration>\r
-                </plugin>\r
-            </plugins>\r
-\r
-        </pluginManagement>\r
-\r
-        <plugins>\r
-\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-            </plugin>\r
-\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-jar-plugin</artifactId>\r
-            </plugin>\r
-\r
-            <!-- <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-            </plugin>\r
- -->\r
-            <!-- <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-failsafe-plugin</artifactId>\r
-            </plugin> -->\r
-\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-source-plugin</artifactId>\r
-            </plugin>\r
-\r
-           <!--  <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-javadoc-plugin</artifactId>\r
-            </plugin> -->\r
-\r
-           <!--  <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-pmd-plugin</artifactId>\r
-            </plugin> -->\r
-\r
-           <!--  <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>findbugs-maven-plugin</artifactId>\r
-            </plugin>\r
- -->\r
-           <!--  <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-checkstyle-plugin</artifactId>\r
-                <inherited>false</inherited>\r
-            </plugin> -->\r
-\r
-            <!-- <plugin>\r
-                <groupId>pl.project13.maven</groupId>\r
-                <artifactId>git-commit-id-plugin</artifactId>\r
-            </plugin> -->\r
-\r
-        </plugins>\r
-    </build>\r
-\r
-    <reporting>\r
-        <plugins>\r
-            <!-- <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-site-plugin</artifactId>\r
-            </plugin> -->\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-checkstyle-plugin</artifactId>\r
-                <configuration>\r
-                    <configLocation>${checkstyle.file.name}</configLocation>\r
-                    <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation>\r
-                </configuration>\r
-            </plugin>\r
-            <!-- <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-jxr-plugin</artifactId>\r
-            </plugin> -->\r
-           <!--  <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-pmd-plugin</artifactId>\r
-            </plugin> -->\r
-            <!-- <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-project-info-reports-plugin</artifactId>\r
-            </plugin> -->\r
-            <!-- <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-report-plugin</artifactId>\r
-            </plugin> -->\r
-        </plugins>\r
-    </reporting>\r
-\r
-    <profiles>\r
-        <profile>\r
-            <id>doclint-java8-disable</id>\r
-            <activation>\r
-                <jdk>[1.8,)</jdk>\r
-            </activation>\r
-            <build>\r
-                <plugins>\r
-                    <!-- <plugin>\r
-                        <groupId>org.apache.maven.plugins</groupId>\r
-                        <artifactId>maven-javadoc-plugin</artifactId>\r
-                        <configuration>\r
-                            <additionalparam>-Xdoclint:none</additionalparam>\r
-                        </configuration>\r
-                    </plugin> -->\r
-                </plugins>\r
-            </build>\r
-        </profile>\r
-    </profiles>\r
-\r
-    <modules>\r
-      <!--  <module>snmpmapper</module> -->\r
-        <module>UniversalVesAdapter</module>\r
-    </modules>\r
-\r
-</project>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* ============LICENSE_START=======================================================
+* ONAP : DCAEGEN2/services/mapper
+* ================================================================================
+* Copyright 2018-2019 TechMahindra
+* Copyright (C) 2020 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.
+* ============LICENSE_END=========================================================
+ -->
+<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>oparent</artifactId>
+      <version>2.0.0</version>
+      <relativePath/>
+    </parent>
+
+    <groupId>org.onap.dcaegen2.services.mapper</groupId>
+    <artifactId>mapper</artifactId>
+    <version>1.1.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>dcaegen2-services-mapper</name>
+    <description>Universal VES mapper for DCAE Analytics Service</description>
+
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <properties>
+
+        <!-- PROJECT SETTINGS-->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <main.basedir>${project.basedir}</main.basedir>
+
+        <!--TEST SETTINGS -->
+        <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
+
+        <slf4j.version>1.7.25</slf4j.version>
+        <jackson.json.version>2.9.4</jackson.json.version>
+
+        <netty.http.version>0.16.0</netty.http.version>
+        <gson.version>2.2.4</gson.version>
+        <guava.version>13.0.1</guava.version>
+        <guice.version>3.0</guice.version>
+        <logback.version>1.0.9</logback.version>
+        <findbugs.jsr305.version>2.0.1</findbugs.jsr305.version>
+        <findbugs.annotations.version>3.0.0</findbugs.annotations.version>
+        <lombok.version>1.16.10</lombok.version>
+
+        <json.path.version>2.2.0</json.path.version>
+        <quartz.version>2.2.0</quartz.version>
+        <httpclient.version>4.5.6</httpclient.version>
+        <commons.lang3.version>3.5</commons.lang3.version>
+
+        <docker.maven.version>1.0.0</docker.maven.version>
+
+        <!--TESTING DEPENDENCIES -->
+        <junit.version>4.12</junit.version>
+        <jayway.jsonpath.version>2.2.0</jayway.jsonpath.version>
+        <jsonassert.version>1.4.0</jsonassert.version>
+        <mockito.version>2.5.7</mockito.version>
+        <cucumber.version>1.2.5</cucumber.version>
+
+
+        <!-- PLUGINS VERSIONS -->
+        <compiler.plugin.version>3.3</compiler.plugin.version>
+        <!--  <surefire.plugin.version>2.19.1</surefire.plugin.version> -->
+        <failsafe.plugin.version>2.19.1</failsafe.plugin.version>
+        <bundle.plugin.version>2.5.4</bundle.plugin.version>
+        <autorun.plugin.version>1.7</autorun.plugin.version>
+        <eclipe.plugin.version>2.10</eclipe.plugin.version>
+        <findbugs.plugin.version>3.0.2</findbugs.plugin.version>
+        <pmd.plugin.version>3.5</pmd.plugin.version>
+        <!--  <surefire.report.plugin.version>2.19.1</surefire.report.plugin.version> -->
+        <checkstyle.plugin.version>2.16</checkstyle.plugin.version>
+        <javadoc.plugin.version>2.10.4</javadoc.plugin.version>
+        <source.plugin.version>2.4</source.plugin.version>
+        <jar.plugin.version>2.4</jar.plugin.version>
+        <lombok.plugin.version>1.16.10.0</lombok.plugin.version>
+        <jgitflow.plugin.version>1.0-m5.1</jgitflow.plugin.version>
+        <gitcommitid.plugin.version>2.2.3</gitcommitid.plugin.version>
+        <maven.site.plugin>3.5.1</maven.site.plugin>
+        <jxr.plugin.version>2.5</jxr.plugin.version>
+        <project.info.reports.plugin.version>2.7</project.info.reports.plugin.version>
+
+        <!--PLUGIN SETTINGS -->
+        <!-- <compiler.source.version>1.7</compiler.source.version>
+        <compiler.target.version>1.7</compiler.target.version> -->
+         <compiler.source.version>11</compiler.source.version>
+        <compiler.target.version>11</compiler.target.version>
+        <unit.test.pattern>**/*Test.java</unit.test.pattern>
+        <skip.unit.tests>false</skip.unit.tests>
+        <integration.test.pattern>**/*IT.java</integration.test.pattern>
+        <skip.integration.tests>true</skip.integration.tests>
+       <!--  <pmd.violation.buildfail>true</pmd.violation.buildfail> -->
+        <findbugs.failOnError>true</findbugs.failOnError>
+        <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
+        <checkstyle.file.name>checkstyle.xml</checkstyle.file.name>
+        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>
+        <dependency.locations.enabled>false</dependency.locations.enabled>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+        <snapshots.path>content/repositories/snapshots/</snapshots.path>
+        <releases.path>content/repositories/releases/</releases.path>
+        <site.path>
+            content/sites/site/org/onap/dcaegen2/services/mapper/${project.artifactId}/${project.version}
+        </site.path>
+       <sonar.coverage.jacoco.xmlReportPaths>
+         ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
+       </sonar.coverage.jacoco.xmlReportPaths>
+    </properties>
+
+    <dependencyManagement>
+
+        <dependencies>
+
+            <!-- https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple -->
+            <dependency>
+                <groupId>com.googlecode.json-simple</groupId>
+                <artifactId>json-simple</artifactId>
+                <version>1.1</version>
+            </dependency>
+
+            <!-- UTILITIES -->
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>${commons.lang3.version}</version>
+            </dependency>
+
+            <!-- TEST DEPENDENCIES -->
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.jayway.jsonpath</groupId>
+                <artifactId>json-path-assert</artifactId>
+                <version>${jayway.jsonpath.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker.maven.version}</version>
+            </dependency>
+
+        </dependencies>
+
+    </dependencyManagement>
+
+
+    <build>
+
+        <resources>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>${project.build.directory}/git</directory>
+            </resource>
+        </resources>
+
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-webdav-jackrabbit</artifactId>
+                <version>1.0-beta-7</version>
+            </extension>
+        </extensions>
+
+        <pluginManagement>
+
+            <plugins>
+
+                <!-- COMPILER PLUGIN -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${compiler.plugin.version}</version>
+                    <configuration>
+                        <source>${compiler.target.version}</source>
+                        <target>${compiler.source.version}</target>
+                    </configuration>
+                </plugin>
+
+                <!-- MAVEN SOURCE PLUGIN -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${source.plugin.version}</version>
+                    <configuration>
+                        <excludeResources>true</excludeResources>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- MAVEN BUNDLE PLUGIN -->
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${bundle.plugin.version}</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <instructions>
+                            <Embed-Dependency>*;inline=false;scope=compile</Embed-Dependency>
+                            <Embed-Transitive>true</Embed-Transitive>
+                            <Embed-Directory>lib</Embed-Directory>
+                        </instructions>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>Bundling mapper Jar</id>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>bundle</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- MAVEN AUTO RUN PLUGIN -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>${autorun.plugin.version}</version>
+                </plugin>
+
+                <!-- ECLIPSE PLUGIN -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-eclipse-plugin</artifactId>
+                    <version>${eclipe.plugin.version}</version>
+                </plugin>
+
+                <!-- JAR PLUGIN -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${jar.plugin.version}</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                            <manifestEntries>
+                                <Implementation-Build-Version>${project.version}</Implementation-Build-Version>
+                            </manifestEntries>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${maven.site.plugin}</version>
+                </plugin>
+                <plugin>
+                    <groupId>com.spotify</groupId>
+                    <artifactId>docker-maven-plugin</artifactId>
+                    <version>${docker.maven.version}</version>
+                    <configuration>
+                        <skipDockerBuild>true</skipDockerBuild>
+                    </configuration>
+                </plugin>
+            </plugins>
+
+        </pluginManagement>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <configLocation>${checkstyle.file.name}</configLocation>
+                    <suppressionsLocation>${checkstyle.suppression.file.name}</suppressionsLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+    <modules>
+        <module>UniversalVesAdapter</module>
+    </modules>
+
+</project>
index 3903250..73415a7 100644 (file)
@@ -1,6 +1,6 @@
 major=1\r
-minor=0\r
-patch=1\r
+minor=1\r
+patch=0\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r