From 4b233b132f92f47e2b0e0fea6ff7d9282273f5a1 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 16 Mar 2019 01:26:22 +0100
Subject: [PATCH] Promote yang-xpath to stable features

yang-xpath-* is ready to be promoted, this patch integrates
it into odl-yangtools-xpath and defined odl-yangtools-xpath-api

JIRA: YANGTOOLS-966
Change-Id: Iefc0343bbdd52892769422900465b7c6565fca47
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                             | 23 +++-----
 .../features-yangtools-experimental/pom.xml   | 12 ----
 features/features-yangtools/pom.xml           |  6 ++
 features/odl-yangtools-exp-xpath-impl/pom.xml | 55 -------------------
 .../src/main/feature/feature.xml              |  6 --
 .../pom.xml                                   |  4 +-
 features/odl-yangtools-xpath/pom.xml          | 16 ++++++
 features/pom.xml                              |  3 +-
 yang/yang-xpath-api/pom.xml                   |  2 +-
 yang/yang-xpath-impl/pom.xml                  |  2 +-
 10 files changed, 35 insertions(+), 94 deletions(-)
 delete mode 100644 features/odl-yangtools-exp-xpath-impl/pom.xml
 delete mode 100644 features/odl-yangtools-exp-xpath-impl/src/main/feature/feature.xml
 rename features/{odl-yangtools-exp-xpath-api => odl-yangtools-xpath-api}/pom.xml (94%)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9b5176f513..caf2f3ca4e 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -210,12 +210,12 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-xpath-api</artifactId>
-                <version>0.3.0-SNAPSHOT</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-xpath-impl</artifactId>
-                <version>0.3.0-SNAPSHOT</version>
+                <version>1.0.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -313,28 +313,21 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>odl-yangtools-xpath</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
+                <artifactId>odl-yangtools-xpath-api</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-
-            <!-- Experimental features -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>odl-yangtools-exp-xpath-api</artifactId>
-                <version>0.3.0-SNAPSHOT</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>odl-yangtools-exp-xpath-impl</artifactId>
-                <version>0.3.0-SNAPSHOT</version>
+                <artifactId>odl-yangtools-xpath</artifactId>
+                <version>3.0.0-SNAPSHOT</version>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- Experimental features -->
+
             <!-- Documentation -->
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index b2ee4f9cf5..4b61bcd79d 100644
--- a/features/features-yangtools-experimental/pom.xml
+++ b/features/features-yangtools-experimental/pom.xml
@@ -42,17 +42,5 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-exp-xpath-api</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-exp-xpath-impl</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
     </dependencies>
 </project>
diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index 5f5fd8c28c..3d75dcc8af 100644
--- a/features/features-yangtools/pom.xml
+++ b/features/features-yangtools/pom.xml
@@ -84,6 +84,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-xpath-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-xpath</artifactId>
diff --git a/features/odl-yangtools-exp-xpath-impl/pom.xml b/features/odl-yangtools-exp-xpath-impl/pom.xml
deleted file mode 100644
index 80624b656f..0000000000
--- a/features/odl-yangtools-exp-xpath-impl/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016 Red Hat, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<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.opendaylight.odlparent</groupId>
-        <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.yangtools</groupId>
-    <artifactId>odl-yangtools-exp-xpath-impl</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-    <name>OpenDaylight :: Yangtools :: Experimental :: XPath API implementation</name>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>3.0.0-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-antlr4</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>odl-yangtools-exp-xpath-api</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-xpath-impl</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/features/odl-yangtools-exp-xpath-impl/src/main/feature/feature.xml b/features/odl-yangtools-exp-xpath-impl/src/main/feature/feature.xml
deleted file mode 100644
index b99ab09134..0000000000
--- a/features/odl-yangtools-exp-xpath-impl/src/main/feature/feature.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-exp-xpath-impl">
-    <feature name="odl-yangtools-exp-xpath-impl">
-        <feature version="[4.0.8,5)">odl-antlr4</feature>
-    </feature>
-</features>
diff --git a/features/odl-yangtools-exp-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
similarity index 94%
rename from features/odl-yangtools-exp-xpath-api/pom.xml
rename to features/odl-yangtools-xpath-api/pom.xml
index 9e489eda06..2ccdcf1bd3 100644
--- a/features/odl-yangtools-exp-xpath-api/pom.xml
+++ b/features/odl-yangtools-xpath-api/pom.xml
@@ -17,8 +17,8 @@
     </parent>
 
     <groupId>org.opendaylight.yangtools</groupId>
-    <artifactId>odl-yangtools-exp-xpath-api</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <artifactId>odl-yangtools-xpath-api</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Experimental :: XPath API</name>
 
diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 67cef87314..00659e5f35 100644
--- a/features/odl-yangtools-xpath/pom.xml
+++ b/features/odl-yangtools-xpath/pom.xml
@@ -36,12 +36,28 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-antlr4</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-data-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-xpath-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-xpath-impl</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-jaxen</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index a1dbcac705..5087a96cd2 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -32,14 +32,13 @@
         <module>odl-yangtools-parser-api</module>
         <module>odl-yangtools-parser</module>
         <module>odl-yangtools-util</module>
+        <module>odl-yangtools-xpath-api</module>
         <module>odl-yangtools-xpath</module>
 
         <!-- Stable feature repository -->
         <module>features-yangtools</module>
 
         <!-- Experimental features -->
-        <module>odl-yangtools-exp-xpath-api</module>
-        <module>odl-yangtools-exp-xpath-impl</module>
 
         <!-- Experimental feature repostitory -->
         <module>features-yangtools-experimental</module>
diff --git a/yang/yang-xpath-api/pom.xml b/yang/yang-xpath-api/pom.xml
index 03b1528f87..0935a1dcef 100644
--- a/yang/yang-xpath-api/pom.xml
+++ b/yang/yang-xpath-api/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>yang-xpath-api</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
     <description>YANG XPath ${project.artifactId}</description>
diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index e9aded9ba4..bad31c7f8d 100644
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <artifactId>yang-xpath-impl</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
     <description>YANG XPath parser</description>
-- 
2.36.6