Bump upstreams

[aaa.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index 98cf7d680279d4e1b96d81b86f97f3c1f408e2f6..7f331b60e1c1a04b33557b71cab2e369c5d02f83 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>5.0.9</version>
+    <version>11.0.6</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa-parent</artifactId>
-  <version>0.12.0-SNAPSHOT</version>
+  <version>0.17.4-SNAPSHOT</version>
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
@@ -27,67 +27,31 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.12.0-SNAPSHOT</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>7.0.3</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
 
       <!-- Third-party -->
+      <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>2.1.214</version>
+      </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>2.10.6</version>
+        <version>2.10.9.2</version>
       </dependency>
       <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>javax.json</artifactId>
         <version>1.0.4</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.metatype</artifactId>
-      </dependency>
-
-      <!-- Test stuff -->
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-servlet-tester</artifactId>
-        <version>7.0.0.pre5</version>
-        <scope>test</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>org.opendaylight.aaa.*</include>
-          </includes>
-        </configuration>
-        <executions>
-          <execution>
-            <id>pre-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>post-test</id>
-            <goals>
-              <goal>report</goal>
-            </goals>
-            <phase>test</phase>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
   <url>https://wiki.opendaylight.org/view/AAA:Main</url>
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>