openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1537242 - /openjpa/branches/2.3.x/pom.xml
Date Wed, 30 Oct 2013 18:59:42 GMT
Author: struberg
Date: Wed Oct 30 18:59:42 2013
New Revision: 1537242

URL: http://svn.apache.org/r1537242
Log:
enable tests during release; tweak javadoc creation

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=1537242&r1=1537241&r2=1537242&view=diff
==============================================================================
--- openjpa/branches/2.3.x/pom.xml (original)
+++ openjpa/branches/2.3.x/pom.xml Wed Oct 30 18:59:42 2013
@@ -738,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>
@@ -864,35 +864,18 @@
                     <version>${maven.javadoc.version}</version>
                     <configuration>
                         <encoding>${project.build.sourceEncoding}</encoding>
+                        <additionalparam>
+                            ${javadoc.additionalparam}
+                        </additionalparam>
+                        <subpackages>org.apache.openjpa</subpackages>
+                        <verbose>false</verbose>
+                        <maxmemory>512m</maxmemory>
+                        <links>
+                            <link>http://download.oracle.com/javase/6/docs/api/</link>
+                            <link>http://download.oracle.com/javaee/6/api/</link>
+                            <link>http://commons.apache.org/collections/api-release/</link>
+                        </links>
                     </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>
-                                <subpackages>org.apache.openjpa</subpackages>
-                                <verbose>false</verbose>
-                                <maxmemory>512m</maxmemory>
-                                <links>
-                                    <link>http://download.oracle.com/javase/6/docs/api/</link>
-                                    <link>http://download.oracle.com/javaee/6/api/</link>
-                                    <link>http://commons.apache.org/collections/api-release/</link>
-                                </links>
-                            </configuration>
-                        </execution>
-                    </executions>
                 </plugin>
                 <!-- Newer versions of plugin will cause PDF build failures -->
                 <plugin>



Mime
View raw message