You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2015/04/05 20:20:23 UTC
svn commit: r1671412 - /openjpa/trunk/pom.xml
Author: struberg
Date: Sun Apr 5 18:20:23 2015
New Revision: 1671412
URL: http://svn.apache.org/r1671412
Log:
fix javadoc plugin setup for release
Modified:
openjpa/trunk/pom.xml
Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1671412&r1=1671411&r2=1671412&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Sun Apr 5 18:20:23 2015
@@ -88,6 +88,8 @@
<compile.class.target>${java.class.version}</compile.class.target>
<compile.testclass.source>${java.testclass.version}</compile.testclass.source>
<compile.testclass.target>${java.testclass.version}</compile.testclass.target>
+
+ <maven.javadoc.version>2.9.1</maven.javadoc.version>
</properties>
<licenses>
@@ -736,11 +738,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.1</version>
+ <version>2.4.2</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
- <goals>deploy site site-deploy</goals>
- <arguments>-Papache-release,docbook-profile,test-derby,bval -DskipTests</arguments>
+ <goals>deploy javadoc:aggregate site site-deploy</goals>
+ <arguments>-Papache-release,docbook-profile,test-derby,bval</arguments>
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</plugin>
@@ -862,21 +864,6 @@
<version>2.9.1</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>aggregate-jar</goal>
- </goals>
- </execution>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <configuration>
<additionalparam>
${javadoc.additionalparam}
</additionalparam>
@@ -889,8 +876,6 @@
<link>http://commons.apache.org/collections/api-release/</link>
</links>
</configuration>
- </execution>
- </executions>
</plugin>
<!-- Newer versions of plugin will cause PDF build failures -->
<plugin>
@@ -1163,11 +1148,11 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>${maven.javadoc.version}</version>
<configuration>
<show>package</show>
<quiet>true</quiet>
- <source>1.6</source>
+ <source>${java.class.version}</source>
<links>
<link>http://download.oracle.com/javase/6/docs/api/</link>
<link>http://download.oracle.com/javaee/6/api/</link>