Add odl-ws-rs-api feature

javax.ws.rs/javax.ws.rs-api is being used by jackson-2.9, jersey2
as well as aaa APIs. Package it as a separate feature, so it can
be reused.

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 952af33587a31ed2e3cb5abd34e609a910b40b79..576c5279a9ef6558726271af1e2e5c32b6f0de5e 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -148,5 +148,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-ws-rs-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 4691dc2b5baf6037b927660158fbfe621cb9340a..64713db209dae30826ac87055eb5043e26dad8c6 100644 (file)
--- a/features/odl-jackson-2.9/pom.xml
+++ b/features/odl-jackson-2.9/pom.xml
@@ -37,6 +37,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-ws-rs-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>

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 6a2ca8576a78f69e82bf4df2d917b997429e85da..cce78c5097b9834cef6c66fa95f603f3ab709d79 100644 (file)
--- a/features/odl-jackson-2.9/src/main/history/dependencies.xml
+++ b/features/odl-jackson-2.9/src/main/history/dependencies.xml
@@ -2,6 +2,7 @@
 <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>
+        <feature>odl-ws-rs-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.jaxrs/jackson-jaxrs-json-provider/2.9.7</bundle>
         <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>
     </feature>
 </features>

diff --git a/features/odl-ws-rs-api/pom.xml b/features/odl-ws-rs-api/pom.xml
new file mode 100644 (file)
index 0000000..3d26143
--- /dev/null
+++ b/features/odl-ws-rs-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-ws-rs-api</artifactId>
+    <version>4.0.3-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Javax WS RS API</name>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-ws-rs-api/src/main/history/dependencies.xml b/features/odl-ws-rs-api/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..7d04e4d
--- /dev/null
+++ b/features/odl-ws-rs-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-ws-rs-api">
+    <feature version="0.0.0">
+        <bundle>mvn:javax.ws.rs/javax.ws.rs-api/2.0.1</bundle>
+    </feature>
+</features>

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

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