From 4fe5db548b95038f19b06dceab4fa35584559b8a Mon Sep 17 00:00:00 2001
From: Samuel Schneider <samuel.schneider@pantheon.tech>
Date: Tue, 25 Apr 2023 16:48:47 +0200
Subject: [PATCH] Add Automatic-Module-Name declarations

Update all packaged models to include Automatic-Module-Name
with correct JPMS module naming.

JIRA: MDSAL-752
Change-Id: I7a8ee5081d97aed0a72570698c4ec729ab57a717
Signed-off-by: Samuel Schneider <samuel.schneider@pantheon.tech>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 model/general-entity/pom.xml                       | 14 ++++++++++++++
 model/iana/iana-crypt-hash/pom.xml                 | 14 ++++++++++++++
 model/iana/iana-hardware/pom.xml                   | 14 ++++++++++++++
 model/iana/iana-if-type/pom.xml                    | 14 ++++++++++++++
 model/iana/iana-routing-types/pom.xml              | 14 ++++++++++++++
 model/ietf/ietf-topology/pom.xml                   | 14 ++++++++++++++
 model/ietf/ietf-type-util/pom.xml                  | 13 +++++++++++++
 model/ietf/rfc6991-ietf-inet-types/pom.xml         | 14 ++++++++++++++
 model/ietf/rfc6991-ietf-yang-types/pom.xml         | 14 ++++++++++++++
 model/ietf/rfc7952/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8040/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8072/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8294-ietf-routing-types/pom.xml      | 14 ++++++++++++++
 model/ietf/rfc8342-ietf-datastores/pom.xml         | 14 ++++++++++++++
 model/ietf/rfc8342-ietf-origin/pom.xml             | 14 ++++++++++++++
 model/ietf/rfc8343/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8344/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8345-ietf-network-state/pom.xml      | 14 ++++++++++++++
 .../rfc8345-ietf-network-topology-state/pom.xml    | 14 ++++++++++++++
 model/ietf/rfc8345-ietf-network-topology/pom.xml   | 14 ++++++++++++++
 model/ietf/rfc8345-ietf-network/pom.xml            | 14 ++++++++++++++
 .../rfc8346-ietf-l3-unicast-topology-state/pom.xml | 14 ++++++++++++++
 .../ietf/rfc8346-ietf-l3-unicast-topology/pom.xml  | 14 ++++++++++++++
 model/ietf/rfc8348-ietf-hardware-state/pom.xml     | 14 ++++++++++++++
 model/ietf/rfc8348-ietf-hardware/pom.xml           | 14 ++++++++++++++
 .../ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml | 14 ++++++++++++++
 .../ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml | 14 ++++++++++++++
 model/ietf/rfc8349-ietf-routing/pom.xml            | 14 ++++++++++++++
 .../ietf/rfc8519-ietf-access-control-list/pom.xml  | 14 ++++++++++++++
 model/ietf/rfc8519-ietf-ethertypes/pom.xml         | 14 ++++++++++++++
 model/ietf/rfc8519-ietf-packet-fields/pom.xml      | 14 ++++++++++++++
 model/ietf/rfc8520-ietf-acldns/pom.xml             | 14 ++++++++++++++
 model/ietf/rfc8520-ietf-mud/pom.xml                | 14 ++++++++++++++
 model/ietf/rfc8525/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8528/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8529/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8530/pom.xml                         | 14 ++++++++++++++
 model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml | 14 ++++++++++++++
 model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml    | 14 ++++++++++++++
 model/ietf/rfc8776-ietf-te-packet-types/pom.xml    | 14 ++++++++++++++
 model/ietf/rfc8776-ietf-te-types/pom.xml           | 14 ++++++++++++++
 model/ietf/rfc8795-ietf-te-topology-state/pom.xml  | 14 ++++++++++++++
 model/ietf/rfc8795-ietf-te-topology/pom.xml        | 14 ++++++++++++++
 model/ietf/rfc8819-ietf-module-tags-state/pom.xml  | 14 ++++++++++++++
 model/ietf/rfc8819-ietf-module-tags/pom.xml        | 14 ++++++++++++++
 model/l2-types/pom.xml                             | 14 ++++++++++++++
 model/yang-ext/pom.xml                             | 14 ++++++++++++++
 47 files changed, 657 insertions(+)

