Revert "Revert "Inherit metatype dependency version from odlparent""

[aaa.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index 8b62b34568ccf7bb693fa609b3a3c4dc268e74f3..79a84a7e62ab339e8bc5cf1e74dcad4e5a1d1f8c 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-parent</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
+    <version>0.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.0.4</maven>
@@ -19,32 +19,28 @@
 
     <properties>
         <!-- Karaf -->
-        <karaf.branding.version>1.2.0-SNAPSHOT</karaf.branding.version>
-        <karaf.resources.version>1.6.0-SNAPSHOT</karaf.resources.version>
-
-        <!-- OSGi -->
-        <osgi.metatype.version>1.0.10</osgi.metatype.version>
+        <karaf.branding.version>1.3.0-SNAPSHOT</karaf.branding.version>
+        <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
 
         <!-- Local project version, needed for import -->
         <aaa.version>${project.version}</aaa.version>
         <parent-path>${basedir}</parent-path>
 
         <!-- AuthZ -->
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-        <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-        <config.version>0.4.0-SNAPSHOT</config.version>
+        <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+        <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+        <config.version>0.5.0-SNAPSHOT</config.version>
         <config.authz.service.configfile>08-authz-config.xml</config.authz.service.configfile>
         <config.restconf.configfile>09-rest-connector.xml</config.restconf.configfile>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
 
         <!-- AuthN -->
         <glassfish.json.version>1.0.4</glassfish.json.version>
-        <servlet.api.version>2.5</servlet.api.version>
         <ehcache.version>2.8.3</ehcache.version>
         <jta.version>1.1.1</jta.version>
         <oltu.version>1.0.0</oltu.version>
@@ -52,7 +48,7 @@
         <config.authn.store.configfile>08-authn-config.xml</config.authn.store.configfile>
 
         <!-- IdmLight -->
-        <h2.version>1.4.185</h2.version>
+        <h2.version>1.4.191</h2.version>
 
         <!-- Keystone plugin -->
         <httpclient.version>4.4</httpclient.version>
@@ -60,7 +56,7 @@
         <!-- Test -->
         <javax.inject.version>1</javax.inject.version>
         <servlet.tester.version>7.0.0.M2</servlet.tester.version>
-        <features.test.version>1.6.0-SNAPSHOT</features.test.version>
+        <features.test.version>1.7.0-SNAPSHOT</features.test.version>
     </properties>
 
     <dependencyManagement>
@@ -115,35 +111,9 @@
                 <artifactId>javax.json</artifactId>
                 <version>${glassfish.json.version}</version>
             </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>${servlet.api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-servlet</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-core</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-server</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.sun.jersey</groupId>
-                <artifactId>jersey-json</artifactId>
-                <version>${jersey.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.metatype</artifactId>
-                <version>${osgi.metatype.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.ehcache</groupId>
@@ -189,12 +159,6 @@
                 <version>${javax.inject.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>com.sun.jersey.jersey-test-framework</groupId>
-                <artifactId>jersey-test-framework-grizzly2</artifactId>
-                <version>${jersey.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet-tester</artifactId>
@@ -236,7 +200,7 @@
                 <configuration>
                     <!-- checkstyle is evil -->
                     <skip>false</skip>
-                    <failOnViolation>false</failOnViolation>
+                    <failOnViolation>true</failOnViolation>
                     <configLocation>checkstyle-logging.xml</configLocation>
                     <consoleOutput>true</consoleOutput>
                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
@@ -260,6 +224,24 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${jmxGeneratorPath}</source>
+                                <source>${salGeneratorPath}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>