Use mdsal-10.0.0

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

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 0f094a0a82f1cbf4d901001482c33dc5a5112619..18466aa0c34b1b7565aa4341d0793694e0ac8cca 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/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


@@ -7,42 +8,47 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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">
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <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>bundle-parent</artifactId>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>

-    <version>2.0.4</version>
+    <version>11.0.0</version>

     <relativePath/>
   </parent>
     <relativePath/>
   </parent>

-  <modelVersion>4.0.0</modelVersion>
+

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

-  <version>1.7.0-SNAPSHOT</version>
+  <version>6.0.0-SNAPSHOT</version>

   <packaging>bundle</packaging>
   <packaging>bundle</packaging>

-  <properties>
-    <config.version>0.8.0-SNAPSHOT</config.version>
-  </properties>
+

   <dependencyManagement>
     <dependencies>
       <dependency>
   <dependencyManagement>
     <dependencies>
       <dependency>

-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.mdsal</groupId>

         <artifactId>mdsal-artifacts</artifactId>
         <artifactId>mdsal-artifacts</artifactId>

+        <version>10.0.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>controller-artifacts</artifactId>

         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
         <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>

+

   <dependencies>
     <dependency>
   <dependencies>
     <dependency>

-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-it-base</artifactId>
-      <version>${config.version}</version>
-      <scope>compile</scope>
+      <groupId>org.opendaylight.odlparent</groupId>
+      <artifactId>opendaylight-karaf-empty</artifactId>
+      <type>zip</type>

     </dependency>
     <dependency>
     </dependency>
     <dependency>

-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
+      <groupId>org.opendaylight.mdsal</groupId>
+      <artifactId>mdsal-binding-api</artifactId>

     </dependency>
         <!-- Dependencies for pax exam karaf container -->
     <dependency>
     </dependency>
         <!-- Dependencies for pax exam karaf container -->
     <dependency>


@@ -60,26 +66,45 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>pax-exam</artifactId>
         <scope>compile</scope>
     </dependency>
         <artifactId>pax-exam</artifactId>
         <scope>compile</scope>
     </dependency>

+    <dependency>
+        <groupId>org.ops4j.pax.tipi</groupId>
+        <artifactId>org.ops4j.pax.tipi.junit</artifactId>
+        <version>4.12.0.1</version>
+        <scope>runtime</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.ops4j.pax.tipi</groupId>
+        <artifactId>org.ops4j.pax.tipi.hamcrest.core</artifactId>
+        <version>1.3.0.1</version>
+        <scope>runtime</scope>
+    </dependency>

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

+
+    <!-- Referenced by pax-exam-features, needs to be pulled into local repository -->

     <dependency>
     <dependency>

-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>1</version>
-        <scope>compile</scope>
+        <groupId>org.ops4j.base</groupId>
+        <artifactId>ops4j-base-monitors</artifactId>
+        <version>1.5.1</version>

     </dependency>
     </dependency>

+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-atinject_1.0_spec</artifactId>
+        <!-- FIXME: remove this override once pax-exam is aligned with pax-web -->
+        <version>1.0</version>
+    </dependency>
+

     <dependency>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>org.apache.karaf.features.core</artifactId>
     <dependency>
         <groupId>org.apache.karaf.features</groupId>
         <artifactId>org.apache.karaf.features.core</artifactId>

-        <version>${karaf.version}</version>

         <scope>compile</scope>
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>
         <scope>compile</scope>
     </dependency>
     <dependency>
         <groupId>org.osgi</groupId>

-        <artifactId>org.osgi.core</artifactId>
+        <artifactId>org.osgi.framework</artifactId>

         <scope>compile</scope>
     </dependency>
     <dependency>
         <scope>compile</scope>
     </dependency>
     <dependency>