Merge "Remove dependency on features-test"

[aaa.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a884dde140049894a9ce1e516e9c22bf7c7e58ae..2888c424dfe13c1652a14e1467fe03a0aec4d0cc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,75 +1,96 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright (c) 2016 Brocade Communications Systems, Inc. and others. All rights reserved.
+ Copyright (c) 2016 - 2017 Brocade Communications Systems, Inc. and others. All rights reserved.
 
  This program and the accompanying materials are made available under the
  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">
+-->
+<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-lite</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <version>4.0.9</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa.project</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>aaa</name>
+  <name>aaa</name> <!-- Used by Sonar to set project name -->
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
+  <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <maven.install.skip>true</maven.install.skip>
+  </properties>
 
   <modules>
     <module>aaa-authn-api</module>
     <module>aaa-encrypt-service</module>
-    <module>aaa-authn</module>
-    <module>aaa-idp-mapping</module>
-    <module>aaa-authn-sts</module>
-    <module>aaa-authn-store</module>
-    <module>aaa-authn-federation</module>
-    <module>aaa-authn-sssd</module>
-    <module>aaa-authn-basic</module>
-    <module>aaa-idmlight</module>
-    <module>aaa-authn-mdsal-store</module>
-    <module>aaa-authz</module>
-    <module>aaa-credential-store-api</module>
-    <module>aaa-shiro-act</module>
-    <module>aaa-h2-store</module>
     <module>aaa-cert</module>
     <module>aaa-cli</module>
     <module>aaa-cli-jar</module>
     <module>aaa-filterchain</module>
-    <module>aaa-cassandra-store</module>
+    <module>aaa-password-service</module>
     <module>artifacts</module>
     <module>features</module>
-    <module>karaf</module>
     <module>parent</module>
     <module>aaa-shiro</module>
+    <module>dependency-check</module>
+    <module>web</module>
   </modules>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>karaf</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+
+      <modules>
+        <module>karaf</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>sonar-jacoco-aggregate</id>
+      <activation>
+        <property>
+          <name>odl.jacoco.aggregateFile</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>merge</id>
+                <goals>
+                  <goal>merge</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <destFile>${odl.jacoco.aggregateFile}</destFile>
+                  <fileSets>
+                    <fileSet>
+                      <directory>${project.basedir}</directory>
+                      <includes>
+                        <include>**/target/code-coverage/*.exec</include>
+                      </includes>
+                    </fileSet>
+                  </fileSets>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/aaa.git</connection>
@@ -77,4 +98,4 @@
     <tag>HEAD</tag>
     <url>https://wiki.opendaylight.org/view/AAA:Main</url>
   </scm>
-</project>
\ No newline at end of file
+</project>