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>

diff --git a/binding/mdsal-binding-api/pom.xml b/binding/mdsal-binding-api/pom.xml
index 92664b9c189f9c335daf307a8f685b827bdd72cd..a6fc9c5aacf62aa1dd9ce23699a55762ce236df7 100644 (file)
--- 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 c25a869f69f0b0ae3a3580ba9d7343cb881c6929..14156a91a52c77d4bf8826d1a3a599171b7aef7c 100644 (file)
--- 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 cef153fa95df91f561f8915c992f5209cfa71c13..1e2905f610014c36fbb9545bd625485540380a0f 100644 (file)
--- 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 013d8ef6ad5135cf7bdb850b2b49ea5153f62161..d5e2e8622db55d563eef456ea9ab3d3d82bf6bb0 100644 (file)
--- 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 e0ea1a37d302d9d2fc29d17304a7aa25a7659459..656516b9625976eba17408031fd6e754bd2bff82 100644 (file)
--- 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 96cf155da8113faf429eff1eb8ed1e3c9ce9de74..9cdd540ad5c8fbbce88392475b59b7c5bbc5b8bc 100644 (file)
--- 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>