X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=f1ec144f56202fa332876270e82804bbd4aff8f8;hb=c5918ef6b0f6838df7cc66dfbb1aa27f69e3bac1;hp=827ab4a7246b87a70827de4771145638ba119d1e;hpb=fff64f89ef68f9f6a31d462507495115b81c04f9;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 827ab4a7..f1ec144f 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,12 +5,10 @@
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-odlsli</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odlsli-alpine</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-distribution :: odlsli-alpine</name>
@@ -20,7 +18,7 @@
     </organization>
 
     <properties>
-        <base.image.name>onap/ccsdk-odl-aluminum-alpine-image</base.image.name>
+        <base.image.name>onap/ccsdk-odl-sulfur-alpine-image</base.image.name>
         <image.name>onap/ccsdk-odlsli-alpine-image</image.name>
 
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
@@ -33,13 +31,21 @@
         <opendaylight.root>opt/opendaylight</opendaylight.root>
 
         <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key>
-        <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra>
-        <ccsdk.odl.features>
-            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all
-        </ccsdk.odl.features>
-        <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra>
-        <!-- Version definition is placed in org.onap.ccsdk.parent/oparent -->
-        <ccsdk.oran.a1adapter.version>1.2.0-SNAPSHOT</ccsdk.oran.a1adapter.version>
+        <!-- ODL Features Boot -->
+        <extra.odl.features>
+            odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040,odl-restconf-nb-bierman02,odl-controller-blueprint
+        </extra.odl.features>
+        <!-- SLI Features Boot -->
+        <ccsdk.sli.features>
+            ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all
+        </ccsdk.sli.features>
+        <!-- SLI Features Repositories -->
+        <ccsdk.sli.features.repo>
+            mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${resolvedVersion.slicore-features-installer}/xml/features,\
+            mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${resolvedVersion.sliadaptors-features-installer}/xml/features,\
+            mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${resolvedVersion.slinorthbound-features-installer}/xml/features,\
+            mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${resolvedVersion.sliplugins-features-installer}/xml/features
+        </ccsdk.sli.features.repo>
         <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks>
     </properties>
 
