Code Review / lispflowmapping.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Move karaf shell commands to the config subsystem
[lispflowmapping.git] / commons / parent / pom.xml
diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 3d850aa3e4c265270a633cd25caba948869a20b3..fb7bc63c24f5d7dfbb5962eb75a56b3fd8b71a01 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -15,64 +15,70 @@
          for plugin configuration etc. -->
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.lispflowmapping</groupId>
   <artifactId>lispflowmapping-commons</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Parent POM</name>
-  <description></description>
 
   <properties>
-    <branding.version>1.1.0-SNAPSHOT</branding.version>
+    <branding.version>1.2.0-SNAPSHOT</branding.version>
     <build.suffix>1.0.0</build.suffix>
-    <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
-    <config.version>0.3.0-SNAPSHOT</config.version>
-    <feature.test.version>0.7.0-SNAPSHOT</feature.test.version>
+    <config.version>0.4.0-SNAPSHOT</config.version>
+    <dlux.loader.version>0.3.0-SNAPSHOT</dlux.loader.version>
+    <dlux.core.version>0.3.0-SNAPSHOT</dlux.core.version>
     <forwardingrulesmanager.version>0.5.0</forwardingrulesmanager.version>
-    <ietf-inet-types.version>2010.09.24.7-SNAPSHOT</ietf-inet-types.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-    <karaf.empty.version>1.5.0-SNAPSHOT</karaf.empty.version>
-    <karaf.resources.version>1.5.0-SNAPSHOT</karaf.resources.version>
-    <lispflowmapping.version>1.2.0-SNAPSHOT</lispflowmapping.version>
-    <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
-    <neutron.version>0.5.0-SNAPSHOT</neutron.version>
+    <karaf.empty.version>1.6.0-SNAPSHOT</karaf.empty.version>
+    <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
+    <lispflowmapping.version>1.3.0-SNAPSHOT</lispflowmapping.version>
+    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <neutron.version>0.6.0-SNAPSHOT</neutron.version>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-    <nsf.version>0.5.0-SNAPSHOT</nsf.version>
-    <sal.version>0.9.0-SNAPSHOT</sal.version>
+    <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <sal.version>0.10.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-    <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <sonar.jacoco.reportPath>target/jacoco.exec</sonar.jacoco.reportPath>
-    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <statisticsmanager.version>0.5.0</statisticsmanager.version>
     <xtend.dstdir>src/main/xtend-gen</xtend.dstdir>
-    <yang-jmx-generator.version>1.1.0-SNAPSHOT</yang-jmx-generator.version>
-    <yang.binding.version>0.6.1</yang.binding.version>
-    <yang.codegen.version>0.6.1</yang.codegen.version>
     <yang.src.path>src/main/yang</yang.src.path>
-    <yang.version>0.6.1</yang.version>
-    <yangtools.binding.version>0.6.1</yangtools.binding.version>
-    <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
       <!-- NOTE: The "Type" jar is considered default. You only need to specify
                  the type when it is something other than jar. -->
+      <dependency>
+       <groupId>org.opendaylight.yangtools</groupId>
+       <artifactId>yangtools-artifacts</artifactId>
+       <version>0.8.0-SNAPSHOT</version>
+       <type>pom</type>
+      <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+        <type>pom</type>
+       <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>0.8.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>junit-addons</groupId>
         <artifactId>junit-addons</artifactId>
         <version>1.4</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.karaf.features</groupId>
-        <artifactId>framework</artifactId>
-        <version>${karaf.version}</version>
-        <type>kar</type>
-      </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-core</artifactId>
@@ -80,7 +86,7 @@
       </dependency>
       <dependency>
         <groupId>org.jmock</groupId>
-        <artifactId>jmock-junit4</artifactId>
+        <artifactId>jmock</artifactId>
         <version>2.6.0</version>
       </dependency>
       <dependency>
@@ -88,20 +94,10 @@
         <artifactId>jmock-legacy</artifactId>
         <version>2.6.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>clustering.services</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>commons.northbound</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-api</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -111,47 +107,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-util</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>containermanager</artifactId>
