Author: gk
Date: Thu Jul 16 16:34:58 2020
New Revision: 1879968
URL: http://svn.apache.org/viewvc?rev=1879968&view=rev
Log:
- fix javadoc aggregate to include only module javadoc and expected testapidocs
(in site ant build.xml)
- use anttask version 3.0.0
Modified:
db/torque/torque4/trunk/pom.xml
db/torque/torque4/trunk/torque-generator/pom.xml
Modified: db/torque/torque4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/pom.xml?rev=1879968&r1=1879967&r2=1879968&view=diff
==============================================================================
--- db/torque/torque4/trunk/pom.xml (original)
+++ db/torque/torque4/trunk/pom.xml Thu Jul 16 16:34:58 2020
@@ -606,7 +606,19 @@
<additionalparam>-Xdoclint:none</additionalparam>
<source>1.8</source>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>javadoc</goal>
+ <goal>test-javadoc</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>3.0.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -615,6 +627,24 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.2.0</version>
+ <!-- to generate only in root -->
+ <reportSets>
+ <reportSet>
+ <id>aggregate</id>
+ <inherited>false</inherited>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>default</id>
+ <reports>
+ <report>javadoc</report>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: db/torque/torque4/trunk/torque-generator/pom.xml
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/pom.xml?rev=1879968&r1=1879967&r2=1879968&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-generator/pom.xml (original)
+++ db/torque/torque4/trunk/torque-generator/pom.xml Thu Jul 16 16:34:58 2020
@@ -251,14 +251,14 @@
<execution>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<!-- prepare the PropertyToJavaJarGenerationTest -->
<mkdir
dir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src" />
<copy
todir="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/src">
<fileset
dir="${basedir}/src/test/propertyToJava/src/main/torque-gen/src" />
</copy>
<jar
basedir="${basedir}/src/test/propertyToJava/src/main/torque-gen"
destfile="${basedir}/target/test/propertyToJavaJar/src/main/torque-gen/propertyToJava.jar"
/>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
