Remove odl-caffeine-2

JCache (JSR-107) API is referenced as useless and Caffeine is doing
worse in the caching use cases that are being used downstream. Remove
this declaration and its integration. Downstreams can choose to package
it themselves.

Change-Id: I10fc615fef0240bc202f93ea7ac7953db2100272
See-also: https://github.com/google/guava/issues/2177
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index b49d68d47fd0951dc91ba656512ee9abd3ca22ce..de9febba4e606e2089de0dda58d93b3d350acf9c 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -94,13 +94,6 @@
             <type>xml</type>
         </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-caffeine-2</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-dropwizard-metrics</artifactId>

diff --git a/features/odl-caffeine-2/pom.xml b/features/odl-caffeine-2/pom.xml
deleted file mode 100644 (file)
index 57677cd..0000000
--- a/features/odl-caffeine-2/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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>7.0.0-SNAPSHOT</version>
-        <relativePath>../../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-caffeine-2</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>OpenDaylight :: Caffeine</name>
-    <description>Caffeine</description>
-
-    <properties>
-        <checkDependencyChange>true</checkDependencyChange>
-        <failOnDependencyChange>true</failOnDependencyChange>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/features/odl-caffeine-2/src/main/history/dependencies.xml b/features/odl-caffeine-2/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index 884ad4c..0000000
--- a/features/odl-caffeine-2/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-caffeine-2">
-    <feature version="0.0.0">
-        <feature>odl-guava</feature>
-        <feature>wrap</feature>
-        <bundle>mvn:com.github.ben-manes.caffeine/caffeine/2.7.0</bundle>
-        <bundle>mvn:com.github.ben-manes.caffeine/guava/2.7.0</bundle>
-    </feature>
-</features>

diff --git a/features/pom.xml b/features/pom.xml
index a52815c4b826ed755b51347c3534eb01673cdd5c..d69f8687fa1628911e77e26732674aad5d5c4d97 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -47,7 +47,6 @@
         <module>odl-apache-commons-net</module>
         <module>odl-apache-commons-text</module>
         <module>odl-apache-sshd</module>
-        <module>odl-caffeine-2</module>
         <module>odl-dropwizard-metrics</module>
         <module>odl-gson</module>
         <module>odl-guava</module>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index fe443b71f358a5f2123bdbecfdda1835b91ea473..85ec1a2a16be11247a1152ee4475db8727ad8488 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -126,13 +126,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-caffeine-2</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-dropwizard-metrics</artifactId>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index 8a2974eec2315709bc7915403ce98c5a4af67aaf..6a4ff61c2d746273885231d9e6997b361a578760 100644 (file)
--- a/odlparent-dependency-check/pom.xml
+++ b/odlparent-dependency-check/pom.xml
@@ -51,14 +51,6 @@
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>caffeine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.github.ben-manes.caffeine</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-annotations</artifactId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 6c621ab0a2ff212a7b8857ca5a32ea5f10136cd6..e31180fd70005466ecfd63b872d53f3e83cb2fb5 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -330,18 +330,6 @@
         </exclusions>
       </dependency>
 
-      <!-- Caffeine plus bridges to Guava and JCache -->
-      <dependency>
-        <groupId>com.github.ben-manes.caffeine</groupId>
-        <artifactId>caffeine</artifactId>
-        <version>2.7.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.github.ben-manes.caffeine</groupId>
-        <artifactId>guava</artifactId>
-        <version>2.7.0</version>
-      </dependency>
-
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>