From 1e3fada75a8990292c71878c13d9f8dd5a7c60f8 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 8 Jan 2019 12:39:26 -0500
Subject: Prepare for release build

Prepare for release of early ODL-Oxygen based CCSDK Dublin

Change-Id: I2ea09c398025c9578a2da8ff32360be9672292c7
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 .../features/ccsdk-restconf-client/pom.xml         | 117 ++++++++++-----------
 .../features/features-restconf-client/pom.xml      |  46 ++++----
 restconf-client/features/pom.xml                   |   2 +-
 restconf-client/installer/pom.xml                  |   5 +-
 restconf-client/pom.xml                            |   2 +-
 restconf-client/provider/pom.xml                   |   6 +-
 6 files changed, 90 insertions(+), 88 deletions(-)

(limited to 'restconf-client')

diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml
index 82eba3bd1..97f36121e 100644
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ b/restconf-client/features/ccsdk-restconf-client/pom.xml
@@ -1,61 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>single-feature-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.plugins</groupId>
-	<artifactId>ccsdk-restconf-client</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
-	<packaging>feature</packaging>
-
-	<properties>
-		<skip.karaf.featureTest>true</skip.karaf.featureTest>
-	</properties>
-
-	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
-
-
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.opendaylight.mdsal.model</groupId>
-				<artifactId>mdsal-model-artifacts</artifactId>
-				<version>${odl.mdsal.model.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.opendaylight.controller</groupId>
-				<artifactId>mdsal-artifacts</artifactId>
-				<version>${odl.mdsal.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>ccsdk-sli</artifactId>
-			<version>${ccsdk.sli.core.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>restconf-client-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-	</dependencies>
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.onap.ccsdk.sli.plugins</groupId>
+    <artifactId>ccsdk-restconf-client</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <properties>
+        <skip.karaf.featureTest>true</skip.karaf.featureTest>
+        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
+    </properties>
+
+    <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
+
+
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>${odl.mdsal.model.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${odl.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>restconf-client-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/restconf-client/features/features-restconf-client/pom.xml b/restconf-client/features/features-restconf-client/pom.xml
index 910e86574..32c7feb1b 100644
--- a/restconf-client/features/features-restconf-client/pom.xml
+++ b/restconf-client/features/features-restconf-client/pom.xml
@@ -1,29 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>feature-repo-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>feature-repo-parent</artifactId>
+        <version>1.2.0</version>
+        <relativePath/>
+    </parent>
 
-	<groupId>org.onap.ccsdk.sli.plugins</groupId>
-	<artifactId>features-restconf-client</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
-	<packaging>feature</packaging>
+    <groupId>org.onap.ccsdk.sli.plugins</groupId>
+    <artifactId>features-restconf-client</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
 
-	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
+    <name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>ccsdk-restconf-client</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
+    <properties>
+        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
+    </properties>
 
-	</dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ccsdk-restconf-client</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+    </dependencies>
 </project>
diff --git a/restconf-client/features/pom.xml b/restconf-client/features/pom.xml
index df2abb123..e0595c1fc 100755
--- a/restconf-client/features/pom.xml
+++ b/restconf-client/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml
index 23306c7cd..cbf003d23 100755
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index 4a2609a9b..1097d721e 100755
--- a/restconf-client/pom.xml
+++ b/restconf-client/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index 2618b5cca..78bbc1693 100755
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
@@ -19,6 +18,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
     </properties>
 
     <dependencies>
-- 
cgit 1.2.3-korg