Merge "introduce aaa.web.testutils with WebTestModule & TestWebClient"

[aaa.git] / parent / pom.xml

diff --git a/parent/pom.xml b/parent/pom.xml
index 6afae012e5058bb241095734106db4a0ad5f0bb6..46f4177f5bfbf67f2c189566febd321609e1a4d2 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,54 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>odlparent</artifactId>
-    <version>1.9.0</version>
-    <relativePath />
+    <groupId>org.opendaylight.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>3.0.4</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa-parent</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.9.0-SNAPSHOT</version>
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>pom</packaging>
 
   <properties>
-    <!-- Karaf -->
-    <karaf.branding.version>1.5.0-SNAPSHOT</karaf.branding.version>
-    <karaf.resources.version>1.9.0</karaf.resources.version>
-
-    <!-- Local project version, needed for import -->
-    <aaa.version>${project.version}</aaa.version>
-    <parent-path>${basedir}</parent-path>
-
-    <!-- AuthZ -->
-    <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-    <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-    <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-    <config.version>0.7.0-SNAPSHOT</config.version>
-    <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>
-    <ehcache.version>2.8.3</ehcache.version>
-    <jta.version>1.1.1</jta.version>
-    <oltu.version>1.0.0</oltu.version>
-
-    <config.authn.store.configfile>08-authn-config.xml</config.authn.store.configfile>
-
-    <!-- Keystone plugin -->
-    <httpclient.version>4.4</httpclient.version>
-
-    <!-- Test -->
-    <javax.inject.version>1</javax.inject.version>
-    <servlet.tester.version>7.0.0.pre5</servlet.tester.version>
-    <features.test.version>1.9.0</features.test.version>
+    <oltu.version>1.0.2</oltu.version>
   </properties>
 
   <dependencyManagement>
@@ -57,51 +25,23 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>${aaa.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
+        <version>${project.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.mdsal</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.mdsal.model</groupId>
-        <artifactId>mdsal-model-artifacts</artifactId>
-        <version>${mdsal.model.version}</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${controller.mdsal.version}</version>
+        <version>1.9.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${config.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
 
       <!-- Third-party -->
       <dependency>
         <groupId>org.glassfish</groupId>
         <artifactId>javax.json</artifactId>
-        <version>${glassfish.json.version}</version>
+        <version>1.0.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -110,17 +50,31 @@
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>${ehcache.version}</version>
+        <version>2.10.6</version>
       </dependency>
       <dependency>
         <groupId>org.apache.oltu.oauth2</groupId>
         <artifactId>org.apache.oltu.oauth2.common</artifactId>
         <version>${oltu.version}</version>
+        <exclusions>
+          <exclusion>
+            <!-- This is clashing with jackson's view of org.json world -->
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.oltu.oauth2</groupId>
         <artifactId>org.apache.oltu.oauth2.authzserver</artifactId>
         <version>${oltu.version}</version>
+        <exclusions>
+          <exclusion>
+            <!-- This is clashing with jackson's view of org.json world -->
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.oltu.oauth2</groupId>
@@ -132,19 +86,12 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-test</artifactId>
-        <version>${features.test.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>javax.inject</groupId>
-        <artifactId>javax.inject</artifactId>
-        <version>${javax.inject.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-servlet-tester</artifactId>
-        <version>${servlet.tester.version}</version>
+        <version>7.0.0.pre5</version>
         <scope>test</scope>
       </dependency>
     </dependencies>
@@ -152,6 +99,20 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+        <configuration>
+           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <configuration>
+          <failOnError>true</failOnError>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
@@ -188,16 +149,6 @@
 
   <reporting>
     <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${findbugs.maven.plugin.version}</version>
-        <configuration>
-          <effort>Max</effort>
-          <threshold>Low</threshold>
-          <goal>site</goal>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jdepend-maven-plugin</artifactId>