diff --git a/model/general-entity/pom.xml b/model/general-entity/pom.xml
index 109fcbc7f0..a9ec0e274b 100644
--- a/model/general-entity/pom.xml
+++ b/model/general-entity/pom.xml
@@ -23,4 +23,18 @@
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.model.general.entity</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/iana/iana-crypt-hash/pom.xml b/model/iana/iana-crypt-hash/pom.xml
index fc96fd939a..4dedd65ece 100644
--- a/model/iana/iana-crypt-hash/pom.xml
+++ b/model/iana/iana-crypt-hash/pom.xml
@@ -35,4 +35,18 @@
             <artifactId>yang-common</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.iana.crypt.hash</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/iana/iana-hardware/pom.xml b/model/iana/iana-hardware/pom.xml
index dddfa49b80..7088b3c1a9 100644
--- a/model/iana/iana-hardware/pom.xml
+++ b/model/iana/iana-hardware/pom.xml
@@ -24,4 +24,18 @@
 
     <name>${project.artifactId}</name>
     <description>iana-hardware@2018-03-13</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.iana.hardware</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml
index 3cbcb5c9e7..b51a339acf 100644
--- a/model/iana/iana-if-type/pom.xml
+++ b/model/iana/iana-if-type/pom.xml
@@ -31,4 +31,18 @@
             <artifactId>rfc8343</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.iana._if.type</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/iana/iana-routing-types/pom.xml b/model/iana/iana-routing-types/pom.xml
index f46a41691f..b678e32c1a 100644
--- a/model/iana/iana-routing-types/pom.xml
+++ b/model/iana/iana-routing-types/pom.xml
@@ -24,4 +24,18 @@
 
     <name>${project.artifactId}</name>
     <description>iana-routing-types@2021-10-19</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.iana.routing.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml
index 0b5940f9ab..09ce549596 100644
--- a/model/ietf/ietf-topology/pom.xml
+++ b/model/ietf/ietf-topology/pom.xml
@@ -33,4 +33,18 @@
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.topology</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/ietf-type-util/pom.xml b/model/ietf/ietf-type-util/pom.xml
index 8b292f79c0..b4f067821c 100644
--- a/model/ietf/ietf-type-util/pom.xml
+++ b/model/ietf/ietf-type-util/pom.xml
@@ -36,6 +36,19 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.model.ietf.type.util</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/model/ietf/rfc6991-ietf-inet-types/pom.xml b/model/ietf/rfc6991-ietf-inet-types/pom.xml
index 58a524fb17..714226d631 100644
--- a/model/ietf/rfc6991-ietf-inet-types/pom.xml
+++ b/model/ietf/rfc6991-ietf-inet-types/pom.xml
@@ -33,4 +33,18 @@
             <artifactId>ietf-type-util</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc6991.inet.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc6991-ietf-yang-types/pom.xml b/model/ietf/rfc6991-ietf-yang-types/pom.xml
index 592284f3e1..e0c6f926e9 100644
--- a/model/ietf/rfc6991-ietf-yang-types/pom.xml
+++ b/model/ietf/rfc6991-ietf-yang-types/pom.xml
@@ -31,4 +31,18 @@
             <artifactId>ietf-type-util</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc6991.yang.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc7952/pom.xml b/model/ietf/rfc7952/pom.xml
index abbc7d4d51..c5bb6a3719 100644
--- a/model/ietf/rfc7952/pom.xml
+++ b/model/ietf/rfc7952/pom.xml
@@ -25,4 +25,18 @@
 
     <name>${project.artifactId}</name>
     <description>RFC7952 YANG Metadata</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc7952</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8040/pom.xml b/model/ietf/rfc8040/pom.xml
