Bump upstreams

[aaa.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 9fd2e116a8337ac9b071d6616557461eb9f4d5f6..d98ea38d19124d57676d0d174add66dfc34cd418 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,16 +11,21 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>4.0.2</version>
+    <version>12.0.2</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.aaa</groupId>
   <artifactId>aaa.project</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.17.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>aaa</name> <!-- Used by Sonar to set project name -->
 
+  <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>
@@ -28,13 +33,16 @@
     <module>aaa-cli</module>
     <module>aaa-cli-jar</module>
     <module>aaa-filterchain</module>
+    <module>aaa-idm-store-h2</module>
     <module>aaa-password-service</module>
     <module>artifacts</module>
     <module>features</module>
     <module>parent</module>
     <module>aaa-shiro</module>
+    <module>aaa-tokenauthrealm</module>
     <module>dependency-check</module>
     <module>web</module>
+    <module>docs</module>
   </modules>
 
   <profiles>
@@ -48,26 +56,44 @@
         <module>karaf</module>
       </modules>
     </profile>
-  </profiles>
 
-  <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>
+    <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>