Add odl-servlet-api feature

javax.servlet:javax.servlet-api is being packaged by multiple
downstream features: infrautils, controller, aaa. Provide a common
packaging of this bundle.

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 576c5279a9ef6558726271af1e2e5c32b6f0de5e..b518e22c4ead8cd5ec93a8125e40608f06d874f3 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -142,6 +142,13 @@
             <type>xml</type>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-servlet-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-stax2-api</artifactId>

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

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

diff --git a/features/pom.xml b/features/pom.xml
index bbcd652a27113ffea6f8517d81adb055f513077c..acd4dfe005dacc5f14ff23625e4d72bc57c399b5 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-servlet-api</module>
         <module>odl-stax2-api</module>
         <module>odl-ws-rs-api</module>
 

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 458a681a5ed7f5b594d8fd9ef39f3698da1b252d..6dd8abf2c01c6f0ed259b66dde0fb13d9cd31bf3 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -235,6 +235,14 @@
                 <type>xml</type>
             </dependency>
 
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-servlet-api</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-stax2-api</artifactId>