index e52dc22397..0ed5e7041c 100644
--- a/model/ietf/rfc8040/pom.xml
+++ b/model/ietf/rfc8040/pom.xml
@@ -23,4 +23,18 @@
 
     <name>${project.artifactId}</name>
     <description>RFC8040 RESTCONF Protocol</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8040</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8072/pom.xml b/model/ietf/rfc8072/pom.xml
index 48bcf51f3c..88ad030eac 100644
--- a/model/ietf/rfc8072/pom.xml
+++ b/model/ietf/rfc8072/pom.xml
@@ -30,4 +30,18 @@
             <artifactId>rfc8040</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8072</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8294-ietf-routing-types/pom.xml b/model/ietf/rfc8294-ietf-routing-types/pom.xml
index 9759bb1861..1c50d6666f 100644
--- a/model/ietf/rfc8294-ietf-routing-types/pom.xml
+++ b/model/ietf/rfc8294-ietf-routing-types/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8294.routing.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8342-ietf-datastores/pom.xml b/model/ietf/rfc8342-ietf-datastores/pom.xml
index 09d5b18f41..73b3581171 100644
--- a/model/ietf/rfc8342-ietf-datastores/pom.xml
+++ b/model/ietf/rfc8342-ietf-datastores/pom.xml
@@ -25,4 +25,18 @@
 
     <name>${project.artifactId}</name>
     <description>RFC8342 ietf-datastores</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8342.datastore</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8342-ietf-origin/pom.xml b/model/ietf/rfc8342-ietf-origin/pom.xml
index 387b7ea223..674b158a4c 100644
--- a/model/ietf/rfc8342-ietf-origin/pom.xml
+++ b/model/ietf/rfc8342-ietf-origin/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc7952</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8342.origin</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8343/pom.xml b/model/ietf/rfc8343/pom.xml
index e1037e9996..0c4fcc3d40 100644
--- a/model/ietf/rfc8343/pom.xml
+++ b/model/ietf/rfc8343/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8343</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8344/pom.xml b/model/ietf/rfc8344/pom.xml
index 559af03228..6a4a16ade8 100644
--- a/model/ietf/rfc8344/pom.xml
+++ b/model/ietf/rfc8344/pom.xml
@@ -40,4 +40,18 @@
             <artifactId>rfc8343</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8344</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8345-ietf-network-state/pom.xml b/model/ietf/rfc8345-ietf-network-state/pom.xml
