BUG-7446: introduce odl-guava-21 feature

This is a preparatory patch, bringing in 21-rc1 artifact. This
will be followed-up with a patch to switch the build-time version.

Change-Id: If1eebe54190cfd5a7f97937b0b6b0b7a9624c78b
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index b23c2b66b399111261d2d5693cfcd46f83f980f0..b9a21a9641bba28bd31654743c8dea4c6dd90ea9 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -39,6 +39,14 @@
             <type>xml</type>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-guava-21</artifactId>
+            <version>${project.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-lmax-3</artifactId>

diff --git a/features/odl-guava-21/pom.xml b/features/odl-guava-21/pom.xml
new file mode 100644 (file)
index 0000000..cce458d
--- /dev/null
+++ b/features/odl-guava-21/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016 Red Hat, Inc. 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>1.8.0-SNAPSHOT</version>
+        <relativePath>../../single-feature-parent</relativePath>
+    </parent>
+
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>odl-guava-21</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Guava 21</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0-rc1</version>
+        </dependency>
+    </dependencies>
+
+    <!--
+        Maven Site Configuration
+
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+
+</project>

diff --git a/features/pom.xml b/features/pom.xml
index 7492f1b72a13e45e246db6a2143bbc12a16befb9..b275eed332cb46be551e93774af78a544a5bb62b 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -37,6 +37,7 @@
         <!-- General features -->
         <module>features-odlparent</module>
         <module>odl-guava-18</module>
+        <module>odl-guava-21</module>
         <module>odl-lmax-3</module>
         <module>odl-netty-4</module>
         <module>odl-triemap-0.2</module>
@@ -58,4 +59,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>