Jetty 9.2: pull in h2 using odlparent DM

[aaa.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index c7d3856c04359bad2f7f4587b998042988a65483..a775b7b2ac69d0018b4e1c6f3b7c9c20aa8bb009 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.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.5.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.0.4</maven>
@@ -19,26 +19,20 @@
 
     <properties>
         <!-- Karaf -->
-        <karaf.branding.version>1.3.0-SNAPSHOT</karaf.branding.version>
-        <karaf.resources.version>1.7.0-SNAPSHOT</karaf.resources.version>
-
-        <!-- OSGi -->
-        <osgi.metatype.version>1.1.2</osgi.metatype.version>
+        <karaf.branding.version>1.4.0-SNAPSHOT</karaf.branding.version>
+        <karaf.resources.version>1.8.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>1.0.0-SNAPSHOT</yangtools.version>
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
-        <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>
+        <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
+        <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
+        <restconf.version>1.5.0-SNAPSHOT</restconf.version>
+        <config.version>0.6.0-SNAPSHOT</config.version>
         <config.restconf.configfile>09-rest-connector.xml</config.restconf.configfile>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
 
@@ -50,16 +44,13 @@
 
         <config.authn.store.configfile>08-authn-config.xml</config.authn.store.configfile>
 
-        <!-- IdmLight -->
-        <h2.version>1.4.191</h2.version>
-
         <!-- Keystone plugin -->
         <httpclient.version>4.4</httpclient.version>
 
         <!-- Test -->
         <javax.inject.version>1</javax.inject.version>
-        <servlet.tester.version>7.0.0.M2</servlet.tester.version>
-        <features.test.version>1.7.0-SNAPSHOT</features.test.version>
+        <servlet.tester.version>7.0.0.pre5</servlet.tester.version>
+        <features.test.version>1.8.0-SNAPSHOT</features.test.version>
     </properties>
 
     <dependencyManagement>
@@ -117,18 +108,12 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.metatype</artifactId>
-                <version>${osgi.metatype.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.ehcache</groupId>
                 <artifactId>ehcache</artifactId>
                 <version>${ehcache.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                <version>${jta.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.oltu.oauth2</groupId>
                 <artifactId>org.apache.oltu.oauth2.common</artifactId>
@@ -144,11 +129,6 @@
                 <artifactId>org.apache.oltu.oauth2.resourceserver</artifactId>
                 <version>${oltu.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.h2database</groupId>
-                <artifactId>h2</artifactId>
-                <version>${h2.version}</version>
-            </dependency>
 
             <!-- Test stuff -->
             <dependency>
@@ -164,10 +144,10 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlet-tester</artifactId>
-                <version>${servlet.tester.version}</version>
-                <scope>test</scope>
+              <groupId>org.mortbay.jetty</groupId>
+              <artifactId>jetty-servlet-tester</artifactId>
+              <version>${servlet.tester.version}</version>
+              <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -202,15 +182,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <configuration>
-                    <!-- checkstyle is evil -->
-                    <skip>false</skip>
-                    <failOnViolation>true</failOnViolation>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+
                     <configLocation>checkstyle-logging.xml</configLocation>
-                    <consoleOutput>true</consoleOutput>
-                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                    <sourceDirectory>${project.basedir}</sourceDirectory>
-                    <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/*.yang</includes>
-                    <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/src/main/yang-gen-config\/,**\/src/main/yang-gen-sal\/</excludes>
                 </configuration>
                 <executions>
                     <execution>
@@ -228,24 +202,6 @@
                     </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>