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 <[email protected]> Signed-off-by: Robert Varga <[email protected]>
opendaylight · May 13, 2023 · 4fe5db5 · 4fe5db5
1 parent 0e3a11b
commit 4fe5db5
Show file tree

Hide file tree

Showing 47 changed files with 657 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>