Merge "VES Heartbeat and Software Management Feature"

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