Fix use of Optional in ToscaElementOperation

[sdc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 5944093..fbc49bb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,6 @@ Modifications copyright (c) 2018-2019 Nokia
         <hamcrest.version>2.2</hamcrest.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <maven-jar-plugin.version>2.4</maven-jar-plugin.version>
         <jMapper.version>1.6.0.1</jMapper.version>
 
         <!-- sonar -->
@@ -182,9 +181,15 @@ Modifications copyright (c) 2018-2019 Nokia
         <surefire.reuseForks>true</surefire.reuseForks>
         <surefire.skip.tests>false</surefire.skip.tests>
 
-        <docker.api.version>1.35</docker.api.version>
         <bouncycastle.version>1.69</bouncycastle.version>
 
+        <!--DOCKER-->
+        <docker.api.version>1.41</docker.api.version>
+        <docker.namespace>onap</docker.namespace>
+        <docker.password>docker</docker.password>
+        <docker.username>docker</docker.username>
+        <docker.registry>nexus3.onap.org:10001</docker.registry>
+
         <verbose>false</verbose>
     </properties>
 
@@ -296,6 +301,12 @@ Modifications copyright (c) 2018-2019 Nokia
             <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-inline</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <reporting>
@@ -383,12 +394,17 @@ Modifications copyright (c) 2018-2019 Nokia
                 <plugin>
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
-                    <version>0.31.0</version>
+                    <version>0.38.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.2</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.eirslett</groupId>
@@ -598,6 +614,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>common-app-logging</module>
                 <module>common-app-api</module>
                 <module>common-be</module>
+                <module>common-be-tests-utils</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>
@@ -621,6 +638,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>common-app-logging</module>
                 <module>common-app-api</module>
                 <module>common-be</module>
+                <module>common-be-tests-utils</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>
@@ -649,6 +667,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>common-app-logging</module>
                 <module>common-app-api</module>
                 <module>common-be</module>
+                <module>common-be-tests-utils</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>
@@ -670,13 +689,13 @@ Modifications copyright (c) 2018-2019 Nokia
             </activation>
             <properties>
                 <checkstyle.skip>true</checkstyle.skip>
-                <maven.test.skip>true</maven.test.skip>
             </properties>
             <modules>
                 <module>onboarding</module>
                 <module>common-app-logging</module>
                 <module>common-app-api</module>
                 <module>common-be</module>
+                <module>common-be-tests-utils</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>
@@ -706,6 +725,7 @@ Modifications copyright (c) 2018-2019 Nokia
                 <module>common-app-logging</module>
                 <module>common-app-api</module>
                 <module>common-be</module>
+                <module>common-be-tests-utils</module>
                 <module>catalog-dao</module>
                 <module>catalog-model</module>
                 <module>catalog-be</module>