From 6a07d2d622eaa06953f3353e39c080984076e8de Mon Sep 17 00:00:00 2001
From: Ashlee Young <ashlee@onosfw.com>
Date: Fri, 9 Oct 2015 18:32:44 -0700
Subject: Updated master to commit id 6ee8aa3e67ce89908a8c93aa9445c6f71a18f986

Change-Id: I94b055ee2f298daf71e2ec794fd0f2495bd8081f
---
 framework/src/onos/pom.xml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'framework/src/onos/pom.xml')

diff --git a/framework/src/onos/pom.xml b/framework/src/onos/pom.xml
index 1bce8cdb..93ef2779 100644
--- a/framework/src/onos/pom.xml
+++ b/framework/src/onos/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2014 Open Networking Laboratory
+  ~ Copyright 2015 Open Networking Laboratory
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@
 
         <module>tools/package/archetypes</module>
         <module>tools/package/branding</module>
+        <module>bgp</module>
     </modules>
 
     <url>http://onosproject.org/</url>
@@ -77,6 +78,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <onos-build-conf.version>1.0</onos-build-conf.version>
         <netty4.version>4.0.23.Final</netty4.version>
         <copycat.version>0.5.0.onos</copycat.version>
         <openflowj.version>0.9.0.onos</openflowj.version>
@@ -429,11 +431,27 @@
                 <classifier>tests</classifier>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-bgpio</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
                 <version>1.6</version>
             </dependency>
+            <dependency>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-bgp-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-app-bgp-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-common</artifactId>
@@ -591,12 +609,12 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.0.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.onosproject</groupId>
                             <artifactId>onos-build-conf</artifactId>
-                            <version>1.0</version>
+                            <version>${onos-build-conf.version}</version>
                         </dependency>
                     </dependencies>
                     <configuration>
@@ -652,7 +670,7 @@
                     <dependency>
                         <groupId>org.onosproject</groupId>
                         <artifactId>onos-build-conf</artifactId>
-                        <version>1.0</version>
+                        <version>${onos-build-conf.version}</version>
                     </dependency>
                     <!-- For Java 8 lambda support-->
                     <dependency>
-- 
cgit 1.2.3-korg