index 43a8c12b8a..bf7ae34f44 100644
--- a/model/ietf/rfc8345-ietf-network-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-state/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8345-ietf-network</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network.state</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
index dae0737b5a..eef1620098 100644
--- a/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology-state/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8345-ietf-network-topology</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network.topology.state</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8345-ietf-network-topology/pom.xml b/model/ietf/rfc8345-ietf-network-topology/pom.xml
index 7c8b4f4675..3ee3ded2de 100644
--- a/model/ietf/rfc8345-ietf-network-topology/pom.xml
+++ b/model/ietf/rfc8345-ietf-network-topology/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8345-ietf-network</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network.topology</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8345-ietf-network/pom.xml b/model/ietf/rfc8345-ietf-network/pom.xml
index 6bc83d30fa..4c690405a0 100644
--- a/model/ietf/rfc8345-ietf-network/pom.xml
+++ b/model/ietf/rfc8345-ietf-network/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc6991-ietf-inet-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8345.network</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml b/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
index 5e9c0e1092..2f09d6a84d 100644
--- a/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
+++ b/model/ietf/rfc8346-ietf-l3-unicast-topology-state/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8345-ietf-network-topology-state</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8346.unicast.topology.state</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml b/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
index 42a7d9a0e1..7f3c7856f4 100644
--- a/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
+++ b/model/ietf/rfc8346-ietf-l3-unicast-topology/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8345-ietf-network-topology</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8346.unicast.topology</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8348-ietf-hardware-state/pom.xml b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
index 63a77f5c2c..31be7b1f31 100644
--- a/model/ietf/rfc8348-ietf-hardware-state/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware-state/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8348-ietf-hardware</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8348.hardware.state</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8348-ietf-hardware/pom.xml b/model/ietf/rfc8348-ietf-hardware/pom.xml
index 38a9e02a57..433ffb1ff7 100644
--- a/model/ietf/rfc8348-ietf-hardware/pom.xml
+++ b/model/ietf/rfc8348-ietf-hardware/pom.xml
@@ -40,4 +40,18 @@
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8348.hardware</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
index 417be99f98..ad6d3c53ae 100644
--- a/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv4-unicast-routing/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8349-ietf-routing</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8349.ipv4.unicast.routing</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
index 44edd7e428..e1d239df6d 100644
--- a/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-ipv6-unicast-routing/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8349-ietf-routing</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8349.ipv6.unicast.routing</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8349-ietf-routing/pom.xml b/model/ietf/rfc8349-ietf-routing/pom.xml
index 45c307dff5..f1abb57aaf 100644
--- a/model/ietf/rfc8349-ietf-routing/pom.xml
+++ b/model/ietf/rfc8349-ietf-routing/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8343</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8349.routing</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8519-ietf-access-control-list/pom.xml b/model/ietf/rfc8519-ietf-access-control-list/pom.xml
index ba2dd74e10..a3101bb25c 100644
--- a/model/ietf/rfc8519-ietf-access-control-list/pom.xml
+++ b/model/ietf/rfc8519-ietf-access-control-list/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8519-ietf-packet-fields</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8519.access.control.list</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8519-ietf-ethertypes/pom.xml b/model/ietf/rfc8519-ietf-ethertypes/pom.xml
index 5c74e41ffd..065b8b7b7d 100644
--- a/model/ietf/rfc8519-ietf-ethertypes/pom.xml
+++ b/model/ietf/rfc8519-ietf-ethertypes/pom.xml
@@ -24,4 +24,18 @@
 
     <name>${project.artifactId}</name>
     <description>RFC8519 ietf-ethertypes</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8519.ethertypes</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8519-ietf-packet-fields/pom.xml b/model/ietf/rfc8519-ietf-packet-fields/pom.xml
index 730bf0259a..7f155b268e 100644
--- a/model/ietf/rfc8519-ietf-packet-fields/pom.xml
+++ b/model/ietf/rfc8519-ietf-packet-fields/pom.xml
@@ -40,4 +40,18 @@
             <artifactId>rfc8519-ietf-ethertypes</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8519.packet.fields</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8520-ietf-acldns/pom.xml b/model/ietf/rfc8520-ietf-acldns/pom.xml
index 6b387e0e15..e6c57362e1 100644
--- a/model/ietf/rfc8520-ietf-acldns/pom.xml
+++ b/model/ietf/rfc8520-ietf-acldns/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8519-ietf-access-control-list</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8520.acldns</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8520-ietf-mud/pom.xml b/model/ietf/rfc8520-ietf-mud/pom.xml
index c041897939..5bf4d3256a 100644
--- a/model/ietf/rfc8520-ietf-mud/pom.xml
+++ b/model/ietf/rfc8520-ietf-mud/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8519-ietf-access-control-list</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8520.mud</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8525/pom.xml b/model/ietf/rfc8525/pom.xml
index a8c6115989..2b7644e41f 100644
--- a/model/ietf/rfc8525/pom.xml
+++ b/model/ietf/rfc8525/pom.xml
@@ -37,4 +37,18 @@
             <artifactId>rfc8342-ietf-datastores</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8525</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8528/pom.xml b/model/ietf/rfc8528/pom.xml
