Add leveldbjni-all repackaging

We are publishing all our artifacts to Maven Central, but this jar
has been seeded into our Nexus manually after upstream failed to
make a public release of the contribution for years.

This jar is not present in Central and hence most our features do
not work out of the box, as you still need to point to ODL Nexus
to get this one jar.

This patch rectifies that situation by re-packaging this jar in
org.opendaylight.odlparent namespace and referencing it in our
features.

JIRA: ODLPARENT-210
Change-Id: I16895d6e9e2572ab85db9c509e06306c7acc441d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/odl-akka-leveldb-0.10/pom.xml b/features/odl-akka-leveldb-0.10/pom.xml
index 85fc75229cd2091d09ff053900635b726c27a5bd..7ee7c9f7ad1fb5636ce0a39711da721d57011049 100644 (file)
--- a/features/odl-akka-leveldb-0.10/pom.xml
+++ b/features/odl-akka-leveldb-0.10/pom.xml
@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-guava</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -51,9 +50,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.fusesource.leveldbjni</groupId>
+            <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>leveldbjni-all</artifactId>
-            <version>1.8-odl</version>
         </dependency>
     </dependencies>
 

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
index 65bf7a678d1cd07367ad689b64eccc64a4dab400..f3cd7d7b618a1c78bce0e9144864864444f2ee82 100644 (file)
--- a/features/odl-akka-leveldb-0.10/src/main/history/dependencies.xml
+++ b/features/odl-akka-leveldb-0.10/src/main/history/dependencies.xml
@@ -3,7 +3,7 @@
     <feature version="0.0.0">
         <feature>odl-guava</feature>
         <feature>wrap</feature>
-        <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/1.8-odl</bundle>
+        <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
index 0045f6179194b4bad906c0dd34c47a16ab4a656d..0d9dc3832582f298cccbbe0cc26d60de0871a1ba 100644 (file)
--- a/features/odl-akka-leveldb-0.7/pom.xml
+++ b/features/odl-akka-leveldb-0.7/pom.xml
@@ -34,7 +34,6 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-guava</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -51,9 +50,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.fusesource.leveldbjni</groupId>
+            <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>leveldbjni-all</artifactId>
-            <version>1.8-odl</version>
         </dependency>
     </dependencies>
 

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
index 235c6a52aa2804c0929d465bcb2a93fb3281f593..9f80dbe80e04d2c0b91bf8ef76ae39d7fb4f2e66 100644 (file)
--- a/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
+++ b/features/odl-akka-leveldb-0.7/src/main/history/dependencies.xml
@@ -3,7 +3,7 @@
     <feature version="0.0.0">
         <feature>odl-guava</feature>
         <feature>wrap</feature>
-        <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/1.8-odl</bundle>
+        <bundle>mvn:org.opendaylight.odlparent/leveldbjni-all/${project.version}</bundle>
         <bundle>wrap:mvn:org.iq80.leveldb/leveldb/0.7</bundle>
     </feature>
 </features>

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index 6dc7c09e9b7e19360369a60edb237064e7230bc9..e8480dc9ab7feb47b785cea68d39f44aa0f8dc99 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -49,6 +49,13 @@
                 <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>

diff --git a/pom.xml b/pom.xml
index 41948062718bed38b4cca1488ea8cf3acab3d906..99d89991cb56963ec58e1565d0d202ceecf3e532 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,9 @@
         <!-- Self-tests -->
         <module>odlparent-bundle-check</module>
         <module>odlparent-dependency-check</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
new file mode 100644 (file)
index 0000000..64ca3f1
Binary files /dev/null and b/third-party/leveldbjni-all/leveldbjni-all-1.8-odl.jar differ

diff --git a/third-party/leveldbjni-all/pom.xml b/third-party/leveldbjni-all/pom.xml
new file mode 100644 (file)
index 0000000..a23539e
--- /dev/null
+++ b/third-party/leveldbjni-all/pom.xml
@@ -0,0 +1,77 @@
+<?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-lite</artifactId>
+        <version>6.0.1-SNAPSHOT</version>
+        <relativePath>../../odlparent-lite</relativePath>
+    </parent>
+
+    <artifactId>leveldbjni-all</artifactId>
+    <name>ODL :: odlparent :: ${project.artifactId}</name>
+    <packaging>jar</packaging>
+
+    <build>
+        <plugins>
+            <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/pom.xml b/third-party/pom.xml
new file mode 100644 (file)
index 0000000..f28e644
--- /dev/null
+++ b/third-party/pom.xml
@@ -0,0 +1,37 @@
+<?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>6.0.1-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>