Rework binding component instantiation

[mdsal.git] / dom / mdsal-dom-schema-osgi / pom.xml

diff --git a/dom/mdsal-dom-schema-service-osgi/pom.xml b/dom/mdsal-dom-schema-osgi/pom.xml
similarity index 82%
rename from dom/mdsal-dom-schema-service-osgi/pom.xml
rename to dom/mdsal-dom-schema-osgi/pom.xml
index ef7a022ce0aba6d02f6b137d379af9b209819f5e..6bf2e1aa7cffe2f3fa89e676141fc6c0425289a4 100644 (file)
--- a/dom/mdsal-dom-schema-service-osgi/pom.xml
+++ b/dom/mdsal-dom-schema-osgi/pom.xml
@@ -16,28 +16,22 @@
         <relativePath>../dom-parent</relativePath>
     </parent>
 
-    <artifactId>mdsal-dom-schema-service-osgi</artifactId>
+    <artifactId>mdsal-dom-schema-osgi</artifactId>
     <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-dom-api</artifactId>
+            <artifactId>mdsal-binding-runtime-spi</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-broker</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>util</artifactId>
@@ -51,14 +45,22 @@
             <artifactId>yang-parser-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-test-util</artifactId>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>osgi.cmpn</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-test-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -68,12 +70,10 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
+                    <Automatic-Module-Name>org.opendaylight.mdsal.dom.schema.osgi</Automatic-Module-Name>
                     <instructions>
-                        <Bundle-Name>osgiBundleScanningSchema</Bundle-Name>
-                        <Import-Package>
-                            *,
-                            org.opendaylight.mdsal.dom.api
-                        </Import-Package>
+                        <!-- Karaf cannot handle Factory Component requirements, see https://issues.apache.org/jira/browse/KARAF-6625 -->
+                        <_dsannotations-options>norequirements</_dsannotations-options>
                     </instructions>
                 </configuration>
             </plugin>