Allow shard settle timeout to be tuned

[controller.git] / opendaylight / md-sal / mdsal-it-parent / pom.xml

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index b73d604bd850c2aa4f76297009dadd4f8e0c7276..d8878e039c80075ce1a578af725327362f3a746e 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- vi: set et smarttab sw=4 tabstop=4: --><!--
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--

 Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
 This program and the accompanying materials are made available under the
 Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
 
 This program and the accompanying materials are made available under the


@@ -12,20 +13,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>3.0.2</version>
+    <version>6.0.1</version>

     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-parent</artifactId>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>mdsal-it-parent</artifactId>

-  <version>1.8.0-SNAPSHOT</version>
+  <version>1.11.0-SNAPSHOT</version>

   <packaging>pom</packaging>
 
   <properties>
   <packaging>pom</packaging>
 
   <properties>

-    <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
+    <mdsal.version>1.11.0-SNAPSHOT</mdsal.version>

     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>

-    <karaf.distro.version>3.0.2</karaf.distro.version>

     <karaf.distro.type>zip</karaf.distro.type>
     <karaf.keep.unpack>false</karaf.keep.unpack>
   </properties>
     <karaf.distro.type>zip</karaf.distro.type>
     <karaf.keep.unpack>false</karaf.keep.unpack>
   </properties>


@@ -66,37 +66,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-features</artifactId>
         <type>xml</type>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-features</artifactId>
         <type>xml</type>

-
-        <!-- FIXME: remove version declaration and scope once odlparent has this -->
-        <version>${exam.version}</version>
-        <scope>test</scope>

     </dependency>
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-extender-service</artifactId>
     </dependency>
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-extender-service</artifactId>

-
-        <!-- FIXME: remove version declaration and scope once odlparent has this -->
-        <version>${exam.version}</version>
-        <scope>test</scope>

     </dependency>
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-inject</artifactId>
     </dependency>
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-inject</artifactId>

-
-        <!-- FIXME: remove version declaration and scope once odlparent has this -->
-        <version>${exam.version}</version>
-        <scope>test</scope>

     </dependency>
     </dependency>

-

     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-invoker-junit</artifactId>
     <dependency>
         <groupId>org.ops4j.pax.exam</groupId>
         <artifactId>pax-exam-invoker-junit</artifactId>

-
-        <!-- FIXME: remove version declaration and scope once odlparent has this -->
-        <version>${exam.version}</version>
-        <scope>test</scope>

     </dependency>
     </dependency>

-

     <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>
     <dependency>
         <groupId>org.ops4j.pax.url</groupId>
         <artifactId>pax-url-aether</artifactId>


@@ -131,7 +113,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <plugins>
       <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
     <plugins>
       <plugin>
           <artifactId>maven-surefire-plugin</artifactId>

-          <version>${maven.surefire.version}</version>

           <configuration>
               <systemPropertyVariables>
                 <!-- CONTROLLER-1799: Use the same repository for Pax Exam as is used for Maven -->
           <configuration>
               <systemPropertyVariables>
                 <!-- CONTROLLER-1799: Use the same repository for Pax Exam as is used for Maven -->


@@ -204,7 +185,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
            <configuration>
             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
             <groupId>org.opendaylight.controller</groupId>
            <configuration>
             <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
             <groupId>org.opendaylight.controller</groupId>

-            <includeArtifactIds>mockito-core,objenesis,config-it-base,mdsal-it-base</includeArtifactIds>
+            <includeArtifactIds>mockito-core,objenesis,mdsal-it-base</includeArtifactIds>

             <excludes>META-INF\/**</excludes>
             <ignorePermissions>false</ignorePermissions>
            </configuration>
             <excludes>META-INF\/**</excludes>
             <ignorePermissions>false</ignorePermissions>
            </configuration>