Remove akka/leveldb feature 50/87550/5
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 10 Feb 2020 22:06:50 +0000 (23:06 +0100)
committerStephen Kitt <skitt@redhat.com>
Tue, 11 Feb 2020 09:15:17 +0000 (10:15 +0100)
This removes levedb support, as it is deemed experimental by
upstream and is supported by a binary we do not have sources to.

JIRA: ODLPARENT-213
Change-Id: If0d333dbbce3e51e79669631d9b4445d531254fd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
15 files changed:
features/features-odlparent/pom.xml
features/odl-akka-all/pom.xml
features/odl-akka-leveldb-0.10/pom.xml [deleted file]
features/odl-akka-leveldb-0.10/src/main/history/dependencies.xml [deleted file]
features/odl-akka-leveldb-0.7/pom.xml [deleted file]
features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml [deleted file]
features/odl-akka-persistence-2.5/pom.xml
features/odl-akka-persistence-2.5/src/main/history/dependencies.xml
features/pom.xml
odlparent-artifacts/pom.xml
pom.xml
third-party/leveldbjni-all/leveldbjni-all-1.8-odl.jar [deleted file]
third-party/leveldbjni-all/pom.xml [deleted file]
third-party/leveldbjni-all/src/main/java/org/fusesource/leveldbjni/All.java [deleted file]
third-party/pom.xml [deleted file]

index f0b60d8539995e620554c0875e72a550aa3077ee..b49d68d47fd0951dc91ba656512ee9abd3ca22ce 100644 (file)
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-leveldb-0.10</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-akka-persistence-2.5</artifactId>
index ecd73dd93837e61173dad6571a4f94c2343f00ff..33c73f8e30cbb99c30e3c503c905ba490ed42346 100644 (file)
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-leveldb-0.10</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-akka-persistence-2.5</artifactId>
diff --git a/features/odl-akka-leveldb-0.10/pom.xml b/features/odl-akka-leveldb-0.10/pom.xml
deleted file mode 100644 (file)
index 6bb0d22..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2017 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>7.0.0-SNAPSHOT</version>
-        <relativePath>../../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-akka-leveldb-0.10</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>LevelDB 0.10</name>
-
-    <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>org.iq80.leveldb</groupId>
-            <artifactId>leveldb</artifactId>
-            <version>0.10</version>
-            <exclusions>
-                <exclusion>
-                    <!-- To avoid classpath duplicates, because leveldbjni-all shades a (not bit identical version of) the 13 API classes in org.iq80.leveldb -->
-                    <groupId>org.iq80.leveldb</groupId>
-                    <artifactId>leveldb-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>leveldbjni-all</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.karaf.tooling</groupId>
-                <artifactId>karaf-maven-plugin</artifactId>
-                <configuration>
-                    <dependencyFeatures>
-                        <dependencyFeature>odl-guava-23</dependencyFeature>
-                    </dependencyFeatures>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/features/odl-akka-leveldb-0.10/src/main/history/dependencies.xml b/features/odl-akka-leveldb-0.10/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index f3cd7d7..0000000
+++ /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-akka-leveldb-0.10">
-    <feature version="0.0.0">
-        <feature>odl-guava</feature>
-        <feature>wrap</feature>
-        <bundle>mvn:org.opendaylight.odlparent/leveldbjni-all/${project.version}</bundle>
-        <bundle>wrap:mvn:org.iq80.leveldb/leveldb/0.10</bundle>
-    </feature>
-</features>
diff --git a/features/odl-akka-leveldb-0.7/pom.xml b/features/odl-akka-leveldb-0.7/pom.xml
deleted file mode 100644 (file)
index ddf1c24..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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>7.0.0-SNAPSHOT</version>
-        <relativePath>../../single-feature-parent</relativePath>
-    </parent>
-
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-akka-leveldb-0.7</artifactId>
-    <version>7.0.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>LevelDB 0.7</name>
-
-    <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>org.iq80.leveldb</groupId>
-            <artifactId>leveldb</artifactId>
-            <version>0.7</version>
-            <exclusions>
-              <exclusion>
-                <!-- To avoid classpath duplicates, because leveldbjni-all shades a (not bit identical version of) the 13 API classes in org.iq80.leveldb -->
-                <groupId>org.iq80.leveldb</groupId>
-                <artifactId>leveldb-api</artifactId>
-              </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>leveldbjni-all</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml b/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
deleted file mode 100644 (file)
index 9f80dbe..0000000
+++ /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-akka-leveldb-0.7">
-    <feature version="0.0.0">
-        <feature>odl-guava</feature>
-        <feature>wrap</feature>
-        <bundle>mvn:org.opendaylight.odlparent/leveldbjni-all/${project.version}</bundle>
-        <bundle>wrap:mvn:org.iq80.leveldb/leveldb/0.7</bundle>
-    </feature>
-</features>
index edacb2119df9a5b6a96f89df2cdf8791e42ee363..e8b3b7c1a7e660e15e67840fe6770aaaddeb2b87 100644 (file)
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-akka-leveldb-0.10</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-akka-system-2.5</artifactId>
index a2b797e5bba8e5e69933c79e94046a40a1681701..f42aaa7544c7c2da0455c70657a2279b84bc67b5 100644 (file)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-akka-persistence-2.5">
     <feature version="0.0.0">
