From 5deddeb4892243627ad342a41d4dcef0f7280a29 Mon Sep 17 00:00:00 2001
From: Vijay VK <vv770d@att.com>
Date: Tue, 7 Aug 2018 00:44:41 +0100
Subject: VES 7.0.1 updates

Initial commit to include the support for below
- VES 7.1 API
- updated spec and data-format
- Response code update per new spec
- springfox for swagger doc
- New topic defaults

Todo
- Swagger instrumention to include necessary annotation
- Event Transformation 7.x to 5.x
- VES7.x response header
- AAF cert integration

Change-Id: I9bc2223fa362b35ae8a7105acd651fe524a403c5
Signed-off-by: VENKATESH KUMAR <vv770d@att.com>
Issue-ID: DCAEGEN2-600
---
 pom.xml | 65 ++++++++++++++++++++---------------------------------------------
 1 file changed, 20 insertions(+), 45 deletions(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 0ba074f2..56133e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,49 +17,36 @@ 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">
+<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>0.1.1</version>
-        <relativePath/>
+        <relativePath />
     </parent>
-
     <groupId>org.onap.dcaegen2.collectors.ves</groupId>
     <artifactId>VESCollector</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-
+    <version>1.3.1-SNAPSHOT</version>
     <name>dcaegen2-collectors-ves</name>
     <description>VESCollector</description>
-
     <properties>
         <!-- PROJECT SETTINGS -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>8</java.version>
         <docker.image.name>onap/org.onap.dcaegen2.collectors.ves.vescollector</docker.image.name>
-
         <!-- TEST SETTINGS -->
         <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
-
         <!-- 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/collectors/ves/${project.artifactId}/${project.version}
-        </site.path>
+        <site.path>content/sites/site/org/onap/dcaegen2/collectors/ves/${project.artifactId}/${project.version}</site.path>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
-
     </properties>
-
     <build>
         <pluginManagement>
             <plugins>
@@ -106,7 +93,6 @@ limitations under the License.
                 </plugin>
             </plugins>
         </pluginManagement>
-
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -117,7 +103,6 @@ limitations under the License.
                     <showDeprecation>true</showDeprecation>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
                 <configuration>
@@ -133,7 +118,6 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
@@ -147,7 +131,6 @@ limitations under the License.
                     </archive>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
@@ -168,7 +151,6 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
@@ -193,7 +175,6 @@ limitations under the License.
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -215,10 +196,9 @@ limitations under the License.
                         </resource>
                     </resources>
                     <runs>
-                        <run>chmod +x bin/*.sh</run> <!-- Maven is loosing file permissions during artifacts copy -->
-                        <run>
-                            <![CDATA[apt-get update && apt-get install -y --no-install-recommends logrotate && apt-get install -y procps && apt-get install -y vim && apt-get clean all]]>
-                        </run>
+                        <run>chmod +x bin/*.sh</run>
+                        <!-- Maven is loosing file permissions during artifacts copy -->
+                        <run><![CDATA[apt-get update && apt-get install -y --no-install-recommends logrotate && apt-get install -y procps && apt-get install -y vim && apt-get clean all]]></run>
                         <run>chmod 0644 etc/logrotate.conf</run>
                     </runs>
                     <exposes>
@@ -227,7 +207,6 @@ limitations under the License.
                     </exposes>
                     <entryPoint>bin/docker-entry.sh</entryPoint>
                 </configuration>
-
                 <executions>
                     <execution>
                         <id>build-image</id>
@@ -256,8 +235,7 @@ limitations under the License.
                         </goals>
                         <configuration>
                             <image>${docker.image.name}:latest</image>
-                            <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}
-                            </newName>
+                            <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName>
                             <pushImage>true</pushImage>
                         </configuration>
                     </execution>
@@ -269,9 +247,7 @@ limitations under the License.
                         </goals>
                         <configuration>
                             <image>${docker.image.name}:latest</image>
-                            <newName>
-                                ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z
-                            </newName>
+                            <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}Z</newName>
                             <pushImage>true</pushImage>
                         </configuration>
                     </execution>
@@ -279,7 +255,6 @@ limitations under the License.
             </plugin>
         </plugins>
     </build>
-
     <profiles>
         <profile>
             <id>with-system-proxy</id>
@@ -298,7 +273,6 @@ limitations under the License.
             </build>
         </profile>
     </profiles>
-
     <reporting>
         <plugins>
             <plugin>
@@ -312,7 +286,6 @@ limitations under the License.
                     </reportSet>
                 </reportSets>
             </plugin>
-
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
@@ -329,7 +302,6 @@ limitations under the License.
             </plugin>
         </plugins>
     </reporting>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -342,7 +314,6 @@ limitations under the License.
             </dependency>
         </dependencies>
     </dependencyManagement>
-
     <dependencies>
         <!-- JSON RELATED -->
         <dependency>
@@ -370,7 +341,6 @@ limitations under the License.
             <artifactId>json</artifactId>
             <version>20160810</version>
         </dependency>
-
         <!-- REST API RELATED -->
         <dependency>
             <groupId>com.att.nsa</groupId>
@@ -382,7 +352,6 @@ limitations under the License.
             <artifactId>unirest-java</artifactId>
             <version>1.4.9</version>
         </dependency>
-
         <!-- MISCELLANEOUS -->
         <dependency>
             <groupId>commons-collections</groupId>
@@ -399,7 +368,6 @@ limitations under the License.
             <artifactId>vavr</artifactId>
             <version>0.9.2</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
@@ -423,7 +391,17 @@ limitations under the License.
             <artifactId>spring-boot-starter-log4j</artifactId>
             <version>1.3.8.RELEASE</version>
         </dependency>
-
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.8.0</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- TESTING -->
         <dependency>
             <groupId>org.mockito</groupId>
@@ -456,14 +434,12 @@ limitations under the License.
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <repositories>
         <repository>
             <id>external-repository</id>
             <url>https://oss.sonatype.org/content/repositories</url>
         </repository>
     </repositories>
-
     <pluginRepositories>
         <!-- Black Duck plugin dependencies -->
         <pluginRepository>
@@ -477,5 +453,4 @@ limitations under the License.
             <url>http://maven.restlet.com</url>
         </pluginRepository>
     </pluginRepositories>
-
 </project>
-- 
cgit 1.2.3-korg