From bafe8e8caa6a537f2ac1bda0a8ec2ef36a95e467 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dt5972@att.com>
Date: Sun, 29 Apr 2018 18:45:28 -0400
Subject: Roll versions step 2 : sli/core poms

Roll to next version for next release candidate.

Change-Id: I0a76316934afd79f4ecf3588453ed4d6e34fb615
Issue-ID: CCSDK-257
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---
 utils/features/features-util/pom.xml               |   4 +-
 utils/features/features3-util/pom.xml              | 141 ---------------------
 .../features3-util/src/main/resources/features.xml |  16 ---
 utils/features/pom.xml                             |   2 +-
 utils/features/sdnc-slicore-utils/pom.xml          |   4 +-
 utils/installer/pom.xml                            |   4 +-
 utils/pom.xml                                      |   4 +-
 utils/provider/pom.xml                             |   4 +-
 8 files changed, 11 insertions(+), 168 deletions(-)
 delete mode 100755 utils/features/features3-util/pom.xml
 delete mode 100755 utils/features/features3-util/src/main/resources/features.xml

(limited to 'utils')

diff --git a/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml
index 9a4cd43c..5df832c6 100644
--- a/utils/features/features-util/pom.xml
+++ b/utils/features/features-util/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>features-util</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
diff --git a/utils/features/features3-util/pom.xml b/utils/features/features3-util/pom.xml
deleted file mode 100755
index 5cc0d899..00000000
--- a/utils/features/features3-util/pom.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?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>
-		<artifactId>utils</artifactId>
-		<groupId>org.onap.ccsdk.sli.core</groupId>
-		<version>0.2.0-SNAPSHOT</version>
-	        <relativePath/>
-	</parent>
-	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>utils-features</artifactId>
-        <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
-	<name>DBLIB Adaptor - Features</name>
-
-	<packaging>jar</packaging>
-
-	<dependencies>
-
-
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.core</groupId>
-			<artifactId>utils-provider</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>${commons.lang.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.opendaylight.mdsal</groupId>
-			<artifactId>features-mdsal</artifactId>
-			<version>${odl.mdsal.features.version}</version>
-			<classifier>features</classifier>
-			<type>xml</type>
-
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-		    <groupId>org.apache.tomcat</groupId>
-		    <artifactId>tomcat-jdbc</artifactId>
-		    <version>${tomcat-jdbc.version}</version>
-		</dependency>
-
-		<!-- dependency for opendaylight-karaf-empty for use by testing -->
-		<dependency>
-			<groupId>org.opendaylight.odlparent</groupId>
-			<artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${odl.karaf.empty.distro.version}</version>
-			<type>zip</type>
-		</dependency>
-
-		<dependency>
-			<!-- Required for launching the feature tests -->
-			<groupId>org.opendaylight.odlparent</groupId>
-			<artifactId>features-test</artifactId>
-			<version>${odl.commons.opendaylight.version}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.opendaylight.yangtools</groupId>
-			<artifactId>features-yangtools</artifactId>
-			<version>${odl.yangtools.version}</version>
-			<classifier>features</classifier>
-			<type>xml</type>
-			<scope>runtime</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<resources>
-			<resource>
-				<filtering>true</filtering>
-				<directory>src/main/resources</directory>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>filter</id>
-						<goals>
-							<goal>resources</goal>
-						</goals>
-						<phase>generate-resources</phase>
-					</execution>
-				</executions>
-			</plugin>
-					<!-- launches the feature test, which validates that your karaf feature
-					can be installed inside of a karaf container. It doesn't validate that your
-					functionality works correctly, just that you have all of the dependent bundles
-					defined correctly.
-			<plugin>
-
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.16</version>
-				<configuration>
-					<systemPropertyVariables>
-						<karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
-						<karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-						<karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
-					</systemPropertyVariables>
-					<dependenciesToScan>
-						<dependency>org.opendaylight.yangtools:features-test</dependency>
-					</dependenciesToScan>
-				</configuration>
-			</plugin>
-			-->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-artifacts</id>
-						<goals>
-							<goal>attach-artifact</goal>
-						</goals>
-						<phase>package</phase>
-						<configuration>
-							<artifacts>
-								<artifact>
-									<file>${project.build.directory}/classes/${features.file}</file>
-									<type>xml</type>
-									<classifier>features</classifier>
-								</artifact>
-							</artifacts>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/utils/features/features3-util/src/main/resources/features.xml b/utils/features/features3-util/src/main/resources/features.xml
deleted file mode 100755
index 547832ba..00000000
--- a/utils/features/features3-util/src/main/resources/features.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="sdnc-slicore-utils-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
-
-
-    <feature name='sdnc-slicore-utils' description="sdnc-slicore-utils" version='${project.version}'>
-        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <bundle>mvn:org.onap.ccsdk.sli.core/utils-provider/${project.version}</bundle>
-    </feature>
-
-</features>
diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index 8bc1cd8a..382c5d5c 100755
--- a/utils/features/pom.xml
+++ b/utils/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/utils/features/sdnc-slicore-utils/pom.xml b/utils/features/sdnc-slicore-utils/pom.xml
index 85c81ff6..63f6c8e3 100644
--- a/utils/features/sdnc-slicore-utils/pom.xml
+++ b/utils/features/sdnc-slicore-utils/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>ccsdk-slicore-utils</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index c19ac8c6..b942e790 100755
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-installer</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
diff --git a/utils/pom.xml b/utils/pom.xml
index cd342f77..1c2e4f4a 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>utils</artifactId>
-   <version>0.2.1-SNAPSHOT</version>
+   <version>0.2.2-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: utils</name>
diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index 7a4e8c9e..ac55d0f6 100644
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>1.0.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-provider</artifactId>
-    <version>0.2.1-SNAPSHOT</version>
+    <version>0.2.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
-- 
cgit 1.2.3-korg