Merge "Unit/SONAR/Checkstyle in ONAP-REST"

[policy/engine.git] / version.properties

diff --git a/version.properties b/version.properties
index 9a11e22..c447694 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,35 +1,33 @@
-###
-# ============LICENSE_START=======================================================
-# ECOMP Policy Engine
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
+#
+#============LICENSE_START==================================================
+#  ONAP Policy Engine
+#===========================================================================
+#  Copyright (C) 2017-2018 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
-# 
+#
+#         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=========================================================
-###
+#============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=1
-sprint_number=0
-feature_revision=0
-swm_revision=1
 
-base_version=${release_name}.${sprint_number}.${feature_revision}
+major=1
+minor=6
+patch=0
 
-# Release must be completed with svn revision # in Jenkins
-release_version=${base_version}-${swm_revision}
+base_version=${major}.${minor}.${patch}
+
+# Release must be completed with git revision # in Jenkins
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT