Author: niallp
Date: Sun Apr 25 01:32:09 2010
New Revision: 937734
URL: http://svn.apache.org/viewvc?rev=937734&view=rev
Log:
Remove <relativePath>.</relativePath> hack for checkstyle and use a <property>
for the parent dir instead
Modified:
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/examples/pom.xml
commons/proper/vfs/trunk/pom.xml
commons/proper/vfs/trunk/sandbox/pom.xml
Modified: commons/proper/vfs/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=937734&r1=937733&r2=937734&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Sun Apr 25 01:32:09 2010
@@ -88,6 +88,10 @@
</dependency>
</dependencies>
+ <properties>
+ <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
+ </properties>
+
<build>
<resources>
<resource>
Modified: commons/proper/vfs/trunk/examples/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/examples/pom.xml?rev=937734&r1=937733&r2=937734&view=diff
==============================================================================
--- commons/proper/vfs/trunk/examples/pom.xml (original)
+++ commons/proper/vfs/trunk/examples/pom.xml Sun Apr 25 01:32:09 2010
@@ -75,6 +75,7 @@
<properties>
<commons.componentid>vfs-examples</commons.componentid>
+ <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
</properties>
<build>
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=937734&r1=937733&r2=937734&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Sun Apr 25 01:32:09 2010
@@ -24,8 +24,6 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
<version>15</version>
- <!-- The relative path is set to the current directory so the checkstyle
plugin will work -->
- <relativePath>.</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -126,6 +124,7 @@
<maven.compile.source>1.4</maven.compile.source>
<maven.compile.target>1.4</maven.compile.target>
<commons.release.name>commons-vfs-${commons.release.version}</commons.release.name>
+ <vfs.parent.dir>${basedir}</vfs.parent.dir>
</properties>
<build>
@@ -208,12 +207,12 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.2</version>
<configuration>
-
<!--<propertiesLocation>${project.parent.relativePath}/checkstyle.properties</propertiesLocation>
-->
-
<configLocation>${project.parent.relativePath}/checkstyle.xml</configLocation>
-
<suppressionsLocation>${project.parent.relativePath}/checkstyle-suppressions.xml</suppressionsLocation>
+
<!--<propertiesLocation>${vfs.parent.dir}/checkstyle.properties</propertiesLocation>
-->
+ <configLocation>${vfs.parent.dir}/checkstyle.xml</configLocation>
+
<suppressionsLocation>${vfs.parent.dir}/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
<propertyExpansion>basedir=${basedir}</propertyExpansion>
-
<propertyExpansion>licensedir=${basedir}/${project.parent.relativePath}/checkstyle-header.txt</propertyExpansion>
+
<propertyExpansion>licensedir=${vfs.parent.dir}/checkstyle-header.txt</propertyExpansion>
</configuration>
</plugin>
<plugin>
Modified: commons/proper/vfs/trunk/sandbox/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/sandbox/pom.xml?rev=937734&r1=937733&r2=937734&view=diff
==============================================================================
--- commons/proper/vfs/trunk/sandbox/pom.xml (original)
+++ commons/proper/vfs/trunk/sandbox/pom.xml Sun Apr 25 01:32:09 2010
@@ -74,6 +74,7 @@
<properties>
<commons.componentid>vfs-sandbox</commons.componentid>
+ <vfs.parent.dir>${basedir}/..</vfs.parent.dir>
</properties>
<build>
