Merge "BUG-1199 : fixed incorrect parsing of Error message."

diff --git a/bgp/rib-impl/pom.xml b/bgp/rib-impl/pom.xml
index 4e0e70d57acba8b81a2f45b3c0ec786fe511a81f..5bf4ad28685567984dd31c5e1aa966a6e4481515 100644 (file)
--- a/bgp/rib-impl/pom.xml
+++ b/bgp/rib-impl/pom.xml
@@ -205,6 +205,7 @@
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
                             org.opendaylight.protocol.bgp.rib.impl.*,
+                            org.opendaylight.controller.config.yang.bgp.rib.impl
                         </Export-Package>
                     </instructions>
                 </configuration>

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 604004db0db40e12aa9ad141beb6330a19edd911..9662fec011a6127a1cc96d96899a1f399d37cc51 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -163,6 +163,7 @@
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-Package>
                             org.opendaylight.protocol.pcep.impl.*,
+                            org.opendaylight.controller.config.yang.pcep.impl.*
                         </Export-Package>
                     </instructions>
                 </configuration>

diff --git a/pcep/topology-provider/pom.xml b/pcep/topology-provider/pom.xml
index e0356dc5d5dfff9c3e58cfae27b0af9d02c505d4..e1cfa5acff59e4cd8a1ef570869e64efd4361c8d 100644 (file)
--- a/pcep/topology-provider/pom.xml
+++ b/pcep/topology-provider/pom.xml
@@ -102,10 +102,6 @@
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-tunnel-api</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/pcep/tunnel-provider/pom.xml b/pcep/tunnel-provider/pom.xml
index 8f9e88f0134d505eeeeae11e6fa139f954d425b7..539a47438dbd3d134848901b30900e073ff97a0f 100644 (file)
--- a/pcep/tunnel-provider/pom.xml
+++ b/pcep/tunnel-provider/pom.xml
@@ -40,10 +40,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-topology-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-tunnel-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-ietf-stateful02</artifactId>

diff --git a/programming/impl/pom.xml b/programming/impl/pom.xml
index e153d86754c5c0fc86ec536e4f1b4217fb38d21a..f43febec635b0a76c2390242411098d495e974b3 100644 (file)
--- a/programming/impl/pom.xml
+++ b/programming/impl/pom.xml
@@ -125,6 +125,10 @@
                <configuration>
                    <instructions>
                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+                       <Export-Package>
+                            org.opendaylight.bgpcep.programming.impl,
+                            org.opendaylight.controller.config.yang.programming.impl
+                        </Export-Package>
                    </instructions>
                </configuration>
            </plugin>