From: Tony Tkacik <ttkacik@cisco.com>
Date: Wed, 3 Dec 2014 10:27:44 +0000 (+0000)
Subject: Merge "Add MD-SAL artifacts"
X-Git-Tag: release/lithium~805
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=191ad68d71f30f6ad6258ac458c60c663e5b1b85;hp=-c

Merge "Add MD-SAL artifacts"
---

191ad68d71f30f6ad6258ac458c60c663e5b1b85
diff --combined opendaylight/commons/opendaylight/pom.xml
index 9b9564a793,135b013ae6..8596412de8
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -87,7 -87,6 +87,7 @@@
      <controllermanager.northbound.version>0.1.0-SNAPSHOT</controllermanager.northbound.version>
      <devices.web.version>0.5.0-SNAPSHOT</devices.web.version>
      <dummy-console.version>1.2.0-SNAPSHOT</dummy-console.version>
 +    <config.statistics.manager.configfile>30-statistics-manager.xml</config.statistics.manager.configfile>
      <eclipse.persistence.version>2.5.0</eclipse.persistence.version>
      <eclipse.jdt.core.compiler.batch.version>3.8.0.I20120518-2145</eclipse.jdt.core.compiler.batch.version>
      <!-- enforcer version -->
@@@ -208,6 -207,7 +208,6 @@@
      <usermanager.version>0.5.0-SNAPSHOT</usermanager.version>
      <nsf.version>0.5.0-SNAPSHOT</nsf.version>
      <web.version>0.5.0-SNAPSHOT</web.version>
 -    <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
      <yang-ext.version>2013.09.07.7-SNAPSHOT</yang-ext.version>
      <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
      <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
@@@ -226,6 -226,13 +226,13 @@@
          <type>pom</type>
          <scope>import</scope>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.controller</groupId>
+         <artifactId>mdsal-artifacts</artifactId>
+         <version>${mdsal.version}</version>
+         <type>pom</type>
+         <scope>import</scope>
+       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>netconf-artifacts</artifactId>
@@@ -751,6 -758,11 +758,6 @@@
        </dependency>
  
        <!-- md-sal -->
 -      <dependency>
 -        <groupId>org.eclipse.xtend</groupId>
 -        <artifactId>org.eclipse.xtend.lib</artifactId>
 -        <version>${xtend.version}</version>
 -      </dependency>
        <dependency>
          <groupId>org.glassfish.jersey.test-framework.providers</groupId>
          <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
