Add odl-jersey-2 feature

This adds an upgraded version of jersey, so we do not end up
packaging it multiple times by downstreams.

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index b518e22c4ead8cd5ec93a8125e40608f06d874f3..4d3bb122fcece51a1d3c037cd48078f760fd8d28 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -101,6 +101,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-jersey-2</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/features/odl-jersey-2/pom.xml b/features/odl-jersey-2/pom.xml
new file mode 100644 (file)
index 0000000..e09dbcc
--- /dev/null
+++ b/features/odl-jersey-2/pom.xml
@@ -0,0 +1,67 @@
+<?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-jersey-2</artifactId>
+    <version>4.0.3-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Jersey 2.x</name>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-javassist-3</artifactId>
+            <classifier>features</classifier>
+            <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-ws-rs-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

diff --git a/features/odl-jersey-2/src/main/history/dependencies.xml b/features/odl-jersey-2/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..07924f8
--- /dev/null
+++ b/features/odl-jersey-2/src/main/history/dependencies.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-jersey-2">
+    <feature version="0.0.0">
+        <feature>odl-javassist-3</feature>
+        <feature>odl-servlet-api</feature>
+        <feature>odl-ws-rs-api</feature>
+        <bundle>mvn:javax.annotation/javax.annotation-api/1.2</bundle>
+        <bundle>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
+        <bundle>mvn:org.glassfish.hk2.external/aopalliance-repackaged/2.5.0-b32</bundle>
+        <bundle>mvn:org.glassfish.hk2.external/javax.inject/2.5.0-b32</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-api/2.5.0-b32</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-locator/2.5.0-b32</bundle>
+        <bundle>mvn:org.glassfish.hk2/hk2-utils/2.5.0-b32</bundle>
+        <bundle>mvn:org.glassfish.hk2/osgi-resource-locator/1.0.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.bundles.repackaged/jersey-guava/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet-core/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.containers/jersey-container-servlet/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-common/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.core/jersey-server/2.25.1</bundle>
+        <bundle>mvn:org.glassfish.jersey.media/jersey-media-jaxb/2.25.1</bundle>
+    </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index acd4dfe005dacc5f14ff23625e4d72bc57c399b5..92ba92b4d464fc85f36f300ce7bcdeb066186251 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -58,6 +58,7 @@
         <module>odl-jackson-2.9</module>
         <module>odl-javassist-3</module>
         <module>odl-jersey-1</module>
+        <module>odl-jersey-2</module>
         <module>odl-jung-2.1</module>
         <module>odl-lmax-3</module>
         <module>odl-netty-4</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 6dd8abf2c01c6f0ed259b66dde0fb13d9cd31bf3..d8bd644e7137eac702eb2b38014033c7aeec1c0c 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -177,6 +177,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-jersey-2</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-jung-2.1</artifactId>