From 4ee466b81296b3c701cca64a9c66f4805c94eb7a Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 16 Mar 2019 15:58:03 +0100
Subject: [PATCH] Add Automatic-Module-Name declarations

Providing automatic module name allows downstreams to better
modularize their deployment with JDK9+. Provide this header
for all production artifacts.

Change-Id: I1dedaea93b7aea9df0ca17a9dad2bcc0ec7848af
JIRA: YANGTOOLS-933
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 common/concepts/pom.xml                | 1 +
 common/util/pom.xml                    | 9 +++++++++
 yang/odlext-model-api/pom.xml          | 9 +++++++++
 yang/odlext-parser-support/pom.xml     | 9 +++++++++
 yang/openconfig-model-api/pom.xml      | 9 +++++++++
 yang/openconfig-parser-support/pom.xml | 9 +++++++++
 yang/rfc6536-model-api/pom.xml         | 9 +++++++++
 yang/rfc6536-parser-support/pom.xml    | 9 +++++++++
 yang/rfc7952-data-api/pom.xml          | 9 +++++++++
 yang/rfc7952-data-util/pom.xml         | 9 +++++++++
 yang/rfc7952-model-api/pom.xml         | 9 +++++++++
 yang/rfc7952-parser-support/pom.xml    | 9 +++++++++
 yang/rfc8040-model-api/pom.xml         | 9 +++++++++
 yang/rfc8040-parser-support/pom.xml    | 9 +++++++++
 yang/rfc8528-model-api/pom.xml         | 9 +++++++++
 yang/rfc8528-parser-support/pom.xml    | 9 +++++++++
 yang/yang-common/pom.xml               | 1 +
 yang/yang-data-api/pom.xml             | 1 +
 yang/yang-data-codec-gson/pom.xml      | 1 +
 yang/yang-data-codec-xml/pom.xml       | 9 +++++++++
 yang/yang-data-impl/pom.xml            | 1 +
 yang/yang-data-jaxen/pom.xml           | 1 +
 yang/yang-data-transform/pom.xml       | 9 +++++++++
 yang/yang-data-util/pom.xml            | 9 +++++++++
 yang/yang-data-xpath-api/pom.xml       | 9 +++++++++
 yang/yang-model-api/pom.xml            | 1 +
 yang/yang-model-export/pom.xml         | 9 +++++++++
 yang/yang-model-util/pom.xml           | 9 +++++++++
 yang/yang-parser-api/pom.xml           | 9 +++++++++
 yang/yang-parser-impl/pom.xml          | 1 +
 yang/yang-parser-reactor/pom.xml       | 9 +++++++++
 yang/yang-parser-rfc7950/pom.xml       | 1 +
 yang/yang-parser-spi/pom.xml           | 1 +
 yang/yang-xpath-api/pom.xml            | 9 +++++++++
 yang/yang-xpath-impl/pom.xml           | 1 +
 35 files changed, 227 insertions(+)

diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml
index 9a122cb878..8a8716e488 100644
--- a/common/concepts/pom.xml
+++ b/common/concepts/pom.xml
@@ -39,6 +39,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.concepts</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/common/util/pom.xml b/common/util/pom.xml
index 95a135f26b..bbe012e96c 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -52,6 +52,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.util</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/odlext-model-api/pom.xml b/yang/odlext-model-api/pom.xml
index 6c5e2595cb..389cc3bdc5 100644
--- a/yang/odlext-model-api/pom.xml
+++ b/yang/odlext-model-api/pom.xml
@@ -38,6 +38,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.odlext.model.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/odlext-parser-support/pom.xml b/yang/odlext-parser-support/pom.xml
index 6732c5941e..1cd02ae2fe 100644
--- a/yang/odlext-parser-support/pom.xml
+++ b/yang/odlext-parser-support/pom.xml
@@ -42,6 +42,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.odlext.parser.support</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/openconfig-model-api/pom.xml b/yang/openconfig-model-api/pom.xml
index 43ea0930d9..cab8d35689 100644
--- a/yang/openconfig-model-api/pom.xml
+++ b/yang/openconfig-model-api/pom.xml
@@ -38,6 +38,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.openconfig.model.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/openconfig-parser-support/pom.xml b/yang/openconfig-parser-support/pom.xml
index f95e54e29c..0468cc1ee9 100644
--- a/yang/openconfig-parser-support/pom.xml
+++ b/yang/openconfig-parser-support/pom.xml
@@ -44,6 +44,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.openconfig.parser.support</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc6536-model-api/pom.xml b/yang/rfc6536-model-api/pom.xml
index c0d43d4a15..f0a7434276 100644
--- a/yang/rfc6536-model-api/pom.xml
+++ b/yang/rfc6536-model-api/pom.xml
@@ -38,6 +38,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc6536.model.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc6536-parser-support/pom.xml b/yang/rfc6536-parser-support/pom.xml
index 83661558c8..162b987b5f 100644
--- a/yang/rfc6536-parser-support/pom.xml
+++ b/yang/rfc6536-parser-support/pom.xml
@@ -44,6 +44,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc6536.parser.support</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc7952-data-api/pom.xml b/yang/rfc7952-data-api/pom.xml
index 812c2a81a5..1844247c90 100644
--- a/yang/rfc7952-data-api/pom.xml
+++ b/yang/rfc7952-data-api/pom.xml
@@ -42,6 +42,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc7952.data.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc7952-data-util/pom.xml b/yang/rfc7952-data-util/pom.xml
index 0449171afb..9e51a0e1a4 100644
--- a/yang/rfc7952-data-util/pom.xml
+++ b/yang/rfc7952-data-util/pom.xml
@@ -46,6 +46,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc7952.data.util</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc7952-model-api/pom.xml b/yang/rfc7952-model-api/pom.xml
index 5cf6297d8e..ea4ae912fb 100644
--- a/yang/rfc7952-model-api/pom.xml
+++ b/yang/rfc7952-model-api/pom.xml
@@ -38,6 +38,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc7952.model.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc7952-parser-support/pom.xml b/yang/rfc7952-parser-support/pom.xml
index a46cab0ace..b9ec2b5ea4 100644
--- a/yang/rfc7952-parser-support/pom.xml
+++ b/yang/rfc7952-parser-support/pom.xml
@@ -44,6 +44,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc7952.parser.support</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc8040-model-api/pom.xml b/yang/rfc8040-model-api/pom.xml
index 36eeac2842..fa79c593d6 100644
--- a/yang/rfc8040-model-api/pom.xml
+++ b/yang/rfc8040-model-api/pom.xml
@@ -38,6 +38,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc8040.model.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc8040-parser-support/pom.xml b/yang/rfc8040-parser-support/pom.xml
index 4ce79190e6..f3f04a686e 100644
--- a/yang/rfc8040-parser-support/pom.xml
+++ b/yang/rfc8040-parser-support/pom.xml
@@ -44,6 +44,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc8040.parser.support</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc8528-model-api/pom.xml b/yang/rfc8528-model-api/pom.xml
index 35a5d0e61e..73ccc82f74 100644
--- a/yang/rfc8528-model-api/pom.xml
+++ b/yang/rfc8528-model-api/pom.xml
@@ -38,6 +38,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc8528.model.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/rfc8528-parser-support/pom.xml b/yang/rfc8528-parser-support/pom.xml
index 915a45b340..6464b494ff 100644
--- a/yang/rfc8528-parser-support/pom.xml
+++ b/yang/rfc8528-parser-support/pom.xml
@@ -44,6 +44,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.rfc8528.parser.support</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml
index e0a1a2840c..00dc5ff107 100644
--- a/yang/yang-common/pom.xml
+++ b/yang/yang-common/pom.xml
@@ -44,6 +44,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.common</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                         <Include-Resource>{META-INF/services=${project.build.directory}/classes/META-INF/services}</Include-Resource>
                     </instructions>
diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml
index 6fbdc07105..415be8428f 100644
--- a/yang/yang-data-api/pom.xml
+++ b/yang/yang-data-api/pom.xml
@@ -51,6 +51,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.api</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml
index aee0c1edf8..dce9d9f3ca 100644
--- a/yang/yang-data-codec-gson/pom.xml
+++ b/yang/yang-data-codec-gson/pom.xml
@@ -67,6 +67,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.codec.gson</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml
index f590be9c3b..20e9af443d 100644
--- a/yang/yang-data-codec-xml/pom.xml
+++ b/yang/yang-data-codec-xml/pom.xml
@@ -56,6 +56,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.codec.xml</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 0b7afb29af..7fc382f8c2 100644
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -52,6 +52,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.impl</Automatic-Module-Name>
                         <Export-Package>
                             {local-packages},
                             org.opendaylight.yangtools.yang.data.impl.*,
diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml
index de8e5922ed..ec4b6593ca 100644
--- a/yang/yang-data-jaxen/pom.xml
+++ b/yang/yang-data-jaxen/pom.xml
@@ -78,6 +78,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.jaxen</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                         <Include-Resource>{META-INF/services=${project.build.directory}/classes/META-INF/services}</Include-Resource>
                         <Bundle-Activator>org.opendaylight.yangtools.yang.data.jaxen.osgi.Activator</Bundle-Activator>
diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml
index 9b0a7f381d..5a6e24cf75 100644
--- a/yang/yang-data-transform/pom.xml
+++ b/yang/yang-data-transform/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.yangtools.yang.data.transform</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
index 27ed26c284..68031c8fa8 100644
--- a/yang/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -48,6 +48,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.util</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-data-xpath-api/pom.xml b/yang/yang-data-xpath-api/pom.xml
index cf865638f9..c93ce6cc89 100644
--- a/yang/yang-data-xpath-api/pom.xml
+++ b/yang/yang-data-xpath-api/pom.xml
@@ -51,6 +51,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.data.xpath.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml
index a9d77ecf5c..e069469cd4 100644
--- a/yang/yang-model-api/pom.xml
+++ b/yang/yang-model-api/pom.xml
@@ -43,6 +43,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.model.api</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml
index 42979e9e98..bf29d50699 100644
--- a/yang/yang-model-export/pom.xml
+++ b/yang/yang-model-export/pom.xml
@@ -48,6 +48,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.model.export</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index 10343c3cee..d30e9f55c6 100644
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/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.yangtools.yang.model.util</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
index 592c1911d8..e949b2cc2e 100644
--- a/yang/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -30,6 +30,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.parser.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml
index e9bdc0295e..abe74fef3c 100644
--- a/yang/yang-parser-impl/pom.xml
+++ b/yang/yang-parser-impl/pom.xml
@@ -143,6 +143,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.parser.impl</Automatic-Module-Name>
                         <Include-Resource>{META-INF/services=${project.build.directory}/classes/META-INF/services}</Include-Resource>
                         <Bundle-Activator>org.opendaylight.yangtools.yang.parser.impl.osgi.Activator</Bundle-Activator>
                     </instructions>
diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml
index 4c70495185..b27d679114 100644
--- a/yang/yang-parser-reactor/pom.xml
+++ b/yang/yang-parser-reactor/pom.xml
@@ -54,6 +54,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.parser.reactor</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml
index be874a9a32..f1d3b5ddbf 100644
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -95,6 +95,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.parser.reactor</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml
index 00f00d196b..9d823d80f8 100644
--- a/yang/yang-parser-spi/pom.xml
+++ b/yang/yang-parser-spi/pom.xml
@@ -49,6 +49,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.parser.spi</Automatic-Module-Name>
                         <Import-Package>!javax.annotation,*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/yang/yang-xpath-api/pom.xml b/yang/yang-xpath-api/pom.xml
index 0935a1dcef..1c42de57ef 100644
--- a/yang/yang-xpath-api/pom.xml
+++ b/yang/yang-xpath-api/pom.xml
@@ -39,6 +39,15 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.xpath.api</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml
index bad31c7f8d..6de90cf5d6 100644
--- a/yang/yang-xpath-impl/pom.xml
+++ b/yang/yang-xpath-impl/pom.xml
@@ -79,6 +79,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yangtools.yang.xpath.impl</Automatic-Module-Name>
                         <Include-Resource>{META-INF/services=${project.build.directory}/classes/META-INF/services}</Include-Resource>
                         <Bundle-Activator>org.opendaylight.yangtools.yang.xpath.impl.Activator</Bundle-Activator>
                     </instructions>
-- 
2.36.6