Unify integration-* image usage

[dcaegen2/platform.git] / mod2 / catalog-service / pom.xml

diff --git a/mod2/catalog-service/pom.xml b/mod2/catalog-service/pom.xml
index 78cced4..7f60632 100644 (file)
--- a/mod2/catalog-service/pom.xml
+++ b/mod2/catalog-service/pom.xml
@@ -3,7 +3,8 @@
   ~ ============LICENSE_START=======================================================
   ~  org.onap.dcae
   ~  ================================================================================
-  ~  Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+  ~  Copyright (c) 2020-2021 AT&T Intellectual Property. All rights reserved.
+  ~  Copyright (c) 2021 Samsung Electronics. All rights reserved.
   ~  ================================================================================
   ~  Licensed under the Apache License, Version 2.0 (the "License");
   ~  you may not use this file except in compliance with the License.
@@ -30,16 +31,23 @@
     </parent>
     <groupId>org.onap.dcaegen2.platform.mod</groupId>
     <artifactId>catalog-service</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 
     <properties>
         <java.version>11</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <spring-boot.version>2.2.5.RELEASE</spring-boot.version>
-        <dockerfile-maven-plugin.version>1.4.1</dockerfile-maven-plugin.version>
+        <spring-boot.version>2.2.9.RELEASE</spring-boot.version>
+        <dockerfile-maven-plugin.version>1.4.10</dockerfile-maven-plugin.version>
+        <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.onap.dcaegen2.platform.mod</groupId>
+            <artifactId>blueprint-generator</artifactId>
+            <version>1.5.2</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
@@ -95,14 +103,19 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>4.0.1</version>
+            <version>4.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>4.0.1</version>
+            <version>4.2.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20190722</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -138,7 +151,7 @@
                 <version>${dockerfile-maven-plugin.version}</version>
                 <configuration>
                     <contextDirectory>${project.basedir}</contextDirectory>
-                    <repository>onap/${project.groupId}.${project.artifactId}</repository>
+                    <repository>${onap.nexus.dockerregistry.daily}/${docker.image.name}</repository>
                     <buildArgs>
                         <PROJECT_BUILD_DIR_NAME>target</PROJECT_BUILD_DIR_NAME>
                         <FINAL_JAR>${project.build.finalName}.jar</FINAL_JAR>
@@ -160,7 +173,7 @@
                             <goal>push</goal>
                         </goals>
                         <configuration>
-                            <repository>onap/${project.groupId}.${project.artifactId}</repository>
+                            <repository>${onap.nexus.dockerregistry.daily}/${docker.image.name}</repository>
                             <tag>latest</tag>
                             <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                         </configuration>
@@ -173,7 +186,7 @@
                             <goal>push</goal>
                         </goals>
                         <configuration>
-                            <repository>onap/${project.groupId}.${project.artifactId}</repository>
+                            <repository>${onap.nexus.dockerregistry.daily}/${docker.image.name}</repository>
                             <tag>${project.version}</tag>
                             <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
                         </configuration>
@@ -197,4 +210,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
\ No newline at end of file
+</project>