@@@ -1051,155 -1063,6 +1058,6 @@@
          <artifactId>sal</artifactId>
          <version>${sal.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-binding-api</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-binding-broker-impl</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-util</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-broker-impl</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-common</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-common-util</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-inmemory-datastore</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-compatibility</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-connector-api</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-dom-xsql</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-karaf-xsql</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-dom-xsql-config</artifactId>
-         <version>${mdsal.version}</version>
-         <classifier>config</classifier>
-         <type>xml</type>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-core-api</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-core-spi</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-netconf-connector</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-remote</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-rest-connector</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-rest-connector-config</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>md-sal-config</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-rest-docgen</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-restconf-broker</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-test-model</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-distributed-datastore</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-         <dependency>
-             <groupId>org.opendaylight.controller</groupId>
-             <artifactId>sal-clustering-commons</artifactId>
-             <version>${mdsal.version}</version>
-         </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-clustering-config</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
- 
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-remoterpc-connector</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
- 
  
        <!-- SAL Extension bundles -->
        <dependency>
@@@ -1343,77 -1206,7 +1201,7 @@@
          <artifactId>web</artifactId>
          <version>${web.version}</version>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.md</groupId>
-         <artifactId>forwardingrules-manager</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.md</groupId>
-         <artifactId>inventory-manager</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.md</groupId>
-         <artifactId>statistics-manager</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.md</groupId>
-         <artifactId>topology-lldp-discovery</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.md</groupId>
-         <artifactId>topology-manager</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.model</groupId>
-         <artifactId>model-flow-base</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.model</groupId>
-         <artifactId>model-flow-service</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.model</groupId>
-         <artifactId>model-flow-statistics</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.model</groupId>
-         <artifactId>model-inventory</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.model</groupId>
-         <artifactId>model-topology</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
-       <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>toaster-config</artifactId>
-         <version>${mdsal.version}</version>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>features-test</artifactId>
@@@ -1428,22 -1221,6 +1216,6 @@@
          <type>xml</type>
          <scope>runtime</scope>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller.samples</groupId>
-         <artifactId>features-toaster</artifactId>
-         <version>${mdsal.version}</version>
-         <classifier>features</classifier>
-         <type>xml</type>
-         <scope>runtime</scope>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>features-flow</artifactId>
-         <version>${mdsal.version}</version>
-         <classifier>features</classifier>
-         <type>xml</type>
-         <scope>runtime</scope>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>com.sun.jersey.jersey-servlet</artifactId>
@@@ -1533,19 -1310,6 +1305,6 @@@
          <version>0.1.0-SNAPSHOT</version>
          <scope>test</scope>
        </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-binding-broker-impl</artifactId>
-         <version>${mdsal.version}</version>
-         <type>test-jar</type>
-         <scope>test</scope>
-       </dependency>
-       <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>sal-binding-it</artifactId>
-         <version>${mdsal.version}</version>
-         <scope>test</scope>
-       </dependency>
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>features-protocol-framework</artifactId>
@@@ -1579,21 -1343,14 +1338,14 @@@
          <scope>runtime</scope>
        </dependency>
        <dependency>
-         <groupId>org.opendaylight.controller</groupId>
-         <artifactId>features-mdsal</artifactId>
-         <version>${mdsal.version}</version>
-         <classifier>features</classifier>
-         <type>xml</type>
-         <scope>runtime</scope>
-       </dependency>
-     <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>features-netconf-connector</artifactId>
          <version>${mdsal.version}</version>
          <classifier>features</classifier>
          <type>xml</type>
          <scope>runtime</scope>
-     </dependency>
+       </dependency>
+ 
        <!-- JMH Benchmark dependencies -->
        <dependency>
          <groupId>org.openjdk.jmh</groupId>
@@@ -1631,6 -1388,12 +1383,6 @@@
            <artifactId>maven-clean-plugin</artifactId>
            <configuration>
              <filesets>
 -              <fileset>
 -                <directory>${xtend.dstdir}</directory>
 -                <includes>
 -                  <include>**</include>
 -                </includes>
 -              </fileset>
                <fileset>
                  <directory>${jmxGeneratorPath}</directory>
                  <includes>
@@@ -1744,6 -1507,7 +1496,6 @@@
                    <source>src/main/yang</source>
                    <source>${jmxGeneratorPath}</source>
                    <source>${salGeneratorPath}</source>
 -                  <source>${xtend.dstdir}</source>
                  </sources>
                </configuration>
              </execution>
@@@ -1885,6 -1649,21 +1637,6 @@@
              </lifecycleMappingMetadata>
            </configuration>
          </plugin>
 -        <plugin>
 -          <groupId>org.eclipse.xtend</groupId>
 -          <artifactId>xtend-maven-plugin</artifactId>
 -          <version>${xtend.version}</version>
 -          <executions>
 -            <execution>
 -              <goals>
 -                <goal>compile</goal>
 -              </goals>
 -              <configuration>
 -                <outputDirectory>${xtend.dstdir}</outputDirectory>
 -              </configuration>
 -            </execution>
 -          </executions>
 -        </plugin>
          <plugin>
            <groupId>org.jacoco</groupId>
            <artifactId>jacoco-maven-plugin</artifactId>
@@@ -1945,7 -1724,7 +1697,7 @@@
            <includeTestSourceDirectory>true</includeTestSourceDirectory>
            <sourceDirectory>${project.basedir}</sourceDirectory>
            <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
 -          <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/xtend-gen\/,**\/protobuff\/</excludes>
 +          <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/protobuff\/</excludes>
          </configuration>
          <dependencies>
            <dependency>
diff --combined opendaylight/md-sal/pom.xml
index b57b2ddf15,f2ba547b13..6c87899eea
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@@ -14,6 -14,8 +14,8 @@@
    <packaging>pom</packaging>
  
    <modules>
+     <module>mdsal-artifacts</module>
+ 
      <!-- Common APIs & Implementation -->
      <module>sal-common</module>
      <module>sal-common-api</module>
@@@ -51,7 -53,6 +53,7 @@@
  
      <module>inventory-manager</module>
      <module>statistics-manager</module>
 +    <module>statistics-manager-config</module>
      <module>topology-manager</module>
      <module>forwardingrules-manager</module>
      <module>topology-lldp-discovery</module>
@@@ -159,6 -160,11 +161,6 @@@
              </lifecycleMappingMetadata>
            </configuration>
          </plugin>
 -        <plugin>
 -          <groupId>org.eclipse.xtend</groupId>
 -          <artifactId>xtend-maven-plugin</artifactId>
 -          <version>${xtend.version}</version>
 -        </plugin>
          <plugin>
            <groupId>org.jacoco</groupId>
            <artifactId>jacoco-maven-plugin</artifactId>