Further configuration of the javadoc plugin to allow for aggregated javadocs.

Author: Rafael Winterhalter

byte-buddy-agent/pom.xml

@@ -71,7 +71,6 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>bundle</id>
                                 <goals>
                                     <goal>bundle</goal>
                                 </goals>

byte-buddy-dep/pom.xml

@@ -1,5 +1,6 @@
 <?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>
@@ -55,22 +56,43 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
+            <!-- Define bundle plugin in order to allow for 'bundle' packaging. -->
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>${version.plugin.bundle}</version>
                 <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>bundle</id>
-                        <goals>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-              </plugin>
-          </plugins>
-      </build>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>extras</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Specify OSGi packaging. -->
+                    <plugin>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>maven-bundle-plugin</artifactId>
+                        <version>${version.plugin.bundle}</version>
+                        <extensions>true</extensions>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>bundle</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

byte-buddy/pom.xml

@@ -85,7 +85,6 @@
                         </configuration>
                         <executions>
                             <execution>
-                                <id>bundle</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>bundle</goal>
@@ -152,7 +151,6 @@
                         <version>${version.plugin.build-helper}</version>
                         <executions>
                             <execution>
-                                <id>attach-artifacts</id>
                                 <phase>package</phase>
                                 <goals>
                                     <goal>attach-artifact</goal>

pom.xml

@@ -273,20 +273,24 @@
                         <version>${version.plugin.javadoc}</version>
                         <executions>
                             <execution>
-                                <id>attach-javadocs</id>
+                                <id>attach-javadoc</id>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
                             </execution>
                             <!-- Additionally to the regular jar file specified above, create an aggregated jar. -->
-                            <!-- This does not seem to work when activated during deployment (Shade plugin?). -->
-                            <!--<execution>-->
-                                <!--<id>aggregate-javadoc</id>-->
-                                <!--<goals>-->
-                                    <!--<goal>aggregate</goal>-->
-                                <!--</goals>-->
-                                <!--<phase>package</phase>-->
-                            <!--</execution>-->
+                            <execution>
+                                <id>aggregate-javadoc</id>
+                                <goals>
+                                    <goal>aggregate</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <doctitle>Byte Buddy (full API), version ${project.version}</doctitle>
+                                    <!-- Fails due to repacking of ASM by the Shade plugin. -->
+                                    <failOnError>false</failOnError>
+                                </configuration>
+                            </execution>
                         </executions>
                         <configuration>
                             <detectJavaApiLink>true</detectJavaApiLink>