X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fpom.xml;h=63d3a2146d873c6504d595fb913b3b038d7c7b08;hb=614a16a8fb98b477e65446d5a47777f99e65c281;hp=4f59aaa91a529c087d213253d008324d4c131d0f;hpb=c4c27b78ff6b4a8f22553ef3d19aec67edd17482;p=sdnc%2Foam.git

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 4f59aaa9..63d3a214 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -4,24 +4,29 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.5.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.sdnc.oam</groupId>
     <artifactId>installation-sdnc</artifactId>
-    <version>1.5.1-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
 
     <name>sdnc-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
 
     <properties>
-        <image.name>onap/sdnc-image</image.name>
+        <image.name>onap/sdnc-aaf-image</image.name>
+        <standalone.image.name>onap/sdnc-image</standalone.image.name>
         <sdnc.project.version>${project.version}</sdnc.project.version>
         <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <sdnc.northbound.version>1.5.1-SNAPSHOT</sdnc.northbound.version>
-        <ccsdk.docker.version>0.4.2-STAGING-latest</ccsdk.docker.version>
+        <sdnc.northbound.version>1.8.0</sdnc.northbound.version>
+        <ccsdk.docker.version>0.7.2</ccsdk.docker.version>
+        <ccsdk.features.version>0.7.2</ccsdk.features.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.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <docker.push.phase>deploy</docker.push.phase>
         <docker.verbose>true</docker.verbose>
@@ -42,8 +47,15 @@
             <version>${sdnc.northbound.version}</version>
             <classifier>repo</classifier>
             <type>zip</type>
