X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fcommons%2Fopendaylight%2Fpom.xml;h=16eb5cbb9e5146cdce80038c3c8bbccfe7fe6042;hp=12facdb4a368cf02a5c278cff13e0d0e257dea10;hb=1a306f228ccbdbb6c5d302a1f8e24e5f4de4f0e0;hpb=897d1f26967240bfc07a041a665fd7680081e721

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 12facdb4a3..16eb5cbb9e 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
@@ -10,13 +11,10 @@
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>commons.opendaylight</artifactId>
-  <version>1.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
-    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
-    <akka.version>2.3.14</akka.version>
     <appauth.version>0.7.0-SNAPSHOT</appauth.version>
     <archetype-app-northbound>0.3.0-SNAPSHOT</archetype-app-northbound>
     <arphandler.version>0.8.0-SNAPSHOT</arphandler.version>
@@ -82,20 +80,22 @@
     <hosttracker_new.api.version>0.7.0-SNAPSHOT</hosttracker_new.api.version>
     <hosttracker_new.implementation.version>0.7.0-SNAPSHOT</hosttracker_new.implementation.version>
     <httpservice-bridge.northbound.version>0.3.0-SNAPSHOT</httpservice-bridge.northbound.version>
-    <ietf-inet-types.version>2010.09.24.9-SNAPSHOT</ietf-inet-types.version>
+    <ietf-inet-types.version>1.1.0-SNAPSHOT</ietf-inet-types.version>
     <ietf-restconf.version>2013.10.19.9-SNAPSHOT</ietf-restconf.version>
     <ietf-topology.version>2013.10.21.9-SNAPSHOT</ietf-topology.version>
-    <ietf-yang-types.version>2010.09.24.9-SNAPSHOT</ietf-yang-types.version>
+    <ietf-yang-types.version>2013.07.15.9-SNAPSHOT</ietf-yang-types.version>
     <jdepend.maven.plugin.version>2.0-beta-2</jdepend.maven.plugin.version>
-    <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
+
+    <!-- Path prefix where we generate configuration subsystem bindings -->
+    <jmxGeneratorPath>target/generated-sources/config-binding</jmxGeneratorPath>
+
     <jolokia-bridge.version>0.3.0-SNAPSHOT</jolokia-bridge.version>
     <karaf.branding.version>1.3.0-SNAPSHOT</karaf.branding.version>
     <karaf.shell.version>${karaf.version}</karaf.shell.version>
-    <leveldb.version>0.7</leveldb.version>
-    <leveldbjni.version>1.8-odl</leveldbjni.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
     <logging.bridge.version>0.7.0-SNAPSHOT</logging.bridge.version>
     <maven.plugin.api.version>3.0.5</maven.plugin.api.version>
+    <!-- mdsal version for controller, not mdsal -->
     <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
     <networkconfig.bridgedomain.northbound.version>0.3.0-SNAPSHOT</networkconfig.bridgedomain.northbound.version>
     <!-- ODL repository / plugin repository -->
@@ -105,7 +105,6 @@
     <northbound.jolokia.version>1.7.0-SNAPSHOT</northbound.jolokia.version>
     <opendaylight-l2-types.version>2013.08.27.9-SNAPSHOT</opendaylight-l2-types.version>
     <osgi-brandfragment.web.version>0.3.0-SNAPSHOT</osgi-brandfragment.web.version>
-    <protobuf.version>2.5.0</protobuf.version>
     <protocol-framework.version>0.8.0-SNAPSHOT</protocol-framework.version>
     <protocol_plugins.openflow.version>0.7.0-SNAPSHOT</protocol_plugins.openflow.version>
     <protocol_plugins.stub.version>0.7.0-SNAPSHOT</protocol_plugins.stub.version>
@@ -114,13 +113,15 @@
     <sal.implementation.version>0.7.0-SNAPSHOT</sal.implementation.version>
     <sal.networkconfiguration.version>0.3.0-SNAPSHOT</sal.networkconfiguration.version>
     <sal.version>0.11.0-SNAPSHOT</sal.version>
-    <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+
+    <!-- Path prefix where we generate YANG Java Bindings. This really should be inherited
+         from mdsal's binding-parent -->
+    <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
+
     <samples.loadbalancer>0.8.0-SNAPSHOT</samples.loadbalancer>
     <samples.loadbalancer.northbound.version>0.7.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.7.0-SNAPSHOT</samples.simpleforwarding.version>
     <sanitytest.version>0.7.0-SNAPSHOT</sanitytest.version>
-    <scala.version>2.11</scala.version>
-    <scala.micro.version>7</scala.micro.version>
     <security.version>0.7.0-SNAPSHOT</security.version>
     <karaf.security.version>0.7.0-SNAPSHOT</karaf.security.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
@@ -139,13 +140,12 @@
     <switchmanager.api.version>0.10.0-SNAPSHOT</switchmanager.api.version>
     <switchmanager.implementation.version>0.7.0-SNAPSHOT</switchmanager.implementation.version>
     <switchmanager.northbound.version>0.7.0-SNAPSHOT</switchmanager.northbound.version>
