Author: struberg
Date: Tue Oct 29 22:09:36 2013
New Revision: 1536912
URL: http://svn.apache.org/r1536912
Log:
upgrde to latest apache-parent and javadoc version
JavaDoc aggregate generation was broken with mvn3 and the old plugin
Modified:
openjpa/branches/2.3.x/pom.xml
Modified: openjpa/branches/2.3.x/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.3.x/pom.xml?rev=1536912&r1=1536911&r2=1536912&view=diff
==============================================================================
--- openjpa/branches/2.3.x/pom.xml (original)
+++ openjpa/branches/2.3.x/pom.xml Tue Oct 29 22:09:36 2013
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>7</version>
+ <version>13</version>
</parent>
<groupId>org.apache.openjpa</groupId>
@@ -859,7 +859,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
@@ -868,19 +868,18 @@
<id>attach-javadoc</id>
<phase>package</phase>
<goals>
- <goal>jar</goal>
+ <goal>aggregate-jar</goal>
</goals>
</execution>
<execution>
<phase>process-classes</phase>
<goals>
- <goal>javadoc</goal>
+ <goal>aggregate</goal>
</goals>
<configuration>
<additionalparam>
${javadoc.additionalparam}
</additionalparam>
- <aggregate>true</aggregate>
<subpackages>org.apache.openjpa</subpackages>
<verbose>false</verbose>
<maxmemory>512m</maxmemory>
