From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 6 Nov 2020 16:15:21 +0000 (+0100)
Subject: Convert mdsal-common-api to a JPMS module
X-Git-Tag: v7.0.2~32
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7d6d3a325d2d9f4ad78d2bbe2ea29cb4b94753c1;hp=ac94e81de40c4cf03a25c63925d7a77b4f0dae90;p=mdsal.git

Convert mdsal-common-api to a JPMS module

This is a very simple artifact, convert it to a JPMS module.

JIRA: MDSAL-620
Change-Id: I20a73390bd4ccee8bfff74fe08a0be038ccea811
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml
index cc35f32f0a..d8bbcc0412 100644
--- a/common/mdsal-common-api/pom.xml
+++ b/common/mdsal-common-api/pom.xml
@@ -43,20 +43,6 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Automatic-Module-Name>org.opendaylight.mdsal.common.api</Automatic-Module-Name>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/mdsal.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
diff --git a/common/mdsal-common-api/src/main/java/module-info.java b/common/mdsal-common-api/src/main/java/module-info.java
new file mode 100644
index 0000000000..9fe628a099
--- /dev/null
+++ b/common/mdsal-common-api/src/main/java/module-info.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2020 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
+ */
+module org.opendaylight.mdsal.common.api {
+    exports org.opendaylight.mdsal.common.api;
+
+    requires transitive org.opendaylight.yangtools.yang.common;
+    requires org.opendaylight.yangtools.util;
+
+    // Annotations
+    requires static transitive org.eclipse.jdt.annotation;
+    requires static com.github.spotbugs.annotations;
+}