index 93c181f720..8ffa1d7a94 100644
--- a/model/ietf/rfc8528/pom.xml
+++ b/model/ietf/rfc8528/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8528</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8529/pom.xml b/model/ietf/rfc8529/pom.xml
index e405666398..e727745f51 100644
--- a/model/ietf/rfc8529/pom.xml
+++ b/model/ietf/rfc8529/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8528</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8529</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8530/pom.xml b/model/ietf/rfc8530/pom.xml
index 0c49baa8e3..1947faa896 100644
--- a/model/ietf/rfc8530/pom.xml
+++ b/model/ietf/rfc8530/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8528</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8530</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml b/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
index 639de977d9..10ddfe8788 100644
--- a/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
+++ b/model/ietf/rfc8542-ietf-dc-fabric-topology/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8542-ietf-dc-fabric-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8542.dc.fabric.topology</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml b/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml
index 11cfa2d9fd..ed78d090fe 100644
--- a/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml
+++ b/model/ietf/rfc8542-ietf-dc-fabric-types/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8345-ietf-network</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8542.dc.fabric.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8776-ietf-te-packet-types/pom.xml b/model/ietf/rfc8776-ietf-te-packet-types/pom.xml
index 3d802158b1..bc93cbbea2 100644
--- a/model/ietf/rfc8776-ietf-te-packet-types/pom.xml
+++ b/model/ietf/rfc8776-ietf-te-packet-types/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc8776-ietf-te-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8776.te.packet.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8776-ietf-te-types/pom.xml b/model/ietf/rfc8776-ietf-te-types/pom.xml
index f89da1bdaa..bf4f2fffcb 100644
--- a/model/ietf/rfc8776-ietf-te-types/pom.xml
+++ b/model/ietf/rfc8776-ietf-te-types/pom.xml
@@ -31,4 +31,18 @@
             <artifactId>rfc8294-ietf-routing-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8776.te.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8795-ietf-te-topology-state/pom.xml b/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
index 36d40597ce..318c138251 100644
--- a/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
+++ b/model/ietf/rfc8795-ietf-te-topology-state/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8795-ietf-te-topology</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8795.te.topology.state</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8795-ietf-te-topology/pom.xml b/model/ietf/rfc8795-ietf-te-topology/pom.xml
index ccf0a065b9..2a09318ac3 100644
--- a/model/ietf/rfc8795-ietf-te-topology/pom.xml
+++ b/model/ietf/rfc8795-ietf-te-topology/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8776-ietf-te-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8795.te.topology</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8819-ietf-module-tags-state/pom.xml b/model/ietf/rfc8819-ietf-module-tags-state/pom.xml
index f9a594f220..154467c61e 100644
--- a/model/ietf/rfc8819-ietf-module-tags-state/pom.xml
+++ b/model/ietf/rfc8819-ietf-module-tags-state/pom.xml
@@ -36,4 +36,18 @@
             <artifactId>rfc8819-ietf-module-tags</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8819.module.tags.state</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/ietf/rfc8819-ietf-module-tags/pom.xml b/model/ietf/rfc8819-ietf-module-tags/pom.xml
index 0ab7743592..6bb0d73f17 100644
--- a/model/ietf/rfc8819-ietf-module-tags/pom.xml
+++ b/model/ietf/rfc8819-ietf-module-tags/pom.xml
@@ -32,4 +32,18 @@
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.yang.gen.ietf.rfc8819.module.tags</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml
index f385106656..76c784e44b 100644
--- a/model/l2-types/pom.xml
+++ b/model/l2-types/pom.xml
@@ -21,4 +21,18 @@
     <artifactId>opendaylight-l2-types</artifactId>
     <version>2013.08.27.24.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.model.l2.types</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml
index 5558285e42..04f8d7f2c5 100644
--- a/model/yang-ext/pom.xml
+++ b/model/yang-ext/pom.xml
@@ -23,4 +23,18 @@
     <name>${project.artifactId}</name>
     <description>${project.artifactId}</description>
     <packaging>bundle</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.model.yang.ext</Automatic-Module-Name>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
-- 
2.36.6