Convert mdsal-common-api to bnd-parent

Introduce a bnd-parent, which does not use maven-bundle-plugin, and
convert mdsal-common-api to use it.

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

diff --git a/bnd-parent/pom.xml b/bnd-parent/pom.xml
new file mode 100644 (file)
index 0000000..ad961d9
--- /dev/null
+++ b/bnd-parent/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2024 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.yangtools</groupId>
+        <artifactId>bnd-parent</artifactId>
+        <version>13.0.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>bnd-parent</artifactId>
+    <version>13.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <description>Bundle parent (bnd-based)</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>13.0.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>1.14.11</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/display/ODL/MD-SAL</url>
+    </scm>
+</project>

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index 6af795f2cc31e3e07a51e3aca929d2c3b5097d3c..5035d11215547f9194b700c96d48c4b2007648a1 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -28,16 +28,11 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>bnd-parent</artifactId>
                 <version>13.0.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>net.bytebuddy</groupId>
-                <artifactId>byte-buddy</artifactId>
-                <version>1.14.11</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml
index 116acdda8c629fea2b917da65abada4b49aae281..5e888725d1ddb6de682acabfb6818439383139bc 100644 (file)
--- a/common/mdsal-common-api/pom.xml
+++ b/common/mdsal-common-api/pom.xml
@@ -12,13 +12,18 @@
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>bundle-parent</artifactId>
+        <artifactId>bnd-parent</artifactId>
         <version>13.0.0-SNAPSHOT</version>
-        <relativePath>../../bundle-parent</relativePath>
+        <relativePath>../../bnd-parent</relativePath>
     </parent>
 
     <artifactId>mdsal-common-api</artifactId>
-    <packaging>bundle</packaging>
+    <packaging>jar</packaging>
+
+    <properties>
+        <!-- FIXME: fix these up and set maven.javadoc.failOnWarnings=true -->
+        <doclint>all,-missing</doclint>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -47,11 +52,4 @@
             <artifactId>mockito-configuration</artifactId>
         </dependency>
     </dependencies>
-
-    <scm>
-        <connection>scm:git:http://git.opendaylight.org/gerrit/mdsal.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
-        <tag>HEAD</tag>
-        <url>https://wiki.opendaylight.org/view/MD-SAL:Main</url>
-    </scm>
 </project>

diff --git a/common/mdsal-common-api/src/main/java/module-info.java b/common/mdsal-common-api/src/main/java/module-info.java
index 5aad096014dfc4bad395b894665b77acaf7c6f49..575934fe39e0f6f3cfa063018bc8f46dc4905529 100644 (file)
--- a/common/mdsal-common-api/src/main/java/module-info.java
+++ b/common/mdsal-common-api/src/main/java/module-info.java
@@ -14,4 +14,5 @@ module org.opendaylight.mdsal.common.api {
 
     // Annotations
     requires static transitive org.eclipse.jdt.annotation;
+    requires static org.osgi.annotation.bundle;
 }

diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/mdsal/common/api/package-info.java b/common/mdsal-common-api/src/main/java/org/opendaylight/mdsal/common/api/package-info.java
new file mode 100644 (file)
index 0000000..ef64dd9
--- /dev/null
+++ b/common/mdsal-common-api/src/main/java/org/opendaylight/mdsal/common/api/package-info.java
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 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
+ */
+/**
+ * Common MD-SAL concepts.
+ */
+@org.osgi.annotation.bundle.Export
+package org.opendaylight.mdsal.common.api;

diff --git a/pom.xml b/pom.xml
index 08903743990e07022e3ad336f2478f1e2267ac11..fc07e2db607b7432de5a691c6555d204ed2df9ec 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
 
     <modules>
         <module>artifacts</module>
+        <module>bnd-parent</module>
         <module>bundle-parent</module>
         <module>common</module>
         <module>docs</module>