Merge "Grant permissions to *.sh from dockerfile"

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index d12296c..ee8242d 100644 (file)
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -18,8 +18,12 @@
        <description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
 
        <properties>
-               <image.name>ecomp/appc-image</image.name>
+               <image.name>openecomp/appc-image</image.name>
                <appc.version>${project.version}</appc.version>
+                <!--This version will be over-ridden by jenkins 
+                    injecting the version.properties variable file during docker build-->
+               <appc.docker.staging.version>0.0.1</appc.docker.staging.version>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
        </properties>
 
 
@@ -200,7 +204,7 @@
                                                                                <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
                                                                                <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
                                                                                <tags>
-                                                                                       <tag>${project.version}</tag>
+                                                                                       <tag>${appc.docker.staging.version}-STAGING-${maven.build.timestamp}</tag>
                                                                                        <tag>latest</tag> 
                                                                                </tags>
                                                                        </build>

diff --git a/pom.xml b/pom.xml
index c3f0aed..83a73fb 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.openecomp.sdnc.core</groupId>
         <artifactId>root</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -28,8 +28,27 @@
             <url>http://maven.restlet.com</url>
         </pluginRepository>
     </pluginRepositories>
+    <repositories>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>ecomp Staging Repository</name>
+            <url>https://nexus.openecomp.org/content/repositories/staging/</url>
+        </repository>
+    </repositories>
     <build>
         <plugins>
+            <!--maven staging plugin-->
+                <plugin>
+                    <groupId>org.sonatype.plugins</groupId>
+                    <artifactId>nexus-staging-maven-plugin</artifactId>
+                    <version>1.6.7</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <nexusUrl>https://nexus.openecomp.org</nexusUrl>
+                        <stagingProfileId>176c31dfe190a</stagingProfileId>
+                        <serverId>ecomp-staging</serverId>
+                    </configuration>
+                </plugin>
             <!-- blackduck maven plugin -->
             <plugin>
                 <groupId>com.blackducksoftware.integration</groupId>
@@ -89,4 +108,4 @@
         <name>OpenECOMP</name>
     </organization>
     <version>1.0.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+</project>

diff --git a/version.properties b/version.properties
index 7092503..98ae468 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,12 +3,12 @@
 # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
 # because they are used in Jenkins, whose plug-in doesn't support
 
-release_name=0
+release_name=1
 sprint_number=0
-feature_revision=1
+feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-
+appc.docker.staging.version=${base_version}