Remove unneeded jaxb-api workarounds

[yangtools.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index f3cf1cd71da9235059e160c1a0642d0bd95765e3..1d71118e2e059947b25f20e23bdc2a84a113ff77 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,14 +12,14 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.7</version>
       <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yangtools-aggregator</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.7-SNAPSHOT</version>
     <name>yangtools</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -33,6 +33,7 @@
     <modules>
         <module>artifacts</module>
         <module>benchmarks</module>
+        <module>bundle-parent</module>
         <module>common</module>
         <module>features</module>
         <module>yang</module>
@@ -42,9 +43,43 @@
 
     <profiles>
         <profile>
-            <id>sonar-jacoco-aggregate</id>
+            <id>aggregate-javadoc</id>
             <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>aggregate</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>aggregate-jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>karaf</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 
+            <modules>
+                <module>distribution-karaf</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>sonar-jacoco-aggregate</id>
+            <activation>
+                <property>
+                    <name>odl.jacoco.aggregateFile</name>
+                </property>
             </activation>
             <build>
                 <plugins>