From eef8869d772eaab32c12beba47199d0d89c831dd Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 4 Jul 2019 01:04:38 +0200
Subject: [PATCH] Mark API bundles with Automatic-Module-Name

This patch updates core API packages to interact with JPMS, so
that they become automatic modules.

Change-Id: I9aa2f7dd7a82c9d7eaf4080d541db19991446da4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 binding/mdsal-binding-api/pom.xml  | 2 +-
 binding/mdsal-binding-spi/pom.xml  | 9 +++++++++
 binding/mdsal-binding-util/pom.xml | 2 +-
 common/mdsal-common-api/pom.xml    | 9 +++++++++
 dom/mdsal-dom-api/pom.xml          | 2 +-
 dom/mdsal-dom-spi/pom.xml          | 9 +++++++++
 6 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml
index 92664b9c18..a6fc9c5aac 100644
--- a/binding/mdsal-binding-api/pom.xml
+++ b/binding/mdsal-binding-api/pom.xml
@@ -66,7 +66,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>!javax.annotation,*</Import-Package>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.binding.api</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/binding/mdsal-binding-spi/pom.xml b/binding/mdsal-binding-spi/pom.xml
index c25a869f69..14156a91a5 100644
--- a/binding/mdsal-binding-spi/pom.xml
+++ b/binding/mdsal-binding-spi/pom.xml
@@ -37,6 +37,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.binding.spi</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/binding/mdsal-binding-util/pom.xml b/binding/mdsal-binding-util/pom.xml
index cef153fa95..1e2905f610 100644
--- a/binding/mdsal-binding-util/pom.xml
+++ b/binding/mdsal-binding-util/pom.xml
@@ -47,7 +47,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>!javax.annotation,*</Import-Package>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.binding.util</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml
index 013d8ef6ad..d5e2e8622d 100644
--- a/common/mdsal-common-api/pom.xml
+++ b/common/mdsal-common-api/pom.xml
@@ -45,6 +45,15 @@
 
     <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>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/dom/mdsal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml
index e0ea1a37d3..656516b962 100644
--- a/dom/mdsal-dom-api/pom.xml
+++ b/dom/mdsal-dom-api/pom.xml
@@ -52,7 +52,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Import-Package>!javax.annotation,*</Import-Package>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.dom.api</Automatic-Module-Name>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml
index 96cf155da8..9cdd540ad5 100644
--- a/dom/mdsal-dom-spi/pom.xml
+++ b/dom/mdsal-dom-spi/pom.xml
@@ -34,6 +34,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.dom.spi</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-- 
2.36.6