You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2019/06/04 13:54:51 UTC
svn commit: r1860618 - in /turbine/fulcrum/trunk/security: pom.xml
torque/pom.xml
Author: gk
Date: Tue Jun 4 13:54:50 2019
New Revision: 1860618
URL: http://svn.apache.org/viewvc?rev=1860618&view=rev
Log:
- update parent
- update dbcp2 in torque
Modified:
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/security/torque/pom.xml
Modified: turbine/fulcrum/trunk/security/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1860618&r1=1860617&r2=1860618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Tue Jun 4 13:54:50 2019
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>5</version>
+ <version>6-SNAPSHOT</version>
<relativePath />
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -125,12 +125,6 @@
<version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
@@ -159,6 +153,33 @@
<module>dist</module>
</modules>
+ <!-- This let the report be set only at root level and is required since javadoc 3.1.0, as the aggregate reports by default at every level. -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.1.0</version>
+ <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>
+ </plugins>
+ </reporting>
+
<properties>
<turbine.site.path>fulcrum/fulcrum-security</turbine.site.path>
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/security</turbine.scmPubCheckoutDirectory>
Modified: turbine/fulcrum/trunk/security/torque/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/pom.xml?rev=1860618&r1=1860617&r2=1860618&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/pom.xml (original)
+++ turbine/fulcrum/trunk/security/torque/pom.xml Tue Jun 4 13:54:50 2019
@@ -131,7 +131,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-dbcp2</artifactId>
- <version>2.5.0</version>
+ <version>2.6.0</version>
</dependency>
<!-- testing dependencies -->