Merge "Increase timeout for waiting for broker service in sal-binding-it."

[controller.git] / opendaylight / config / yang-store-impl / pom.xml

diff --git a/opendaylight/config/yang-store-impl/pom.xml b/opendaylight/config/yang-store-impl/pom.xml
index ee56e2c0cfdeffebd012f0c091a0b228e48069f8..c4ac8305914cb0fbf530492f39dfa7b45b3cc045 100644 (file)
--- a/opendaylight/config/yang-store-impl/pom.xml
+++ b/opendaylight/config/yang-store-impl/pom.xml
@@ -1,10 +1,9 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>config-subsystem</artifactId>
         <groupId>org.opendaylight.controller</groupId>
-        <version>0.2.1-SNAPSHOT</version>
+        <version>0.2.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>yang-store-impl</artifactId>
@@ -15,7 +14,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-store-api</artifactId>
-            <version>0.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -28,12 +26,10 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-jmx-generator</artifactId>
-            <version>0.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>binding-generator-impl</artifactId>
-            <version>${opendaylight.binding.version}</version>
+            <artifactId>binding-type-provider</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -44,10 +40,12 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
-            <version>0.2.0-SNAPSHOT</version>
-            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
         </dependency>
     </dependencies>
 
@@ -58,70 +56,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-Activator>org.opendaylight.controller.config.yang.store.impl.YangStoreActivator
-                        </Bundle-Activator>
-                        <Private-Package>
-                            org.opendaylight.controller.config.yang.store.impl,
-                            <!-- OPENDAYLIGHT -->
-                            org.opendaylight.yangtools.sal.binding.yang.types,
-                            org.opendaylight.yangtools.yang.parser.impl,
-                            org.opendaylight.yangtools.antlrv4.code.gen,
-                            org.opendaylight.yangtools.yang.model.parser.api,
-
-                            org.opendaylight.yangtools.yang.model.util,
-
-                            org.opendaylight.yangtools.yang.parser.builder.api,
-                            org.opendaylight.yangtools.yang.parser.builder.impl,
-
-                            org.opendaylight.yangtools.yang.parser.impl,
-                            org.opendaylight.yangtools.yang.parser.util,
-
-                            org.opendaylight.yangtools.yang.validator,
-                            <!-- ANTLR -->
-
-                            org.antlr.v4.runtime,
-                            org.antlr.v4.runtime.tree,
-                            org.antlr.v4.runtime.atn,
-                            org.antlr.v4.runtime.dfa,
-                            org.antlr.v4.runtime.misc,
-                            org.antlr.v4.runtime.tree.gui,
-                            org.abego.treelayout,
-                            org.abego.treelayout.util,
-                            org.abego.treelayout.internal.util,
-                            org.abego.treelayout.internal.util.java.lang,
-                            org.abego.treelayout.internal.util.java.lang.string,
-                            org.abego.treelayout.internal.util.java.util,
-
-                            <!-- xtext -->
-                            org.eclipse.xtext.xbase.lib.*,
-                            org.apache.commons.lang.*,
-                        </Private-Package>
-
-                        <Import-Package>
-                            org.opendaylight.controller.config.yang.store.api,
-                            org.opendaylight.controller.config.yangjmxgenerator,
-                            com.google.common.base,
-                            com.google.common.collect,
-                            com.google.common.primitives,
-                            org.apache.commons.io,
-                            org.osgi.framework,
-                            org.osgi.util.tracker,
-                            org.slf4j,
-                            javax.*,
-                            <!-- OPENDAYLIGHT PROVIDED BY YANG-JMX-GENERATOR -->
-                            org.opendaylight.yangtools.yang.common,
-                            org.opendaylight.yangtools.yang.model.api,
-                            org.opendaylight.yangtools.yang.model.api.type,
-
-                            org.opendaylight.yangtools.yang.binding,
-
-                            org.opendaylight.yangtools.binding.generator.util,
-                            org.opendaylight.yangtools.sal.binding.generator.spi,
-                            org.opendaylight.yangtools.sal.binding.model.api,
-
-                            org.opendaylight.yangtools.binding.generator.util.generated.type.builder,
-                            org.opendaylight.yangtools.sal.binding.model.api.type.builder,
-                        </Import-Package>
+                        <Bundle-Activator>org.opendaylight.controller.config.yang.store.impl.YangStoreActivator</Bundle-Activator>
                         <Export-Package>
                         </Export-Package>
                     </instructions>