+       </dependency>
+       <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>optical-service-installer</artifactId>
+            <version>${sdnc.northbound.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
         </dependency>
-        <dependency>
+      	<dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>vnftools-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
@@ -57,6 +69,29 @@
             <classifier>repo</classifier>
             <type>zip</type>
         </dependency>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>oofpcipoc-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
+            <artifactId>sdnr-northbound-features-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
+            <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
+            <version>${ccsdk.features.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
+        </dependency>
     </dependencies>
 
     <build>
@@ -84,23 +119,6 @@
                 <artifactId>docker-maven-plugin</artifactId>
                 <version>0.28.0</version>
                 <inherited>false</inherited>
-                <configuration>
-                    <images>
-                        <image>
-                            <name>${image.name}</name>
-                            <build>
-                                <cleanup>try</cleanup>
-                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                <dockerFile>Dockerfile</dockerFile>
-                                <tags>
-                                    <tag>${project.docker.latestminortag.version}</tag>
-                                    <tag>${project.docker.latestfulltag.version}</tag>
-                                    <tag>${project.docker.latesttagtimestamp.version}</tag>
-                                </tags>
-                            </build>
-                        </image>
-                    </images>
-                </configuration>
                 <executions>
                     <execution>
                         <id>generate-images</id>
@@ -108,21 +126,100 @@
                         <goals>
                             <goal>build</goal>
                         </goals>
+                        <configuration>
+                           <images>
+                            <image>
+                             <name>${image.name}</name>
+                             <build>
+                              <cleanup>try</cleanup>
+                              <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                              <dockerFile>Dockerfile</dockerFile>
+                              <tags>
+                                 <tag>${project.docker.latestminortag.version}</tag>
+                                 <tag>${project.docker.latestfulltag.version}</tag>
+                                 <tag>${project.docker.latesttagtimestamp.version}</tag>
+                              </tags>
+                             </build>
+                            </image>
+                           </images>
+                          </configuration>
                     </execution>
-
                     <execution>
-                        <id>push-images</id>
-                        <phase>${docker.push.phase}</phase>
-                        <goals>
-                            <goal>build</goal>
-                            <goal>push</goal>
-                        </goals>
-                    </execution>
+                      <id>push-images</id>
+                      <phase>${docker.push.phase}</phase>
+                      <goals>
+                       <goal>build</goal>
+                       <goal>push</goal>
+                      </goals>
+                       <configuration>
+                        <images>
+                         <image>
+                          <name>${image.name}</name>
+                          <build>
+                           <cleanup>try</cleanup>
+                           <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                           <dockerFile>Dockerfile</dockerFile>
+                           <tags>
+                              <tag>${project.docker.latestminortag.version}</tag>
+                              <tag>${project.docker.latestfulltag.version}</tag>
+                              <tag>${project.docker.latesttagtimestamp.version}</tag>
+                           </tags>
+                          </build>
+                         </image>
+                        </images>
+                       </configuration>
+                   </execution>
+                   <execution>
+                     <id>generate-standalone-images</id>
+                     <phase>package</phase>
+                     <goals>
+                      <goal>build</goal>
+                     </goals>
+                     <configuration>
+                      <images>
+                       <image>
+                        <name>${standalone.image.name}</name>
+                        <build>
+                         <cleanup>try</cleanup>
+                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                         <dockerFile>standalone.Dockerfile</dockerFile>
+                         <tags>
+                             <tag>${project.docker.latestminortag.version}</tag>
+                             <tag>${project.docker.latestfulltag.version}</tag>
+                             <tag>${project.docker.latesttagtimestamp.version}</tag>
+                         </tags>
+                        </build>
+                       </image>
+                      </images>
+                     </configuration>
+                   </execution>
+                   <execution>
+                     <id>push-standalone-images</id>
+                     <phase>${docker.push.phase}</phase>
+                     <goals>
+                      <goal>build</goal>
+                      <goal>push</goal>
+                     </goals>
+                     <configuration>
+                       <images>
+                        <image>
+                         <name>${standalone.image.name}</name>
+                         <build>
+                          <cleanup>try</cleanup>
+                          <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
+                          <dockerFile>standalone.Dockerfile</dockerFile>
+                          <tags>
+                             <tag>${project.docker.latestminortag.version}</tag>
+                             <tag>${project.docker.latestfulltag.version}</tag>
+                             <tag>${project.docker.latesttagtimestamp.version}</tag>
+                          </tags>
+                         </build>
+                        </image>
+                       </images>
+                     </configuration>
+                  </execution>
                 </executions>
             </plugin>
-
-
-
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.6</version>
@@ -140,6 +237,7 @@
                                     <directory>src/main/docker</directory>
                                     <includes>
                                         <include>Dockerfile</include>
+                                        <include>standalone.Dockerfile</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
@@ -157,8 +255,8 @@
                             <resources>
                                 <resource>
                                     <directory>src/main/scripts</directory>
-				    <includes>
-					<include>*.py</include>
+                                    <includes>
+                                        <include>*.py</include>
                                         <include>*.sh</include>
                                     </includes>
                                     <filtering>false</filtering>
@@ -179,8 +277,8 @@
                                     <directory>src/main/resources</directory>
                                     <includes>
                                         <include>idmlight.db.mv.db</include>
-                                        <include>AAF_RootCA.cer</include>
                                         <include>truststoreONAPall.jks</include>
+                                        <include>aaa-app-config.xml</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -219,6 +317,8 @@
                                     <directory>../src/main/properties</directory>
                                     <includes>
                                         <include>*.properties</include>
+                                        <include>*.props</include>
+                                        <include>*.csv</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -238,6 +338,8 @@
                                     <directory>../src/main/stores</directory>
                                     <includes>
                                         <include>*.jks</include>
+                                        <include>*.keyfile</include>
+                                        <include>*.p12</include>
                                     </includes>
                                     <filtering>false</filtering>
                                 </resource>
@@ -292,7 +394,7 @@
                                 <artifactItem>
                                     <groupId>org.onap.sdnc.oam</groupId>
                                     <artifactId>data-migrator</artifactId>
-                                    <version>1.5.0-SNAPSHOT</version>
+                                    <version>${project.version}</version>
                                     <type>zip</type>
                                 </artifactItem>
                             </artifactItems>
@@ -305,7 +407,6 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <version>1.5.0</version>
                 <executions>
-
                     <execution>
                         <id>change shell permissions</id>
                         <phase>process-sources</phase>
@@ -329,7 +430,6 @@
                 </executions>
             </plugin>
         </plugins>
-
     </build>
     <organization>
         <name>ONAP</name>