Bump minor version

[sdnc/oam.git] / installation / sdnc / pom.xml

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index d641031..0eaae82 100644 (file)
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -3,27 +3,25 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
        <parent>
-               <groupId>org.openecomp.sdnc.oam</groupId>
+               <groupId>org.onap.sdnc.oam</groupId>
                <artifactId>installation</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.3.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
-       <groupId>org.openecomp.sdnc.oam</groupId>
+       <groupId>org.onap.sdnc.oam</groupId>
        <artifactId>installation-sdnc</artifactId>
-       <version>1.1.0-SNAPSHOT</version>
+       <version>1.3.0-SNAPSHOT</version>
 
        <name>Installation - sdnc</name>
        <description>Creates SDN Controller Docker container</description>
 
        <properties>
-               <image.name>openecomp/sdnc-image</image.name>
+               <image.name>onap/sdnc-image</image.name>
                <sdnc.project.version>${project.version}</sdnc.project.version>
-               <sdnc.core.version>${project.version}</sdnc.core.version>
-               <sdnc.adaptors.version>${project.version}</sdnc.adaptors.version>
-               <sdnc.northbound.version>${project.version}</sdnc.northbound.version>
-               <sdnc.plugins.version>${project.version}</sdnc.plugins.version>
+        <sdnc.northbound.version>1.2.2</sdnc.northbound.version>
+               <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
        </properties>
 
 
@@ -50,7 +48,7 @@
                                                                }
 
                                                                if (project.properties['sdnc.project.version'].endsWith("-SNAPSHOT")) {
-                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-SNAPSHOT-latest";
+                                                                       project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                } else {
                                                                        project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
                                                                }
@@ -62,13 +60,13 @@
                                        </execution>
                                </executions>
                        </plugin>
+
                        <plugin>
                                <groupId>io.fabric8</groupId>
                                <artifactId>docker-maven-plugin</artifactId>
                                <version>0.16.5</version>
                                <inherited>false</inherited>
                                <configuration>
-
                                        <images>
                                                <image>
                                                        <name>${image.name}</name>
@@ -106,36 +104,6 @@
                        </plugin>
 
 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>3.0.0</version>
-                               <executions>
-                                       <execution>
-                                               <id>get-odl-distribution</id>
-                                               <phase>validate</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>org.opendaylight.integration</groupId>
-                                                                       <artifactId>distribution-karaf</artifactId>
-                                                                       <version>0.5.1-Boron-SR1</version>
-                                                                       <type>tar.gz</type>
-
-                                                                       <overWrite>true</overWrite>
-                                                                       <outputDirectory>${basedir}/target/docker-stage</outputDirectory>
-                                                               </artifactItem>
-                                                       </artifactItems>
-                                                       <overWriteReleases>false</overWriteReleases>
-                                                       <overWriteSnapshots>true</overWriteSnapshots>
-                                                       <overWriteIfNewer>true</overWriteIfNewer>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
 
                        <plugin>
                                <artifactId>maven-resources-plugin</artifactId>
@@ -168,7 +136,7 @@
                                                </goals><!-- here the phase you need -->
                                                <phase>validate</phase>
                                                <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/bin</outputDirectory>
+                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory>
                                                        <resources>
                                                                <resource>
                                                                        <directory>src/main/scripts</directory>
@@ -193,7 +161,6 @@
                                                                <resource>
                                                                        <directory>src/main/resources</directory>
                                                                        <includes>
-                                                                               <include>*.tgz</include>
                                                                                <include>idmlight.db.mv.db</include>
                                                                        </includes>
                                                                        <filtering>false</filtering>
@@ -208,7 +175,7 @@
                                                </goals><!-- here the phase you need -->
                                                <phase>validate</phase>
                                                <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data</outputDirectory>
+                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory>
                                                        <resources>
                                                                <resource>
                                                                        <directory>src/main/resources</directory>
@@ -227,7 +194,7 @@
                                                </goals><!-- here the phase you need -->
                                                <phase>validate</phase>
                                                <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/properties</outputDirectory>
+                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory>
                                                        <resources>
                                                                <resource>
                                                                        <directory>../src/main/properties</directory>
@@ -246,7 +213,7 @@
                                                </goals><!-- here the phase you need -->
                                                <phase>validate</phase>
                                                <configuration>
-                                                       <outputDirectory>${basedir}/target/docker-stage/opt/openecomp/sdnc/data/stores</outputDirectory>
+                                                       <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory>
                                                        <resources>
                                                                <resource>
                                                                        <directory>../src/main/stores</directory>
@@ -275,15 +242,12 @@
                                                <configuration>
                                                        <executable>/bin/bash</executable>
                                                        <environmentVariables>
-                                                               <SDNC_CORE_VERSION>${sdnc.core.version}</SDNC_CORE_VERSION>
-                                                               <SDNC_ADAPTORS_VERSION>${sdnc.adaptors.version}</SDNC_ADAPTORS_VERSION>
                                                                <SDNC_NORTHBOUND_VERSION>${sdnc.northbound.version}</SDNC_NORTHBOUND_VERSION>
-                                                               <SDNC_PLUGINS_VERSION>${sdnc.plugins.version}</SDNC_PLUGINS_VERSION>
                                                                <SDNC_OAM_VERSION>${project.version}</SDNC_OAM_VERSION>
                                                        </environmentVariables>
                                                        <arguments>
                                                                <argument>${basedir}/src/main/scripts/installZips.sh</argument>
-                                                               <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                                               <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
                                                        </arguments>
                                                </configuration>
                                        </execution>
@@ -297,7 +261,7 @@
                                                <configuration>
                                                        <executable>/usr/bin/find</executable>
                                                        <arguments>
-                                                               <argument>${basedir}/target/docker-stage/opt/openecomp/sdnc</argument>
+                                                               <argument>${basedir}/target/docker-stage/opt/onap/sdnc</argument>
                                                                <argument>-name</argument>
                                                                <argument>*.sh</argument>
                                                                <argument>-exec</argument>