-        <feature>odl-akka-leveldb-0.10</feature>
         <feature>odl-akka-system-2.5</feature>
         <bundle>mvn:com.typesafe.akka/akka-persistence_2.12/2.5.29</bundle>
         <bundle>mvn:com.typesafe.akka/akka-protobuf_2.12/2.5.29</bundle>
index ce4dfcb33bce5ce21fab10d6451248161acb6197..a52815c4b826ed755b51347c3534eb01673cdd5c 100644 (file)
@@ -38,8 +38,6 @@
         <module>features-odlparent</module>
         <module>odl-akka-all</module>
         <module>odl-akka-clustering-2.5</module>
-        <module>odl-akka-leveldb-0.7</module>
-        <module>odl-akka-leveldb-0.10</module>
         <module>odl-akka-persistence-2.5</module>
         <module>odl-akka-scala-2.12</module>
         <module>odl-akka-system-2.5</module>
index da939ad43e257f483e896a9fb74867a57e62d885..fe443b71f358a5f2123bdbecfdda1835b91ea473 100644 (file)
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- Legacy leveldbjni-all hack -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>leveldbjni-all</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>features-odlparent</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-akka-leveldb-0.7</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-akka-leveldb-0.10</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odl-akka-persistence-2.5</artifactId>
diff --git a/pom.xml b/pom.xml
index ea49b3cf241a80349dd1b4d98a2bad6d9b78b7c5..ace1061953e966cbc0a03a6740007cb578001405 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -71,9 +71,6 @@
         <module>odlparent-bundle-check</module>
         <module>odlparent-dependency-check</module>
         <module>tests</module>
-
-        <!-- Third-party stuff -->
-        <module>third-party</module>
     </modules>
 
     <profiles>
