Update the pom for release version

Change-Id: Id7c8a474e77e7de0f67d89024b4daf185ccdbe05
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

diff --git a/.gitattributes b/.gitattributes
index 2f108b8..061ff59 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,7 +7,6 @@
 *.sh text eol=crlf
 *.pl text eol=crlf
 *.json text eol=crlf
-*.properties text eol=crlf
 *.xml text eol=crlf
 *.xsd text eol=crlf
 *.txt text eol=crlf

diff --git a/pom.xml b/pom.xml
index a70eb69..68bb9c5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
                <maven.compiler.source>1.8</maven.compiler.source>
                <module.ajsc.namespace.name>ActiveAndAvailableInventory-CloudNetwork</module.ajsc.namespace.name>
                <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
+               <nexusproxy>https://nexus.openecomp.org</nexusproxy>
         <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
 
                <!-- This will be the Absolute Root of the Project and should contain NO 
@@ -86,8 +87,13 @@
               <repository>
                          <id>ecomp-releases</id>
                           <name>ECOMP Release Repository</name>
-                         <url>https://nexus.openecomp.org/content/repositories</url>
+                         <url>${nexusproxy}/content/repositories/releases/</url>
                   </repository>
+               <repository>
+                   <id>ecomp-staging</id>
+                   <name>ECOMP Staging Repository</name>
+                   <url>${nexusproxy}/content/repositories/staging/</url>
+               </repository>
                   <repository>
                          <id>ecomp-snapshots</id>
                           <name>ECOMP Snapshot Repository</name>
@@ -352,6 +358,17 @@
                        </execution>
                        </executions>
                </plugin>        
+               <plugin>
+                   <groupId>org.sonatype.plugins</groupId>
+                   <artifactId>nexus-staging-maven-plugin</artifactId>
+                   <version>1.6.7</version>
+                   <extensions>true</extensions>
+                   <configuration>
+                       <nexusUrl>${nexusproxy}</nexusUrl>
+                       <stagingProfileId>176c31dfe190a</stagingProfileId>
+                       <serverId>ecomp-staging</serverId>
+                   </configuration>
+               </plugin>
        </plugins>
 </build>
 

diff --git a/version.properties b/version.properties
index 18b2af6..f016a54 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,14 +3,13 @@
 # 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
  
-major_version=1702
+major_version=1
 minor_version=0
 load_number=0
-release_revision=0
 
 base_version=${major_version}.${minor_version}.${load_number}
 
 # Release must be completed with GIT information # in Jenkins
-release_version=${base_version}-${release_revision}
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT