Refactor for Sonar smells and code coverage

[aai/model-loader.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d17be0e..ae5e7cd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
        <groupId>org.onap.aai.model-loader</groupId>
        <artifactId>model-loader</artifactId>
-       <version>1.2.0-SNAPSHOT</version>
+       <version>1.3.0-SNAPSHOT</version>
 
        <dependencyManagement>
                <dependencies>
@@ -55,6 +55,8 @@
                <hamcrest-all.version>1.3</hamcrest-all.version>
                <babel.version>1.2.0</babel.version>
                <aai.rest.client.version>1.2.1</aai.rest.client.version>
+               <sdc-distribution-client.version>1.3.0</sdc-distribution-client.version>
+               <logback.version>1.2.3</logback.version>
        </properties>
 
     <distributionManagement>
@@ -103,28 +105,6 @@
                </dependency>
 
                <!-- Test dependencies -->
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.hamcrest</groupId>
-                       <artifactId>hamcrest-all</artifactId>
-                       <version>${hamcrest-all.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>org.eclipse.persistence.moxy</artifactId>
-                       <version>2.6.2</version>
-                       <scope>compile</scope>
-               </dependency>
                <!-- https://mvnrepository.com/artifact/com.mikesamuel/json-sanitizer -->
                <dependency>
                        <groupId>com.mikesamuel</groupId>
@@ -138,14 +118,20 @@
                        <artifactId>common-logging</artifactId>
                        <version>1.2.2</version>
                </dependency>
+               <dependency>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-classic</artifactId>
+                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
+               </dependency>
                <dependency>
                        <groupId>ch.qos.logback</groupId>
                        <artifactId>logback-core</artifactId>
+                       <version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
                </dependency>
                <dependency>
                        <groupId>org.onap.sdc.sdc-distribution-client</groupId>
                        <artifactId>sdc-distribution-client</artifactId>
-                       <version>1.3.0</version>
+                       <version>${sdc-distribution-client.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.json</groupId>
@@ -175,6 +161,29 @@
                        <artifactId>commons-text</artifactId>
                        <version>${apache.commons-text.version}</version>
                </dependency>
+               
+        <!-- Test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>${hamcrest-all.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
        </dependencies>
 
     <!-- Plugins and repositories -->
@@ -289,6 +298,13 @@
                                <groupId>com.spotify</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>0.4.11</version>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>com.github.jnr</groupId>
+                                               <artifactId>jnr-unixsocket</artifactId>
+                                               <version>0.13</version>
+                                       </dependency>
+                               </dependencies>
                                <configuration>
                                        <verbose>true</verbose>
                                        <serverId>docker-hub</serverId>