X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=infra%2Fminimal-distribution%2Fpom.xml;h=4ada2d703fae0d07866d9a7c182564aeb2df81b2;hb=51b88a708aa648f4787e7fb1ca8addeb1fd0d523;hp=342bcf67017255cf12d6183fc3467a1bf3eac85c;hpb=46589c652a58b1cd56dab268b59d96bc20b5dd1f;p=honeycomb.git

diff --git a/infra/minimal-distribution/pom.xml b/infra/minimal-distribution/pom.xml
index 342bcf670..4ada2d703 100644
--- a/infra/minimal-distribution/pom.xml
+++ b/infra/minimal-distribution/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>minimal-distribution-parent</artifactId>
-        <version>1.17.07-SNAPSHOT</version>
+        <version>1.18.10-SNAPSHOT</version>
         <relativePath>../../common/minimal-distribution-parent</relativePath>
     </parent>
 
@@ -26,7 +26,7 @@
     <groupId>io.fd.honeycomb</groupId>
     <artifactId>minimal-distribution</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.17.07-SNAPSHOT</version>
+    <version>1.18.10-SNAPSHOT</version>
 
     <properties>
         <main.class>io.fd.honeycomb.infra.distro.Main</main.class>
@@ -36,14 +36,21 @@
             io.fd.honeycomb.infra.distro.data.ConfigAndOperationalPipelineModule,
             io.fd.honeycomb.infra.distro.data.context.ContextPipelineModule,
             io.fd.honeycomb.infra.distro.initializer.InitializerPipelineModule,
-            io.fd.honeycomb.infra.distro.netconf.NetconfModule,
-            io.fd.honeycomb.infra.distro.netconf.NetconfReadersModule,
-            io.fd.honeycomb.infra.distro.restconf.RestconfModule,
-            io.fd.honeycomb.infra.distro.bgp.BgpModule,
-            io.fd.honeycomb.infra.distro.bgp.BgpExtensionsModule,
-            io.fd.honeycomb.infra.distro.bgp.BgpReadersModule,
-            io.fd.honeycomb.infra.distro.bgp.BgpWritersModule,
-            io.fd.honeycomb.infra.distro.cfgattrs.CfgAttrsModule
+            io.fd.honeycomb.northbound.CredentialsModule,
+            io.fd.honeycomb.northbound.netconf.NetconfModule,
+            io.fd.honeycomb.northbound.netconf.NetconfReadersModule,
+            io.fd.honeycomb.northbound.restconf.RestconfModule,
+            io.fd.honeycomb.infra.distro.cfgattrs.CfgAttrsModule,
+            // io.fd.honeycomb.infra.bgp.BgpModule,
+            // io.fd.honeycomb.infra.bgp.BgpReadersModule,
+            // io.fd.honeycomb.infra.bgp.BgpWritersModule,
+            // io.fd.honeycomb.northbound.bgp.extension.EvpnModule,
+            // io.fd.honeycomb.northbound.bgp.extension.InetModule,
+            // io.fd.honeycomb.northbound.bgp.extension.L3VpnV4Module,
+            // io.fd.honeycomb.northbound.bgp.extension.L3VpnV6Module,
+            // io.fd.honeycomb.northbound.bgp.extension.LabeledUnicastModule,
+            // io.fd.honeycomb.northbound.bgp.extension.LinkstateModule,
+            // io.fd.honeycomb.footprint.FootprintModule
         </distribution.modules>
     </properties>
 
@@ -53,186 +60,84 @@
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
         </dependency>
-        <dependency>
-            <groupId>net.jmob</groupId>
-            <artifactId>guice.conf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.inject.extensions</groupId>
-            <artifactId>guice-multibindings</artifactId>
-        </dependency>
-        <!-- ODL -->
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-core-api</artifactId>
-        </dependency>
-        <!-- ODL-Restconf -->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>sal-rest-connector</artifactId>
-        </dependency>
-        <!-- ODL-Netconf -->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-ssh</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>mdsal-netconf-notification</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>mdsal-netconf-monitoring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>mdsal-netconf-connector</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-monitoring</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>ietf-netconf-monitoring-extension</artifactId>
-        </dependency>
-        <!-- ODL-BGP -->
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-rib-impl</artifactId>
-            <!-- TODO remove exclusion after bumping to Boron-SR4 -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.powermock</groupId>
-                    <artifactId>powermock</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-openconfig-impl</artifactId>
-        </dependency>
-        <!-- BGP extensions -->
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-evpn</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-inet</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-labeled-unicast</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-linkstate</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>bgp-l3vpn</artifactId>
-        </dependency>
 
-        <!-- Jersey + Jetty for RESTCONF -->
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-        </dependency>
+        <!-- Distribution core -->
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-webapp</artifactId>
+            <groupId>io.fd.honeycomb</groupId>
+            <artifactId>minimal-distribution-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
+
+        <!-- Northbound interfaces -->
         <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlets</artifactId>
+            <groupId>io.fd.honeycomb.northbound</groupId>
+            <artifactId>common</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
+            <groupId>io.fd.honeycomb.northbound</groupId>
+            <artifactId>restconf</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
+            <groupId>io.fd.honeycomb.northbound</groupId>
+            <artifactId>netconf</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
+            <groupId>io.fd.honeycomb.northbound</groupId>
+            <artifactId>bgp</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
-        <!-- OSGI Even tough not running in OSGI, dependency needs to be here since some deprecated MD-SAL APIs rely on osgi core -->
+        <!-- Bgp extension modules -->
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <scope>compile</scope>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>extension-common</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
-        <!-- HC -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>data-impl</artifactId>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>evpn</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>honeycomb-impl</artifactId>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>inet</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>notification-impl</artifactId>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>l3-vpn-v4</artifactId>
             <version>${project.version}</version>
         </dependency>
+
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>rpc-impl</artifactId>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>l3-vpn-v6</artifactId>
             <version>${project.version}</version>
         </dependency>
 
-        <!-- Utilities -->
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>linkstate</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.mashape.unirest</groupId>
-            <artifactId>unirest-java</artifactId>
-            <version>1.4.9</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.jcraft</groupId>
-            <artifactId>jsch</artifactId>
-            <version>0.1.54</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
+            <groupId>io.fd.honeycomb.northbound.bgp</groupId>
+            <artifactId>labeled-unicast</artifactId>
+            <version>${project.version}</version>
         </dependency>
+
+        <!-- Footprint api -->
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
+            <groupId>io.fd.honeycomb.footprint</groupId>
+            <artifactId>impl</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>