-        <version>0.6.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-adsal</artifactId>
-        <version>${sal.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-mdsal</artifactId>
-        <version>${mdsal.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-netconf-connector</artifactId>
-        <version>${mdsal.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.neutron</groupId>
-        <artifactId>features-neutron</artifactId>
-        <version>${neutron.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-nsf</artifactId>
-        <version>${nsf.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
@@ -165,11 +121,6 @@
         <artifactId>netty-event-executor-config</artifactId>
         <version>${config.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.neutron</groupId>
-        <artifactId>neutron-spi</artifactId>
-        <version>0.5.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>opendaylight-karaf-empty</artifactId>
@@ -182,11 +133,6 @@
         <artifactId>opendaylight-karaf-resources</artifactId>
         <version>${karaf.resources.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal</artifactId>
-        <version>0.9.0-SNAPSHOT</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>sal-binding-api</artifactId>
@@ -212,11 +158,6 @@
         <artifactId>sal-common-util</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>threadpool-config-api</artifactId>
@@ -225,7 +166,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>threadpool-config-impl</artifactId>
-        <version>0.3.0-SNAPSHOT</version>
+        <version>0.4.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -247,25 +188,14 @@
         <artifactId>mappingservice.api</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>mappingservice.clusterdao</artifactId>
-        <version>${lispflowmapping.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>mappingservice.config</artifactId>
-        <version>${lispflowmapping.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.implementation</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>mappingservice.netconf</artifactId>
+        <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
       <dependency>
@@ -280,75 +210,18 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>mappingservice.southbound</artifactId>
+        <artifactId>mappingservice.shell</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>mappingservice.yangmodel</artifactId>
+        <artifactId>mappingservice.southbound</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-binding</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-common</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-data-api</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-data-impl</artifactId>
-        <version>${yangtools.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-data-util</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-model-api</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yang-parser-impl</artifactId>
-        <version>${yangtools.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-inet-types</artifactId>
-        <version>2010.09.24.7-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools.model</groupId>
-        <artifactId>ietf-yang-types</artifactId>
-        <version>2010.09.24.7-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.karaf.features</groupId>
-        <artifactId>standard</artifactId>
-        <version>${karaf.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-        <scope>runtime</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>features-lispflowmapping</artifactId>
+        <artifactId>mappingservice.lisp-proto</artifactId>
         <version>${lispflowmapping.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-        <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
@@ -362,6 +235,11 @@
         <version>${yangtools.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.lispflowmapping</groupId>
+        <artifactId>ui-lispflowmapping</artifactId>
+        <version>${lispflowmapping.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -468,20 +346,6 @@
             <javadocDir>target/apidocs</javadocDir>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.enunciate</groupId>
-          <artifactId>maven-enunciate-plugin</artifactId>
-          <configuration>
-            <configFile>enunciate.xml</configFile>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>docs</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
         <plugin>
           <!-- TODO: This should be in ODL parent -->
           <groupId>org.codehaus.mojo</groupId>
@@ -525,19 +389,6 @@
                     <ignore></ignore>
                   </action>
                 </pluginExecution>
-                <pluginExecution>
-                  <pluginExecutionFilter>
-                    <groupId>org.codehaus.enunciate</groupId>
-                    <artifactId>maven-enunciate-plugin</artifactId>
-                    <versionRange>[0.0,)</versionRange>
-                    <goals>
-                      <goal>docs</goal>
-                    </goals>
-                  </pluginExecutionFilter>
-                  <action>
-                    <ignore></ignore>
-                  </action>
-                </pluginExecution>
                 <pluginExecution>
                   <pluginExecutionFilter>
                     <groupId>org.jacoco</groupId>
@@ -605,7 +456,7 @@
           <version>${yangtools.version}</version>
           <dependencies>
             <dependency>
-              <groupId>org.opendaylight.yangtools</groupId>
+              <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
               <version>${yangtools.version}</version>
             </dependency>
@@ -632,37 +483,8 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>prepare-ut-agent</id>
-            <phase>process-test-classes</phase>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-            <configuration>
-              <destFile>${sonar.jacoco.reportPath}</destFile>
-            </configuration>
-          </execution>
-          <execution>
-            <id>prepare-it-agent</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-            <configuration>
-              <destFile>${sonar.jacoco.itReportPath}</destFile>
-            </configuration>
-          </execution>
-           <execution>
-             <id>post-test</id>
-             <phase>test</phase>
-             <goals>
-               <goal>report</goal>
-             </goals>
-           </execution>
-        </executions>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
OpenDaylight LISP Mapping Service