openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1671247 - in /openjpa/trunk: ./ pom.xml
Date Sat, 04 Apr 2015 08:03:05 GMT
Author: struberg
Date: Sat Apr  4 08:03:05 2015
New Revision: 1671247

URL: http://svn.apache.org/r1671247
Log:
merged from 2.3.x: upgrade to latest javadoc and apache-parent versions

Modified:
    openjpa/trunk/   (props changed)
    openjpa/trunk/pom.xml

Propchange: openjpa/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Apr  4 08:03:05 2015
@@ -3,4 +3,4 @@
 /openjpa/branches/2.1.x:1415379,1415398,1485010,1513249,1517838,1530146,1533218,1533280,1539188,1569528,1575444,1591536,1636464,1655218,1662610
 /openjpa/branches/2.2.1.x:1415367,1415413,1415425,1504719,1508186,1530347,1533222,1539193,1651808
 /openjpa/branches/2.2.x:1384400,1415459-1415460,1415469,1485013,1530364,1533223,1580898,1580939,1591681,1631786,1666312
-/openjpa/branches/2.3.x:1533462,1535560,1540277,1564121
+/openjpa/branches/2.3.x:1533462,1535560,1536912,1540277,1564121

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1671247&r1=1671246&r2=1671247&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Sat Apr  4 08:03:05 2015
@@ -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>



Mime
View raw message