Add odl-gson feature

At least yangtools and infrautils are installing the gson bundle
separately. Introduce a common feature to host it.

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

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 07bebe3853a52d983e66ad85f0428435171650fa..9d9bc8ba4888b09bd7137ccc8df382dda067d28f 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -61,6 +61,13 @@
             <type>xml</type>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-gson</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-guava</artifactId>

diff --git a/features/odl-gson/pom.xml b/features/odl-gson/pom.xml
new file mode 100644 (file)
index 0000000..f12cc0c
--- /dev/null
+++ b/features/odl-gson/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-gson</artifactId>
+    <version>4.0.3-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: GSON</name>
+
+    <properties>
+        <checkDependencyChange>true</checkDependencyChange>
+        <failOnDependencyChange>true</failOnDependencyChange>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-gson/src/main/history/dependencies.xml b/features/odl-gson/src/main/history/dependencies.xml
new file mode 100644 (file)
index 0000000..1ee6d1e
--- /dev/null
+++ b/features/odl-gson/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-gson">
+    <feature version="0.0.0">
+        <bundle>mvn:com.google.code.gson/gson/2.8.5</bundle>
+    </feature>
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index ad677411a2ee376c65d090da0f1977a4be8ecdd2..dc3d11ed42261993dbf8f1711b07850e71fa9682 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -52,6 +52,7 @@
         <module>odl-apache-commons-net</module>
         <module>odl-apache-commons-text</module>
         <module>odl-apache-sshd</module>
+        <module>odl-gson</module>
         <module>odl-guava</module>
         <module>odl-guava-25</module>
         <module>odl-jackson-2.9</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index d92a9262d400aa9f7913c4097abd6c94eeac5c73..e6c0197af17cedf8d2992093379e711453cf285a 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -135,6 +135,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.odlparent</groupId>
+                <artifactId>odl-gson</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-guava</artifactId>