-    <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
+    <testvm.argLine>-Xmx1024m</testvm.argLine>
     <topology.northbound.version>0.7.0-SNAPSHOT</topology.northbound.version>
     <topology.web.version>0.7.0-SNAPSHOT</topology.web.version>
     <topologymanager.version>0.7.0-SNAPSHOT</topologymanager.version>
     <topologymanager.shell.version>1.3.0-SNAPSHOT</topologymanager.shell.version>
     <troubleshoot.web.version>0.7.0-SNAPSHOT</troubleshoot.web.version>
-    <uncommons.maths.version>1.2.2a</uncommons.maths.version>
     <usermanager.implementation.version>0.7.0-SNAPSHOT</usermanager.implementation.version>
     <usermanager.northbound.version>0.3.0-SNAPSHOT</usermanager.northbound.version>
     <usermanager.version>0.7.0-SNAPSHOT</usermanager.version>
@@ -153,7 +153,7 @@
     <web.version>0.7.0-SNAPSHOT</web.version>
     <yang-ext.version>2013.09.07.9-SNAPSHOT</yang-ext.version>
     <yang-jmx-generator.version>1.3.0-SNAPSHOT</yang-jmx-generator.version>
-    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     <jmh.version>0.9.7</jmh.version>
   </properties>
 
@@ -223,12 +223,6 @@
         <version>${codahale.metrics.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>com.lmax</groupId>
-        <artifactId>disruptor</artifactId>
-        <version>3.3.0</version>
-      </dependency>
-
       <!-- 3rd party dependencies needed by config-->
       <dependency>
         <groupId>org.apache.maven</groupId>
@@ -237,44 +231,6 @@
         <scope>provided</scope>
       </dependency>
 
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-actor_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-cluster_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-persistence-experimental_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-remote_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.typesafe.akka</groupId>
-        <artifactId>akka-testkit_${scala.version}</artifactId>
-        <version>${akka.version}</version>
-      </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-osgi_${scala.version}</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-slf4j_${scala.version}</artifactId>
-            <version>${akka.version}</version>
-        </dependency>
       <dependency>
         <groupId>net.sourceforge.pmd</groupId>
         <artifactId>pmd</artifactId>
@@ -285,43 +241,6 @@
         <artifactId>gmaven-runtime-2.0</artifactId>
         <version>1.5</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse</groupId>
-        <artifactId>jdt</artifactId>
-        <version>3.3.0-v20070607-1300</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.equinox</groupId>
-        <artifactId>app</artifactId>
-        <version>1.0.0-v20070606</version>
-      </dependency>
-      <dependency>
-        <groupId>org.uncommons.maths</groupId>
-        <artifactId>uncommons-maths</artifactId>
-        <version>${uncommons.maths.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>${protobuf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.iq80.leveldb</groupId>
-        <artifactId>leveldb</artifactId>
-        <version>${leveldb.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.fusesource.leveldbjni</groupId>
-        <artifactId>leveldbjni-all</artifactId>
-        <version>${leveldbjni.version}</version>
-      </dependency>
-
-      <!-- equinox http service bridge -->
-      <dependency>
-        <groupId>org.eclipse.jdt</groupId>
-        <artifactId>core</artifactId>
-        <version>3.3.0-v_771</version>
-      </dependency>
 
       <!-- md-sal -->
       <dependency>
@@ -781,16 +700,6 @@
         <artifactId>reflections</artifactId>
         <version>0.9.9-RC1</version>
       </dependency>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-library</artifactId>
-        <version>${scala.version}.${scala.micro.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.scala-lang</groupId>
-        <artifactId>scala-reflect</artifactId>
-        <version>${scala.version}.${scala.micro.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>commons.logback_settings</artifactId>
@@ -1011,19 +920,6 @@
                     </execute>
                   </action>
                 </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <versionRange>[2.0,)</versionRange>
-                    <goals>
-                      <goal>check</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.opendaylight.yangtools</groupId>
@@ -1119,7 +1015,7 @@
             <dependency>
               <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>0.9.0-SNAPSHOT</version>
+              <version>${mdsal.model.version}</version>
               <type>jar</type>
             </dependency>
             <dependency>
@@ -1292,32 +1188,9 @@
           <linkJavadoc>true</linkJavadoc>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${projectinfo}</version>
-        <configuration>
-          <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
-          <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>index</report>
-              <report>project-team</report>
-              <report>license</report>
-              <report>mailing-list</report>
-              <report>plugin-management</report>
-              <report>cim</report>
-              <report>issue-tracking</report>
-              <report>scm</report>
-              <report>summary</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
     </plugins>
   </reporting>
+
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
@@ -1351,18 +1224,6 @@
   </distributionManagement>
 
   <profiles>
-    <profile>
-      <id>IDE</id>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-      </activation>
-      <build>
-        <!-- Put the IDE's build output in a folder other than target, so that IDE builds don't interact with Maven builds -->
-        <directory>target-ide</directory>
-      </build>
-    </profile>
     <profile>
       <id>viewbuild</id>
       <activation>