Author: rgoers
Date: Sun Jul 24 19:30:09 2011
New Revision: 1150476
URL: http://svn.apache.org/viewvc?rev=1150476&view=rev
Log:
Maven site generation works with Maven 2. Maven 3 site plugin appears to have
problems
Modified:
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/pom.xml
Modified: commons/proper/vfs/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=1150476&r1=1150475&r2=1150476&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Sun Jul 24 19:30:09 2011
@@ -81,6 +81,10 @@
</dependency>
</dependencies>
+ <properties>
+ <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
+ </properties>
+
<build>
<resources>
<resource>
@@ -90,14 +94,14 @@
</excludes>
</resource>
<resource>
- <directory>${basedir}</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
</includes>
</resource>
<resource>
- <directory>${basedir}</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE.txt</include>
@@ -111,14 +115,14 @@
<directory>src/test/resources</directory>
</testResource>
<testResource>
- <directory>${basedir}</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>NOTICE.txt</include>
</includes>
</testResource>
<testResource>
- <directory>${basedir}</directory>
+ <directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
<includes>
<include>LICENSE.txt</include>
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1150476&r1=1150475&r2=1150476&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Sun Jul 24 19:30:09 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>19</version>
+ <version>21</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -138,11 +138,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.2</version>
<configuration>
@@ -192,12 +187,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
<version>2.4</version>
<configuration>
@@ -228,7 +217,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
+ <version>${commons.javadoc.version}</version>
<configuration>
<tags>
<tag>
