X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=174414433340124077df3ad0344fb88c9ab94eda;hb=99050b4a43221f1e82f2fb61bc4ea162c2c7e283;hp=e259296560f93eeee704fc0616ad389dfe29813c;hpb=a6963c06a8a13eee12d5e21295ba6a42b9957d5e;p=controller.git

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index e259296560..1744144333 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -54,6 +54,16 @@
           <artifactId>sal-core-spi</artifactId>
           <version>${mdsal.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-common-api</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-common-impl</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-api</artifactId>
@@ -105,8 +115,13 @@
           <artifactId>concepts</artifactId>
           <version>${concepts.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>concepts</artifactId>
+          <version>0.1.1-SNAPSHOT</version>
+        </dependency>
 
-        <!-- config
+        <!-- config-->
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-api</artifactId>
@@ -157,7 +172,158 @@
           <artifactId>logback-config</artifactId>
           <version>${config.version}</version>
         </dependency>
-        -->
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-persister-api</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-persister-file-adapter</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+
+
+       <!-- Netconf -->
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-api</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-impl</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-util</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-client</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>netconf-mapping-api</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-netconf-connector</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-persister-impl</artifactId>
+          <version>${config.version}</version>
+        </dependency>
+
+
+          <!-- toaster example I'm pretty sure we should trim -->
+
+         <dependency>
+          <groupId>org.opendaylight.controller.samples</groupId>
+          <artifactId>sample-toaster</artifactId>
+          <version>${mdsal.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.controller.samples</groupId>
+          <artifactId>sample-toaster-consumer</artifactId>
+          <version>${mdsal.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.controller.samples</groupId>
+          <artifactId>sample-toaster-provider</artifactId>
+          <version>${mdsal.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.controller.samples</groupId>
+          <artifactId>sample-toaster-it</artifactId>
+          <version>${mdsal.version}</version>
+         </dependency>
+
+         <!-- yangtools dependencies I'm pretty sure we can trim -->
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-binding</artifactId>
+          <version>0.6.0-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>binding-type-provider</artifactId>
+          <version>0.6.0-SNAPSHOT</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>binding-generator-util</artifactId>
+          <version>${yangtools.binding.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>binding-model-api</artifactId>
+          <version>${yangtools.binding.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>binding-generator-spi</artifactId>
+          <version>${yangtools.binding.version}</version>
+         </dependency>
+         <dependency>
+           <groupId>commons-lang</groupId>
+           <artifactId>commons-lang</artifactId>
+           <version>2.4</version>
+         </dependency>
+
+           <dependency>
+          <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+          <artifactId>antlr4-runtime-osgi-nohead</artifactId>
+          <version>4.0</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools.thirdparty</groupId>
+          <artifactId>xtend-lib-osgi</artifactId>
+          <version>2.4.3</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-parser-api</artifactId>
+          <version>${yangtools.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-model-util</artifactId>
+          <version>${yangtools.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-parser-impl</artifactId>
+          <version>${yangtools.version}</version>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-common</artifactId>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-data-api</artifactId>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-data-util</artifactId>
+         </dependency>
+         <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-model-api</artifactId>
+         </dependency>
+
+          <dependency>
+           <groupId>org.opendaylight.yangtools.model</groupId>
+           <artifactId>yang-ext</artifactId>
+          </dependency>
+
       </dependencies>
     </profile>
   </profiles>
@@ -351,6 +517,11 @@
       <artifactId>topology.web</artifactId>
       <version>${controller.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>osgi-brandfragment.web</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
 
     <!--  Neutron -->
 
@@ -432,6 +603,16 @@
       <artifactId>networkconfig.bridgedomain.northbound</artifactId>
       <version>${networkconfig.bridgedomain.northbound.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>httpservice-bridge</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>connectionmanager.northbound</artifactId>
+      <version>${connectionmanager.version}</version>
+    </dependency>
 
     <!-- Debug and logging -->
 
@@ -442,7 +623,6 @@
     </dependency>
 
     <!-- Southbound bundles -->
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>protocol_plugins.openflow</artifactId>
@@ -466,15 +646,6 @@
       <version>${controller.version}</version>
     </dependency>
 
-    <!-- Sanitytest
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sanitytest</artifactId>
-      <version>${controller.version}</version>
-    </dependency>
-
-    -->
-
     <!-- Third party depedencies -->
 
     <dependency>
@@ -864,6 +1035,23 @@
       <groupId>org.eclipse.persistence</groupId>
       <artifactId>org.eclipse.persistence.antlr</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.equinox.http</groupId>
+      <artifactId>servlet</artifactId>
+      <!--
+      <version>1.0.0-v20070606</version>
+      -->
+    </dependency>
+    <!-- felix webconsole -->
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.webconsole</artifactId>
+      <version>4.2.0</version>
+      <classifier>all</classifier>
+      <!-- the all bundle includes all the necessary plugins -->
+    </dependency>
+
     <!-- Third parties from opendaylight released -->
     <dependency>
       <groupId>org.opendaylight.controller.thirdparty</groupId>
@@ -894,10 +1082,6 @@
      <groupId>org.opendaylight.yangtools.model</groupId>
      <artifactId>opendaylight-l2-types</artifactId>
     </dependency>
-    <dependency>
-     <groupId>org.opendaylight.yangtools.model</groupId>
-     <artifactId>yang-ext</artifactId>
-    </dependency>
 
     <!-- bgppcep dependencies -->
     <dependency>
@@ -908,67 +1092,56 @@
      <groupId>org.opendaylight.bgpcep</groupId>
      <artifactId>util</artifactId>
     </dependency>
-
-    <!-- testing dependencies I'm pretty sure we should trim -->
-    <dependency>
-     <groupId>org.opendaylight.controller</groupId>
-     <artifactId>clustering.test</artifactId>
-     <version>${controller.version}</version>
-    </dependency>
     <dependency>
-     <groupId>org.opendaylight.controller</groupId>
-     <artifactId>commons.httpclient</artifactId>
-     <version>${commons.httpclient.version}</version>
+      <groupId>org.opendaylight.bgpcep</groupId>
+      <artifactId>framework</artifactId>
     </dependency>
 
-     <!-- toaster example I'm pretty sure we should trim -->
-
-    <dependency>
-     <groupId>org.opendaylight.controller.samples</groupId>
-     <artifactId>sample-toaster</artifactId>
-     <version>${mdsal.version}</version>
-    </dependency>
+    <!--Netty-->
     <dependency>
-     <groupId>org.opendaylight.controller.samples</groupId>
-     <artifactId>sample-toaster-consumer</artifactId>
-     <version>${mdsal.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
     </dependency>
     <dependency>
-     <groupId>org.opendaylight.controller.samples</groupId>
-     <artifactId>sample-toaster-provider</artifactId>
-     <version>${mdsal.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
     </dependency>
     <dependency>
-     <groupId>org.opendaylight.controller.samples</groupId>
-     <artifactId>sample-toaster-it</artifactId>
-     <version>${mdsal.version}</version>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
     </dependency>
-
-    <!-- yangtools dependencies I'm pretty sure we can trim -->
     <dependency>
-     <groupId>org.opendaylight.yangtools</groupId>
-     <artifactId>yang-binding</artifactId>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
     </dependency>
     <dependency>
-     <groupId>org.opendaylight.yangtools</groupId>
-     <artifactId>yang-common</artifactId>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
     </dependency>
+
+
+      <!-- testing dependencies I'm pretty sure we should trim -->
     <dependency>
-     <groupId>org.opendaylight.yangtools</groupId>
-     <artifactId>yang-data-api</artifactId>
+     <groupId>org.opendaylight.controller</groupId>
+     <artifactId>clustering.test</artifactId>
+     <version>${controller.version}</version>
     </dependency>
     <dependency>
-     <groupId>org.opendaylight.yangtools</groupId>
-     <artifactId>yang-data-util</artifactId>
+     <groupId>org.opendaylight.controller</groupId>
+     <artifactId>commons.httpclient</artifactId>
+     <version>${commons.httpclient.version}</version>
     </dependency>
+
     <dependency>
-     <groupId>org.opendaylight.yangtools</groupId>
-     <artifactId>yang-model-api</artifactId>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sanitytest</artifactId>
+      <version>${controller.version}</version>
     </dependency>
 
 
   </dependencies>
 
+
   <build>
     <plugins>
       <plugin>
@@ -1008,7 +1181,32 @@
           </execution>
         </executions>
       </plugin>
-      <!--
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
+          <executions>
+            <execution>
+              <id>copy</id>
+              <phase>package</phase>
+              <goals>
+                <goal>copy</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+            <artifactItems>
+              <artifactItem>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>sanitytest</artifactId>
+                <version>${controller.version}</version>
+                <type>jar</type>
+              </artifactItem>
+            </artifactItems>
+          </configuration>
+      </plugin>
+
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -1022,11 +1220,15 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <executable>./run.sh</executable>
-        </configuration>
+          <configuration>
+            <executable>java</executable>
+            <arguments>
+                <argument>-cp</argument>
+                <argument>./target/dependency/*</argument>
+                <argument>org.opendaylight.controller.distribution.Sanity</argument>
+            </arguments>
+          </configuration>
       </plugin>
-      -->
     </plugins>
   </build>
 </project>