@@ -51,256 +57,192 @@
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>dblib-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>filters-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliapi-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>utils-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>slicore-features-installer</artifactId>
-            <version>${ccsdk.sli.core.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>aai-service-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>ansible-adaptor-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>base-http-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>mdsal-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId>
             <artifactId>publisher.installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>netbox-client-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>resource-assignment-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>saltstack-adaptor-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sql-resource-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.adaptors</groupId>
             <artifactId>sliadaptors-features-installer</artifactId>
-            <version>${ccsdk.sli.adaptors.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>asdcApi-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>dataChange-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>lcm-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.northbound</groupId>
             <artifactId>slinorthbound-features-installer</artifactId>
-            <version>${ccsdk.sli.northbound.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>properties-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>template-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>restconf-client-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sshapi-call-node-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.plugins</groupId>
             <artifactId>sliplugins-features-installer</artifactId>
-            <version>${ccsdk.sli.plugins.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features</groupId>
-            <artifactId>features-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
-            <artifactId>sdnr-wt-feature-aggregator-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features</groupId>
-            <artifactId>aafshiro-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>sdnr-northbound-features-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.oran</groupId>
-            <artifactId>a1-adapter-northbound-installer</artifactId>
-            <version>${ccsdk.oran.a1adapter.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>oofpcipoc-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.oran</groupId>
-            <artifactId>a1-adapter-installer</artifactId>
-            <version>${ccsdk.oran.a1adapter.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>CMNotify-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
-            <type>zip</type>
-            <classifier>repo</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId>
-            <artifactId>ranSlice-installer</artifactId>
-            <version>${ccsdk.features.version}</version>
+            <version>${ccsdk.sli.version}</version>
             <type>zip</type>
             <classifier>repo</classifier>
         </dependency>
@@ -308,12 +250,24 @@
 
     <build>
         <plugins>
+          
             <plugin>
-                <groupId>org.codehaus.groovy.maven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>1.0</version>
+                <groupId>org.codehaus.gmaven</groupId>
+                <artifactId>groovy-maven-plugin</artifactId>
+                <version>2.1.1</version>
                 <executions>
                     <execution>
+                        <id>derive-resolved-versions</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>${basedir}/../../src/main/scripts/ResolveRanges.groovy</source>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>derive-docker-tags</id>
                         <phase>validate</phase>
                         <goals>
                             <goal>execute</goal>
@@ -332,7 +286,8 @@
                         <id>copy-dockerfile</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -351,7 +306,8 @@
                         <id>copy-scripts</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory>
@@ -370,7 +326,8 @@
                         <id>copy-odl-resources</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -392,7 +349,8 @@
                         <id>copy-config</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
@@ -411,7 +369,8 @@
                         <id>copy-data</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory>
@@ -430,7 +389,8 @@
                         <id>copy-properties</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties
@@ -451,7 +411,8 @@
                         <id>copy-keystores</id>
                         <goals>
                             <goal>copy-resources</goal>
-                        </goals><!-- here the phase you need -->
+                        </goals>
+                        <!-- here the phase you need -->
                         <phase>validate</phase>
                         <configuration>
                             <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory>
@@ -510,7 +471,7 @@
                 <version>1.8</version>
                 <executions>
                     <execution>
-                        <id>change shell permissions</id>
+                        <id>change-shell-permissions</id>
                         <phase>process-sources</phase>
                         <configuration>
                             <target>
@@ -523,35 +484,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.5.0</version>
-                <executions>
-                    <execution>
-                        <id>change shell permissions</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>exec</goal>
-                        </goals>
-                        <configuration>
-                            <executable>/usr/bin/find</executable>
-                            <arguments>
-                                <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument>
-                                <argument>-name</argument>
-                                <argument>*.sh</argument>
-                                <argument>-exec</argument>
-                                <argument>chmod</argument>
-                                <argument>+x</argument>
-                                <argument>{}</argument>
-                                <argument>;</argument>
-                            </arguments>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
@@ -623,99 +555,13 @@
                                 </image>
                             </images>
                             <verbose>${docker.verbose}</verbose>
-                            <skipRun>${docker.skip.run}</skipRun>
                             <skipPush>${docker.skip.push}</skipPush>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>build-images</id>
-                                <phase>package</phase>
+                                <id>build-push-images</id>
                                 <goals>
                                     <goal>build</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>start-it-instance</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                                <configuration>
-                                    <images>
-                                        <image>
-                                            <name>mariadb:10.5</name>
-                                            <alias>odlsli-db</alias>
-                                            <run>
-                                                <env>
-                                                    <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
-                                                    <!-- Below are not required as installSdncDb.sh handles same -->
-                                                    <!--
-                                                    <MYSQL_USER>sdnctl</MYSQL_USER>
-                                                    <MYSQL_PASSWORD>gamma</MYSQL_PASSWORD>
-                                                    <MYSQL_DATABASE>sdnctl</MYSQL_DATABASE>
-                                                    -->
-                                                </env>
-                                                <network>
-                                                    <mode>custom</mode>
-                                                    <name>onap</name>
-                                                    <alias>dbhost</alias>
-                                                    <alias>sdnctldb01</alias>
-                                                    <alias>sdnctldb02</alias>
-                                                </network>
-                                                <ports>
-                                                    <port>odlslidb.port:3306</port>
-                                                </ports>
-                                                <log>
-                                                    <enabled>true</enabled>
-                                                </log>
-                                            </run>
-                                        </image>
-                                        <image>
-                                            <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name>
-                                            <alias>odlsli-container</alias>
-                                            <run>
-                                                <env>
-                                                    <MYSQL_ROOT_PASSWORD>itsASecret</MYSQL_ROOT_PASSWORD>
-                                                    <SDNC_DB_USER>sdnctl</SDNC_DB_USER>
-                                                    <SDNC_DB_PASSWORD>gamma</SDNC_DB_PASSWORD>
-                                                    <SDNC_DB_DATABASE>sdnctl</SDNC_DB_DATABASE>
-                                                    <SDNC_CONFIG_DIR>/opt/onap/ccsdk/data/properties</SDNC_CONFIG_DIR>
-                                                    <KARAF_CONSOLE_LOG_LEVEL>INFO</KARAF_CONSOLE_LOG_LEVEL>
-                                                </env>
-                                                <dependsOn>
-                                                    <container>odlsli-db</container>
-                                                </dependsOn>
-                                                <network>
-                                                    <mode>custom</mode>
-                                                    <name>onap</name>
-                                                    <alias>odlsli</alias>
-                                                </network>
-                                                <ports>
-                                                    <port>odlsli.port:8181</port>
-                                                </ports>
-                                                <wait>
-                                                    <log>all warp coils are now operating at peak efficiency</log>
-                                                    <time>150000</time>
-                                                </wait>
-                                                <log>
-                                                    <enabled>true</enabled>
-                                                </log>
-                                            </run>
-                                        </image>
-                                    </images>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>stop-it-instance</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>push-images</id>
-                                <goals>
-                                    <!--<goal>build</goal>-->
                                     <goal>push</goal>
                                 </goals>
                             </execution>