summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-13 10:55:58 -0400
committerDan Timoney <dtimoney@att.com>2017-09-13 11:32:26 -0400
commit6f6fee4b054ccc25968d6cc2c1dc5864a9aa4d06 (patch)
tree210755b5a9d657e8177fd72df870e9c1380e09bb
parent3e04e2088383dbc0b0235db68c19dc21734721d9 (diff)
Version 0.0.1-SNAPSHOT should use odlparent
Last patch inadvertantly did not update version of odlparent-carbon-sr1 pom.xml, so version 0.0.1-SNAPSHOT was updated to use oparent. This change rolls that change back so that 0.0.1-SNAPSHOT can be used to back out oparent change if it has problems. Issue-ID: CCSDK-43 Change-Id: If3a57b8f127a3fb0f44429b6e3f1a4dd72f25f69 Signed-off-by: Dan Timoney <dtimoney@att.com>
-rwxr-xr-xodlparent-carbon-sr1/pom.xml12
-rwxr-xr-xpom.xml2
-rw-r--r--version.properties2
3 files changed, 8 insertions, 8 deletions
diff --git a/odlparent-carbon-sr1/pom.xml b/odlparent-carbon-sr1/pom.xml
index 7a3fd8f0..bfd505e2 100755
--- a/odlparent-carbon-sr1/pom.xml
+++ b/odlparent-carbon-sr1/pom.xml
@@ -2,12 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent-odlparent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath />
- </parent>
+ <parent>
+ <groupId>org.opendaylight.odlparent</groupId>
+ <artifactId>odlparent</artifactId>
+ <version>1.8.1-Carbon</version>
+ <relativePath />
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
diff --git a/pom.xml b/pom.xml
index 18dcc681..a029ba7e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<packaging>pom</packaging>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>parent</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
<name>ccsdk-parent</name>
<url>http://wiki.onap.org</url>
diff --git a/version.properties b/version.properties
index e46107d6..287781ba 100644
--- a/version.properties
+++ b/version.properties
@@ -6,7 +6,7 @@
release_name=0
sprint_number=0
-feature_revision=2
+feature_revision=1
base_version=${release_name}.${sprint_number}.${feature_revision}