From: Devaraj Sambandan <devaraj.sambandan@commscope.com>
Date: Wed, 8 Jul 2020 06:36:00 +0000 (+0000)
Subject: Merge "VES Heartbeat and Software Management Feature"
X-Git-Tag: 2.2.0~16
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=c4ed11115cea02bb72770e74805081ddba12daef;hp=-c;p=oam%2Ftr069-adapter.git

Merge "VES Heartbeat and Software Management Feature"
---

c4ed11115cea02bb72770e74805081ddba12daef
diff --combined ves-agent/pom.xml
index 8930025,3991c27..817fcbd
--- a/ves-agent/pom.xml
+++ b/ves-agent/pom.xml
@@@ -45,7 -45,7 +45,7 @@@
        </repository>
     </repositories>
     <properties>
 -      <docker.image.name>tr069adapter-ves-notifier</docker.image.name>
 +      <docker.image.name>o-ran-sc/tr069adapter-ves-notifier</docker.image.name>
     </properties>
     <dependencies>
        <dependency>
@@@ -81,6 -81,10 +81,10 @@@
           <artifactId>spring-boot-starter-test</artifactId>
           <scope>test</scope>
        </dependency>
+       <dependency>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-data-jpa</artifactId>
+       </dependency>
        <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>
@@@ -92,6 -96,11 +96,11 @@@
           <version>4.11</version>
           <scope>test</scope>
        </dependency>
+       <dependency>
+          <groupId>com.h2database</groupId>
+          <artifactId>h2</artifactId>
+          <scope>test</scope>
+       </dependency>
        <dependency>
           <groupId>org.springframework.cloud</groupId>
           <artifactId>spring-cloud-starter-kubernetes-config</artifactId>
@@@ -116,6 -125,15 +125,15 @@@
           <version>1.0.0</version>
           <classifier>lib</classifier>
        </dependency>
+       <dependency>
+          <groupId>org.mariadb.jdbc</groupId>
+          <artifactId>mariadb-java-client</artifactId>
+       </dependency>
+       <dependency>
+          <groupId>com.googlecode.json-simple</groupId>
+          <artifactId>json-simple</artifactId>
+          <version>1.1</version>
+       </dependency>
     </dependencies>
     <build>
        <plugins>
@@@ -152,7 -170,7 +170,7 @@@
           <plugin>
              <groupId>org.apache.maven.plugins</groupId>
              <artifactId>maven-surefire-plugin</artifactId>
-              <version>2.17</version>
+             <version>2.17</version>
              <configuration>
                 <skipTests>false</skipTests>
              </configuration>
@@@ -171,13 -189,13 +189,13 @@@
                    <phase>package</phase>
                    <goals>
                       <goal>build</goal>
-     				 <goal>save</goal>
+                      <goal>save</goal>
                    </goals>
                    <configuration>
                       <pullRegistry>${env.CONTAINER_PULL_REGISTRY}</pullRegistry>
                       <images>
                          <image>
-                            <name>${docker.image.name}</name>
+                            <name>${docker.image.name}:${build.version}</name>
                             <build>
                                <cleanup>try</cleanup>
                                <contextDir>${basedir}</contextDir>
@@@ -233,4 -251,4 +251,4 @@@
        <system>JIRA</system>
        <url>https://jira.o-ran-sc.org/</url>
     </issueManagement>
 -</project>
 +</project>