From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 22 Dec 2018 16:12:26 +0000 (+0100)
Subject: Use odl-{antlr4,gson,stax2-api}
X-Git-Tag: v2.1.6~1
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=5f68f7ab761019b6f9a65f87cbee0a0e555b4c83;p=yangtools.git

Use odl-{antlr4,gson,stax2-api}

odlparent-4.0.5 provides granular wrapper features for artifacts
we are using. Use those features instead of re-packaging those
artifacts.

Change-Id: If897d435a0724b4c5049179855b5ed755b953a4a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index 948951eeba..1b33814dd2 100644
--- a/features/odl-yangtools-codec/pom.xml
+++ b/features/odl-yangtools-codec/pom.xml
@@ -36,6 +36,18 @@
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-gson</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-stax2-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-data</artifactId>
diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml
new file mode 100644
index 0000000000..8f108bc4c2
--- /dev/null
+++ b/features/odl-yangtools-codec/src/main/feature/feature.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-triemap">
+    <feature name="odl-yangtools-codec">
+        <feature version="[4.0.5,5)">odl-gson</feature>
+        <feature version="[4.0.5,5)">odl-stax2-api</feature>
+    </feature>
+</features>
diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 63a166b3f7..6e28104955 100644
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -36,6 +36,12 @@
     </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>
diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml
new file mode 100644
index 0000000000..58e2f26753
--- /dev/null
+++ b/features/odl-yangtools-data/src/main/feature/feature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-triemap">
+    <feature name="odl-yangtools-data">
+        <feature version="[4.0.5,5)">odl-antlr4</feature>
+    </feature>
+</features>
diff --git a/features/odl-yangtools-exp-xpath-impl/pom.xml b/features/odl-yangtools-exp-xpath-impl/pom.xml
index b80abdf6b1..df616d4dfc 100644
--- a/features/odl-yangtools-exp-xpath-impl/pom.xml
+++ b/features/odl-yangtools-exp-xpath-impl/pom.xml
@@ -35,6 +35,12 @@
     </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>
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
new file mode 100644
index 0000000000..fd4ebc4c52
--- /dev/null
+++ b/features/odl-yangtools-exp-xpath-impl/src/main/feature/feature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-triemap">
+    <feature name="odl-yangtools-exp-xpath-impl">
+        <feature version="[4.0.5,5)">odl-antlr4</feature>
+    </feature>
+</features>
diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 19c23ef5e6..bd8fddfe25 100644
--- a/features/odl-yangtools-parser/pom.xml
+++ b/features/odl-yangtools-parser/pom.xml
@@ -36,6 +36,12 @@
     </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-parser-api</artifactId>
diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml
new file mode 100644
index 0000000000..273e2a3f0d
--- /dev/null
+++ b/features/odl-yangtools-parser/src/main/feature/feature.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-triemap">
+    <feature name="odl-yangtools-parser">
+        <feature version="[4.0.5,5)">odl-antlr4</feature>
+    </feature>
+</features>