Fix tigerstripe help generation to include javadocs from tigerstripe-api and tigerstripe-core projects.
Change-Id: I54aeadfe57730c9fac881cdbd9107ddf0f8f789b
diff --git a/core/org.eclipse.tigerstripe.api/pom.xml b/core/org.eclipse.tigerstripe.api/pom.xml
index b08ef97..9567968 100644
--- a/core/org.eclipse.tigerstripe.api/pom.xml
+++ b/core/org.eclipse.tigerstripe.api/pom.xml
@@ -43,4 +43,17 @@
<version>1.5</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/core/org.eclipse.tigerstripe.core/pom.xml b/core/org.eclipse.tigerstripe.core/pom.xml
index a067018..ce5ecaa 100644
--- a/core/org.eclipse.tigerstripe.core/pom.xml
+++ b/core/org.eclipse.tigerstripe.core/pom.xml
@@ -54,4 +54,17 @@
<version>2.0.0</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/core/pom.xml b/core/pom.xml
index bbc2dcc..0b34666 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -86,6 +86,38 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <skip>false</skip>
+ <!-- TODO fix doclint errors/warnings in code then remove -->
+ <doclint>none</doclint>
+ </configuration>
+ <executions>
+ <execution>
+ <id>javadocs</id>
+ <goals>
+ <goal>javadoc-no-fork</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.2.0</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${site-plugin.version}</version>
<configuration>
diff --git a/plugins/org.eclipse.tigerstripe.workbench.help/pom.xml b/plugins/org.eclipse.tigerstripe.workbench.help/pom.xml
index bc29fcc..68c4582 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.help/pom.xml
+++ b/plugins/org.eclipse.tigerstripe.workbench.help/pom.xml
@@ -14,6 +14,20 @@
<packaging>eclipse-plugin</packaging>
<name>plugins/o.e.t.workbench.help</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.tigerstripe</groupId>
+ <artifactId>tigerstripe-api</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.tigerstripe</groupId>
+ <artifactId>tigerstripe-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>sources</classifier>
+ </dependency>
+ </dependencies>
<build>
<plugins>
@@ -28,25 +42,40 @@
</goals>
</execution>
</executions>
- <configuration>
- <outputDirectory>${project.basedir}/src/help/api-reference</outputDirectory>
- <skipTocGen>true</skipTocGen>
- <javadocOptions>
- <includes>
- <include>org.eclipse.tigerstripe.workbench</include>
- <include>org.eclipse.tigerstripe.workbench.generation</include>
- <include>org.eclipse.tigerstripe.workbench.model</include>
- <include>org.eclipse.tigerstripe.workbench.model.annotation</include>
- <include>org.eclipse.tigerstripe.workbench.model.deprecated_</include>
- <include>org.eclipse.tigerstripe.workbench.plugins</include>
- <include>org.eclipse.tigerstripe.workbench.profile</include>
- <include>org.eclipse.tigerstripe.workbench.profile.primitiveType</include>
- <include>org.eclipse.tigerstripe.workbench.profile.stereotype</include>
- <include>org.eclipse.tigerstripe.workbench.project</include>
- <include>org.eclipse.tigerstripe.workbench.queries</include>
- </includes>
- </javadocOptions>
- </configuration>
+ <configuration>
+ <!-- Ignore doclint errors -->
+ <ignoreError>true</ignoreError>
+ <sourceTypes>
+ <!-- To include above maven dependencies -->
+ <sourceType>jar</sourceType>
+ <!-- To include required plugins declared in MANIFEST.MF -->
+ <sourceType>eclipse-plugin</sourceType>
+ </sourceTypes>
+ <outputDirectory>${project.basedir}/src/help/api-reference</outputDirectory>
+ <skipTocGen>true</skipTocGen>
+ <javadocOptions>
+ <includes>
+ <include>org.eclipse.tigerstripe.runner</include>
+ <include>org.eclipse.tigerstripe.workbench</include>
+ <include>org.eclipse.tigerstripe.workbench.generation</include>
+ <include>org.eclipse.tigerstripe.workbench.generation.internal.api</include>
+ <include>org.eclipse.tigerstripe.workbench.generation.internal.core</include>
+ <include>org.eclipse.tigerstripe.workbench.generation.internal.core.model</include>
+ <include>org.eclipse.tigerstripe.workbench.generation.internal.core.module</include>
+ <include>org.eclipse.tigerstripe.workbench.generation.internal.core.plugin</include>
+ <include>org.eclipse.tigerstripe.workbench.generation.internal.core.plugin.pluggable</include>
+ <include>org.eclipse.tigerstripe.workbench.model</include>
+ <include>org.eclipse.tigerstripe.workbench.model.annotation</include>
+ <include>org.eclipse.tigerstripe.workbench.model.deprecated_</include>
+ <include>org.eclipse.tigerstripe.workbench.plugins</include>
+ <include>org.eclipse.tigerstripe.workbench.profile</include>
+ <include>org.eclipse.tigerstripe.workbench.profile.primitiveType</include>
+ <include>org.eclipse.tigerstripe.workbench.profile.stereotype</include>
+ <include>org.eclipse.tigerstripe.workbench.project</include>
+ <include>org.eclipse.tigerstripe.workbench.queries</include>
+ </includes>
+ </javadocOptions>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 9178e59..8a559f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,8 @@
<jacoco-maven-plugin.version>0.8.1</jacoco-maven-plugin.version>
<maven-fluido-skin.version>1.7</maven-fluido-skin.version>
<site-plugin.version>3.7.1</site-plugin.version>
- <tycho-version>1.3.0</tycho-version>
- <tycho-extras-version>1.4.0</tycho-extras-version>
+ <tycho-version>1.6.0</tycho-version>
+ <tycho-extras-version>1.6.0</tycho-extras-version>
</properties>
<modules>
@@ -227,32 +227,6 @@
</reportSet>
</reportSets>
</plugin>
- <!-- TODO - for some reason this fails with errors even with doclint=none -->
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>3.1.0</version>
- <configuration>
- <doclint>none</doclint>
- </configuration>
- <reportSets>
- <reportSet>
- <id>aggregate-javadocs</id>
- <inherited>false</inherited>
- <reports>
- <report>aggregate</report>
- </reports>
- </reportSet>
- <reportSet>
- <id>generate-javadocs</id>
- <reports>
- <report>javadoc</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- -->
</plugins>
</reporting>
