diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2017-02-17 11:29:43 -0500 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2017-02-17 11:30:02 -0500 |
commit | 9944937b56f62af260d10c0ef965bebd5a783dba (patch) | |
tree | 08e85a72bc2c7c1a25af8a98452f8d1aa7fec7d0 | |
parent | 40ce3fdf6c19a208656840d0604c73f0484a833a (diff) |
add staging and fix version
Change-Id: I2c12f6f9afc3bc6e41f887cc437cf819cbf93239
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r-- | pom.xml | 21 | ||||
-rw-r--r-- | version.properties | 36 |
2 files changed, 21 insertions, 36 deletions
@@ -84,17 +84,24 @@ <build> <plugins> <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> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <version>2.8</version> <!-- This version supports the "deployAtEnd" parameter --> + <configuration> + <skip /> + </configuration> </plugin> - <!-- - license plugin - Run - mvn clean - before running from the command line - mvn license:update-file-header - --> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> diff --git a/version.properties b/version.properties index 2c7aa961..51287873 100644 --- a/version.properties +++ b/version.properties @@ -1,35 +1,13 @@ -### -# ============LICENSE_START======================================================= -# ECOMP Policy Engine - Common Modules -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END========================================================= -### - -########################################################### # Versioning variables # 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=1610 -sprint_number=34 -feature_revision=11 -swm_revision=4 -base_version=${release_name}.${sprint_number}.${feature_revision} +major=1 +minor=0 +patch=0 + +base_version=${major}.${minor}.${patch} -# Release must be completed with svn revision # in Jenkins -release_version=${base_version}-${swm_revision} +# Release must be completed with git revision # in Jenkins +release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |