X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=sdnc-a1-controller%2Foam%2Finstallation%2Fsdnc-a1%2Fpom.xml;h=18d94cddf8d6f9c08a3f02429759ede542eb5240;hb=dfff24a65d219ce3985edbf744b034d1882e452f;hp=bf8bfe31eaab77667b3b27c5e43dd15b8889aaad;hpb=3134679dec4f273afbb768c8ff71a5f50f5a6a4c;p=nonrtric.git

diff --git a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
index bf8bfe31..18d94cdd 100644
--- a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
+++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
@@ -23,29 +23,26 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.4.3</version>
+        <version>1.5.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>installation-sdnc-a1</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
 
     <name>sdnc-a1-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
 
     <properties>
-        <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
-	<standalone.image.version>1.7.4-SNAPSHOT</standalone.image.version>
-        <sdnc.project.version>${project.version}</sdnc.project.version>
-        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <sdnc.northbound.version>1.7.3-SNAPSHOT</sdnc.northbound.version>
-        <ccsdk.docker.version>0.6.3</ccsdk.docker.version>
-        <sdnc.keystore>org.onap.sdnc.p12</sdnc.keystore>
-        <sdnc.keypass><![CDATA[ff^G9D]yf&r}Ktum@BJ0YB?N]]></sdnc.keypass>
-        <sdnc.secureport>8443</sdnc.secureport>
-        <docker.push.phase>deploy</docker.push.phase>
+     <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
+     <standalone.image.version>2.1.0-SNAPSHOT</standalone.image.version>
+     <sdnc.project.version>${project.version}</sdnc.project.version>
+     <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+     <sdnc.northbound.version>2.1.0-SNAPSHOT</sdnc.northbound.version>
+     <ccsdk.docker.version>0.7.0</ccsdk.docker.version>
+     <docker.push.phase>deploy</docker.push.phase>
     </properties>
 
     <dependencies>
@@ -102,7 +99,7 @@
                         <name>${standalone.image.name}:${standalone.image.version}</name>
                         <build>
                          <cleanup>try</cleanup>
-                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                         <contextDir>${basedir}/target/docker-stage</contextDir>
                          <dockerFile>standalone.Dockerfile</dockerFile>
                          <tags>
                              <tag>${standalone.image.version}</tag>
@@ -126,7 +123,7 @@
                          <name>${standalone.image.name}:${standalone.image.version}</name>
                          <build>
                           <cleanup>try</cleanup>
-                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                          <contextDir>${basedir}/target/docker-stage</contextDir>
                           <dockerFile>standalone.Dockerfile</dockerFile>
                           <tags>
                              <tag>${standalone.image.version}</tag>
@@ -193,9 +190,7 @@
                                 <resource>
                                     <directory>src/main/resources</directory>
                                     <includes>
-                                        <include>idmlight.db.mv.db</include>
-                                        <include>truststoreONAPall.jks</include>
-                                        <include>aaa-app-config.xml</include>
+                                        <include>*.jks</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -242,27 +237,6 @@
                             </resources>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-keystores</id>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>../src/main/stores</directory>
-                                    <includes>
-                                        <include>*.jks</include>
-                                        <include>*.keyfile</include>
-                                        <include>*.p12</include>
-                                    </includes>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             <plugin>