X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fpom.xml;h=9120c840d8bae4eeacb9093bf589e39e509cba18;hp=1b747f6ce8d6951dcc552c6943740253539adb57;hb=25a2051acf9b3095b33776bf4e269c7fd5dc678a;hpb=a92d9d6a21a0f6ca8d2153795721f500eaf29ee9

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 1b747f6ce8..9120c840d8 100644
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -69,6 +69,11 @@
           <artifactId>sal-binding-api</artifactId>
           <version>${mdsal.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-config</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-broker-impl</artifactId>
@@ -76,7 +81,7 @@
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
-          <artifactId>sal-compability</artifactId>
+          <artifactId>sal-compatibility</artifactId>
           <version>${mdsal.version}</version>
         </dependency>
         <dependency>
@@ -109,6 +114,11 @@
           <artifactId>model-flow-statistics</artifactId>
           <version>${mdsal.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-management</artifactId>
+          <version>${mdsal.version}</version>
+        </dependency>
 
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -188,42 +198,227 @@
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-api</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-impl</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-util</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-client</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>netconf-mapping-api</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-netconf-connector</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>config-persister-impl</artifactId>
-          <version>${config.version}</version>
+          <version>${netconf.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.thirdparty</groupId>
+          <artifactId>exificient</artifactId>
+          <version>${exi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
+            <version>2.11.0_1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.birt.runtime.3_7_1</groupId>
+            <artifactId>org.apache.xml.resolver</artifactId>
+            <version>1.2.0</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-impl</artifactId>
+          <version>0.5.9-SNAPSHOT</version>
+         </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>
+
+        <dependency>
+         <groupId>org.opendaylight.controller.thirdparty</groupId>
+         <artifactId>ganymed</artifactId>
+        </dependency>
       </dependencies>
     </profile>
+    <profile>
+      <id>integrationtests</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <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>
+            <version>1.2.1</version>
+            <executions>
+              <execution>
+                <id>sanity-test</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <executable>${java.home}/bin/java</executable>
+              <arguments>
+                <argument>-cp</argument>
+                <argument>./target/dependency/*</argument>
+                <argument>org.opendaylight.controller.distribution.Sanity</argument>
+              </arguments>
+              <environmentVariables>
+                <JAVA_HOME>
+                  ${java.home}
+                </JAVA_HOME>
+              </environmentVariables>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
   <artifactId>distribution.opendaylight</artifactId>
@@ -304,7 +499,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>statisticsmanager</artifactId>
-      <version>${controller.version}</version>
+      <version>${statisticsmanager.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -344,7 +539,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
-      <version>${controller.version}</version>
+      <version>${forwardingrulesmanager.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -506,7 +701,31 @@
       <artifactId>httpservice-bridge</artifactId>
       <version>0.0.1-SNAPSHOT</version>
     </dependency>
-
+    <dependency>
+      <groupId>org.jolokia</groupId>
+      <artifactId>jolokia-osgi</artifactId>
+      <version>${jolokia.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>jolokia-bridge</artifactId>
+      <version>${jolokia.bridge.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>connectionmanager.northbound</artifactId>
+      <version>${connectionmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>usermanager.northbound</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>controllermanager.northbound</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+    </dependency>
     <!-- Debug and logging -->
 
     <dependency>
@@ -711,6 +930,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
+      <version>2.2.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -975,10 +1195,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>
@@ -1029,109 +1245,13 @@
      <version>${commons.httpclient.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>antlr-runtime-osgi</artifactId>
-     <version>4.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-     <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-     <artifactId>xtend-lib-osgi</artifactId>
-     <version>2.4.2-SNAPSHOT</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.controller</groupId>
       <artifactId>sanitytest</artifactId>
       <version>${controller.version}</version>
     </dependency>
 
+
   </dependencies>
 
 
@@ -1174,54 +1294,6 @@
           </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>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <id>sanity-test</id>
-            <phase>package</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-          </execution>
-        </executions>
-          <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>