Merge "Add default path for mvn settings file"

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..fb98f84
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,56 @@
+#####standard .git ignore entries#####
+
+## IDE Specific Files ##
+org.eclipse.core.resources.prefs
+.classpath
+.project
+.settings
+.idea
+.externalToolBuilders
+maven-eclipse.xml
+workspace
+
+# Used to not upload Blackduck Scans
+**/*.jsonld
+**/blackDuckHubProjectName.txt
+**/blackDuckHubProjectVersionName.txt
+
+## Compilation Files ##
+*.class
+**/target
+target
+target-ide
+MANIFEST.MF
+
+## Misc Ignores (OS specific etc) ##
+bin/
+dist
+*~
+*.ipr
+*.iml
+*.iws
+classes
+out/
+.DS_STORE
+.metadata
+
+## antlr4 generated files ##
+ExprGrammarBaseListener.java
+ExprGrammarLexer.java
+ExprGrammarListener.java
+ExprGrammarParser.java
+ExprGrammar.tokens
+ExprGrammarLexer.tokens
+
+# BlackDuck generated file
+sdnc-oam_bdio.jsonld
+
+#Chef local mode cache
+local-mode-cache
+
+# Generated local docker image
+**/docker-files/opt
+**/src/main/resources/opt
+
+#dgbuilder releases
+**/dgbuilder/releases

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index 5a0e552..a959701 100644 (file)
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -5,21 +5,25 @@
        <parent>
                <groupId>org.openecomp.appc.deployment</groupId>
                <artifactId>installation</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.appc.deployment</groupId>
        <artifactId>installation-appc</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>Installation - APPC Docker</name>
        <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>1.0.0</appc.docker.staging.version>
+               <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
        </properties>
 
 
@@ -135,6 +139,7 @@
                        <plugin>
                                <artifactId>exec-maven-plugin</artifactId>
                                <groupId>org.codehaus.mojo</groupId>
+                               <version>1.5.0</version>
                                <executions>
                                        <execution>
                                                <id>Get features</id>
@@ -200,7 +205,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>
@@ -310,6 +315,7 @@
                                        <plugin>
                                                <artifactId>exec-maven-plugin</artifactId>
                                                <groupId>org.codehaus.mojo</groupId>
+                                               <version>1.5.0</version>
                                                <executions>
                                                        <execution>
                                                                <id>Get features</id>

diff --git a/installation/pom.xml b/installation/pom.xml
index d9dd6c0..ad124c3 100644 (file)
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.openecomp.appc.deployment</groupId>
                <artifactId>appc-docker-project</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.appc.deployment</groupId>
        <artifactId>installation</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>Installation</name>
        <description>Installs APP-C on local file system</description>

diff --git a/platform-logic/appc/pom.xml b/platform-logic/appc/pom.xml
index a57e64b..deb425d 100644 (file)
--- a/platform-logic/appc/pom.xml
+++ b/platform-logic/appc/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.openecomp.appc.deployment</groupId>
                <artifactId>platform-logic</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.appc.deployment</groupId>
        <artifactId>platform-logic-appc</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>Platform Logic : APP-C</name>
        <description>Contains platform-level service logic for the APP-C Platform</description>

diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index e474ec5..65d850c 100644 (file)
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.openecomp.appc.deployment</groupId>
                <artifactId>platform-logic</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.appc.deployment</groupId>
        <artifactId>platform-logic-installer</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>Platform Logic Installer for APP-C</name>
        <description>Contains platform-level service logic installer for APP-C</description>

diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index b3ca5cd..067450a 100644 (file)
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,14 +5,14 @@
        <parent>
                <groupId>org.openecomp.appc.deployment</groupId>
                <artifactId>appc-docker-project</artifactId>
-               <version>1.0.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
        <groupId>org.openecomp.appc.deployment</groupId>
        <artifactId>platform-logic</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
+       <version>1.1.0-SNAPSHOT</version>
 
        <name>Platform Logic</name>
        <description>Contains platform-level service logic. Installs APP-C Directed Graphs during Docker instantiation.</description>

diff --git a/pom.xml b/pom.xml
index c3f0aed..cc0e4be 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>
@@ -88,5 +107,5 @@
     <organization>
         <name>OpenECOMP</name>
     </organization>
-    <version>1.0.0-SNAPSHOT</version>
-</project>
\ No newline at end of file
+    <version>1.1.0-SNAPSHOT</version>
+</project>

diff --git a/version.properties b/version.properties
index 7092503..04f4a42 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
-sprint_number=0
-feature_revision=1
+release_name=1
+sprint_number=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}