diff --git a/third-party/leveldbjni-all/leveldbjni-all-1.8-odl.jar b/third-party/leveldbjni-all/leveldbjni-all-1.8-odl.jar
deleted file mode 100644 (file)
index 64ca3f1..0000000
Binary files a/third-party/leveldbjni-all/leveldbjni-all-1.8-odl.jar and /dev/null differ
diff --git a/third-party/leveldbjni-all/pom.xml b/third-party/leveldbjni-all/pom.xml
deleted file mode 100644 (file)
index 32d02dc..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
- Copyright (c) 2019 PANTHEON.tech. 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>odlparent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../../odlparent</relativePath>
-    </parent>
-
-    <artifactId>leveldbjni-all</artifactId>
-    <name>ODL :: odlparent :: ${project.artifactId}</name>
-    <packaging>jar</packaging>
-
-    <properties>
-        <!-- Repackaged third-party code, implies questionable code quality -->
-        <odlparent.checkstyle.skip>true</odlparent.checkstyle.skip>
-        <odlparent.modernizer.skip>true</odlparent.modernizer.skip>
-        <odlparent.spotbugs.skip>true</odlparent.spotbugs.skip>
-    </properties>
-
-    <build>
-        <plugins>
-            <!-- We do not want to compile anything -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-compile</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Third-party code: disable license check -->
-            <plugin>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>check-license</id>
-                        <configuration>
-                            <excludes>
-                                org/fusesource/leveldbjni/All.java
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-jar</id>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <!--
-                                    This jar has been manually seeded a long time ago and is also available here:
-                                    https://nexus.opendaylight.org/service/local/repositories/thirdparty/content/org/fusesource/leveldbjni/leveldbjni-all/1.8-odl/leveldbjni-all-1.8-odl.jar
-                                -->
-                                <unjar src="${project.basedir}/leveldbjni-all-1.8-odl.jar" dest="${project.build.outputDirectory}"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
-                            <Bundle-SymbolicName>org.opendaylight.odlparent.leveldbjni-all</Bundle-SymbolicName>
-                            <Bundle-Vendor>OpenDaylight</Bundle-Vendor>
-                            <Bundle-Version>1.8.0</Bundle-Version>
-                            <Implementation-Title>LevelDB JNI</Implementation-Title>
-                            <Implementation-Version>1.8-odl</Implementation-Version>
-                            <Bundle-License>http://www.opensource.org/licenses/BSD-3-Clause</Bundle-License>
-                            <Bundle-Name>leveldbjni-all</Bundle-Name>
-                            <Bundle-NativeCode>
-                                META-INF/native/windows32/leveldbjni.dll;osname=Win32;processor=x86,META-INF/native/windows64/leveldbjni.dll;osname=Win32;processor=x86-64,META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86,META-INF/native/osx/libleveldbjni.jnilib;osname=macosx;processor=x86-64,META-INF/native/linux32/libleveldbjni.so;osname=Linux;processor=x86,META-INF/native/linux64/libleveldbjni.so;osname=Linux;processor=x86-64,META-INF/native/sunos64/amd64/libleveldbjni.so;osname=SunOS;processor=x86-64,META-INF/native/sunos64/sparcv9/libleveldbjni.so;osname=SunOS;processor=sparcv9
-                            </Bundle-NativeCode>
-                            <Embed-Dependency>*;groupId=org.fusesource.leveldbjni;inline=META-INF/native/*,</Embed-Dependency>
-                            <Embed-Transitive>true</Embed-Transitive>
-                            <Export-Package>org.fusesource.leveldbjni;uses:="org.iq80.leveldb";version="1.8",org.iq80.leveldb;version="0.6"</Export-Package>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</url>
-    </scm>
-</project>
diff --git a/third-party/leveldbjni-all/src/main/java/org/fusesource/leveldbjni/All.java b/third-party/leveldbjni-all/src/main/java/org/fusesource/leveldbjni/All.java
deleted file mode 100644 (file)
index a2ca0c7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.fusesource.leveldbjni;
-
-public class All {
-}
\ No newline at end of file
diff --git a/third-party/pom.xml b/third-party/pom.xml
deleted file mode 100644 (file)
index 77f45f9..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
- Copyright (c) 2019 PANTHEON.tech, 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>odlparent-lite</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-        <relativePath>../odlparent-lite</relativePath>
-    </parent>
-
-    <artifactId>third-party-aggregator</artifactId>
-    <name>ODL :: odlparent :: ${project.artifactId}</name>
-    <packaging>pom</packaging>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/odlparent.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</url>
-    </scm>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <modules>
-        <module>leveldbjni-all</module>
-    </modules>
-</project>