From 035d921ea3b85fa6cf6ef420ed9105e01918d38d Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 6 Apr 2022 16:57:27 +0200
Subject: [PATCH] Fix Automatic-Module-Name declarations

The declaration should be in <instructions/>, otherwise it is not
effective.

Change-Id: I82aeeaf9c68791ea171853f238afc6a9bafe9661
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 binding/mdsal-binding-dom-codec-osgi/pom.xml | 2 +-
 binding/mdsal-binding-runtime-osgi/pom.xml   | 2 +-
 dom/mdsal-dom-schema-osgi/pom.xml            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/binding/mdsal-binding-dom-codec-osgi/pom.xml b/binding/mdsal-binding-dom-codec-osgi/pom.xml
index 7907bff9a5..18b8059483 100644
--- a/binding/mdsal-binding-dom-codec-osgi/pom.xml
+++ b/binding/mdsal-binding-dom-codec-osgi/pom.xml
@@ -62,8 +62,8 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <Automatic-Module-Name>org.opendaylight.mdsal.binding.dom.codec.osgi</Automatic-Module-Name>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.binding.dom.codec.osgi</Automatic-Module-Name>
                         <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
                         <_dsannotations-options>norequirements</_dsannotations-options>
                     </instructions>
diff --git a/binding/mdsal-binding-runtime-osgi/pom.xml b/binding/mdsal-binding-runtime-osgi/pom.xml
index e3330a009d..639e6151c4 100644
--- a/binding/mdsal-binding-runtime-osgi/pom.xml
+++ b/binding/mdsal-binding-runtime-osgi/pom.xml
@@ -62,8 +62,8 @@
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
-                    <Automatic-Module-Name>org.opendaylight.mdsal.binding.runtime.osgi</Automatic-Module-Name>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.binding.runtime.osgi</Automatic-Module-Name>
                         <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
                         <_dsannotations-options>norequirements</_dsannotations-options>
                     </instructions>
diff --git a/dom/mdsal-dom-schema-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
index 5f8e4a3fd6..39f72856af 100644
--- a/dom/mdsal-dom-schema-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -73,8 +73,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
-                    <Automatic-Module-Name>org.opendaylight.mdsal.dom.schema.osgi</Automatic-Module-Name>
                     <instructions>
+                        <Automatic-Module-Name>org.opendaylight.mdsal.dom.schema.osgi</Automatic-Module-Name>
                         <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
                         <_dsannotations-options>norequirements</_dsannotations-options>
                     </instructions>
-- 
2.36.6