From f08e39c08a445a18d1e2b50df7e181c38b5aea78 Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Mon, 11 Jan 2021 09:39:59 +0100
Subject: Fix versions in BPGenerator

Maven staging job is failing because of common module version set
to 2.0.0-SNAPSHOT. During the build - mvn versions:set is used
which sets version according to version.properties, because common
has different version its version is not changed and it is
recognized as a SNAPSHOT dependency (which fails the jenkins
build).

Issue-ID: DCAEGEN2-2529
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Icffd3b128485a45b3fe7e19c5501eaa4a98fbcf8
---
 mod/bpgenerator/common/pom.xml          |  2 +-
 mod/bpgenerator/onap/pom.xml            |  2 +-
 mod/bpgenerator/onap/version.properties | 28 ----------------------------
 mod/bpgenerator/version.properties      |  2 +-
 4 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 mod/bpgenerator/onap/version.properties

(limited to 'mod')

diff --git a/mod/bpgenerator/common/pom.xml b/mod/bpgenerator/common/pom.xml
index cae390f..56985a9 100644
--- a/mod/bpgenerator/common/pom.xml
+++ b/mod/bpgenerator/common/pom.xml
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blueprint-generator-common</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Common</name>
diff --git a/mod/bpgenerator/onap/pom.xml b/mod/bpgenerator/onap/pom.xml
index 63390ca..8379952 100644
--- a/mod/bpgenerator/onap/pom.xml
+++ b/mod/bpgenerator/onap/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.onap.dcaegen2.platform.mod</groupId>
             <artifactId>blueprint-generator-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>1.7.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>
diff --git a/mod/bpgenerator/onap/version.properties b/mod/bpgenerator/onap/version.properties
deleted file mode 100644
index 8abc1d2..0000000
--- a/mod/bpgenerator/onap/version.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# /*
-#  * ============LICENSE_START=======================================================
-#  *  org.onap.dcae
-#  *  ================================================================================
-#  *  Copyright (c) 2020  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=========================================================
-#  */
-#
-#
-major=1
-minor=7
-patch=0
-base_version=${major}.${minor}.${patch}
-release_version=${base_version}
-snapshot_version=${base_version}-SNAPSHOT
diff --git a/mod/bpgenerator/version.properties b/mod/bpgenerator/version.properties
index 24828c2..cedaba1 100644
--- a/mod/bpgenerator/version.properties
+++ b/mod/bpgenerator/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=7
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg