Add odl-stax2-api feature

stax2-api.jar is used by both odl-jackson-2.9 and yangtools (without
an implementation). Package it in a common feature so it gets reused.

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 9d9bc8ba4888b09bd7137ccc8df382dda067d28f..952af33587a31ed2e3cb5abd34e609a910b40b79 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -141,5 +141,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-stax2-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-jackson-2.9/pom.xml b/features/odl-jackson-2.9/pom.xml
index 9afb9a0fd33839bac1bfd648dba5a5cdf5ba3b2e..4691dc2b5baf6037b927660158fbfe621cb9340a 100644 (file)
--- a/features/odl-jackson-2.9/pom.xml
+++ b/features/odl-jackson-2.9/pom.xml
@@ -31,6 +31,13 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-stax2-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>

diff --git a/features/odl-jackson-2.9/src/main/history/dependencies.xml b/features/odl-jackson-2.9/src/main/history/dependencies.xml
index 8fbfed56e442b94ab04d2694ee8e1ba9acccde06..6a2ca8576a78f69e82bf4df2d917b997429e85da 100644 (file)
--- a/features/odl-jackson-2.9/src/main/history/dependencies.xml
+++ b/features/odl-jackson-2.9/src/main/history/dependencies.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jackson-2.9">
     <feature version="0.0.0">
+        <feature>odl-stax2-api</feature>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.0</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.9.7</bundle>
         <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.9.7</bundle>
@@ -10,6 +11,5 @@
         <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.7</bundle>
         <bundle>mvn:com.fasterxml.woodstox/woodstox-core/5.0.3</bundle>
         <bundle>mvn:javax.ws.rs/javax.ws.rs-api/2.0.1</bundle>
-        <bundle>mvn:org.codehaus.woodstox/stax2-api/3.1.4</bundle>
     </feature>
 </features>

diff --git a/features/odl-stax2-api/pom.xml b/features/odl-stax2-api/pom.xml
new file mode 100644 (file)
index 0000000..ee27f2f
--- /dev/null
+++ b/features/odl-stax2-api/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 Pantheon Technologies, s.r.o. 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.3-SNAPSHOT</version>
+        <relativePath>../../single-feature-parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odl-stax2-api</artifactId>
+    <version>4.0.3-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: StAX2 API</name>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>stax2-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-stax2-api/src/main/history/dependencies.xml b/features/odl-stax2-api/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..d7df4aa
--- /dev/null
+++ b/features/odl-stax2-api/src/main/history/dependencies.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-stax2-api">
+    <feature version="0.0.0">
+        <bundle>mvn:org.codehaus.woodstox/stax2-api/3.1.4</bundle>
+    </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index dc3d11ed42261993dbf8f1711b07850e71fa9682..b99b8360b4bad8899a3b7c56c2fe478701bb3612 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -61,6 +61,7 @@
         <module>odl-jung-2.1</module>
         <module>odl-lmax-3</module>
         <module>odl-netty-4</module>
+        <module>odl-stax2-api</module>
 
         <!-- Test features -->
         <module>odl-bundle-test</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index e6c0197af17cedf8d2992093379e711453cf285a..8c284e597634426d62c1599654b5e60b7c0e7c9f 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -234,6 +234,14 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-stax2-api</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>