From 9f6ee02e66c63440e139ae0a555038b0600f61e9 Mon Sep 17 00:00:00 2001
From: Tom Copeland <tomcopeland@users.sourceforge.net>
Date: Mon, 18 Dec 2006 14:10:10 +0000
Subject: [PATCH] Patch [ 1615410 ] Various fixes for build with maven 1.x;
 thanks to Lukas Theussl!

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@4891 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/project.properties |   7 +++
 pmd/project.xml        | 116 ++++++++++++++++++++++-------------------
 pmd/xdocs/credits.xml  |   1 +
 3 files changed, 70 insertions(+), 54 deletions(-)

diff --git a/pmd/project.properties b/pmd/project.properties
index 527bd96e1f..895f2c4700 100644
--- a/pmd/project.properties
+++ b/pmd/project.properties
@@ -7,3 +7,10 @@ maven.compile.target=1.4
 # Avoid that unit tests are running twice
 maven.clover.execute.during.report=false
 maven.clover.license.path=${basedir}/etc/clover.license
+
+# this can be removed when asm-3.0.jar appears on ibiblio
+maven.jar.override = on
+maven.jar.asm = ${basedir}/lib/asm-3.0.jar
+
+maven.junit.fork=true
+maven.junit.forkmode=once
\ No newline at end of file
diff --git a/pmd/project.xml b/pmd/project.xml
index a61be257c8..a66dc61801 100644
--- a/pmd/project.xml
+++ b/pmd/project.xml
@@ -159,62 +159,62 @@
 				<role>Developer</role>
 			</roles>
 		</developer>
+
+        <developer>
+            <name>Allan Caplan</name>
+            <id>allancaplan</id>
+            <email>allancaplan@users.sourceforge.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+
+        <developer>
+            <name>Sven Jacob</name>
+            <id>holobender</id>
+            <email>holobender@users.sourceforge.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+
+        <developer>
+            <name>Wouter Zelle</name>
+            <id>wfzelle</id>
+            <email>wfzelle@users.sourceforge.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+
+        <developer>
+            <name>Brian Remedios</name>
+            <id>hooperbloob</id>
+            <email>hooperbloob@users.sourceforge.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+
+        <developer>
+            <name>Xavier Le Vourch</name>
+            <id>xlv</id>
+            <email>xlv@users.sourceforge.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
+
+        <developer>
+            <name>Johan Nagels</name>
+            <id>bluejohn</id>
+            <email>bluejohn@users.sourceforge.net</email>
+            <roles>
+                <role>Developer</role>
+            </roles>
+        </developer>
 	</developers>
 
-    <developer>
-        <name>Allan Caplan</name>
-        <id>allancaplan</id>
-        <email>allancaplan@users.sourceforge.net</email>
-        <roles>
-            <role>Developer</role>
-        </roles>
-    </developer>
-
-    <developer>
-        <name>Sven Jacob</name>
-        <id>holobender</id>
-        <email>holobender@users.sourceforge.net</email>
-        <roles>
-            <role>Developer</role>
-        </roles>
-    </developer>
-
-    <developer>
-        <name>Wouter Zelle</name>
-        <id>wfzelle</id>
-        <email>wfzelle@users.sourceforge.net</email>
-        <roles>
-            <role>Developer</role>
-        </roles>
-    </developer>
-
-    <developer>
-        <name>Brian Remedios</name>
-        <id>hooperbloob</id>
-        <email>hooperbloob@users.sourceforge.net</email>
-        <roles>
-            <role>Developer</role>
-        </roles>
-    </developer>
-
-    <developer>
-        <name>Xavier Le Vourch</name>
-        <id>xlv</id>
-        <email>xlv@users.sourceforge.net</email>
-        <roles>
-            <role>Developer</role>
-        </roles>
-    </developer>
-
-    <developer>
-        <name>Johan Nagels</name>
-        <id>bluejohn</id>
-        <email>bluejohn@users.sourceforge.net</email>
-        <roles>
-            <role>Developer</role>
-        </roles>
-    </developer>
-
 
 	<contributors></contributors>
 
@@ -249,6 +249,14 @@
 			<includes>
 				<include>**/*Test.java</include>
 			</includes>
+			<resources>
+				<resource>
+					<directory>${basedir}/regress/</directory>
+					<includes>
+						<include>**/*.xml</include>
+					</includes>
+				</resource>
+			</resources>
 		</unitTest>
 
 		<resources>
diff --git a/pmd/xdocs/credits.xml b/pmd/xdocs/credits.xml
index 4507d54580..c046c11882 100644
--- a/pmd/xdocs/credits.xml
+++ b/pmd/xdocs/credits.xml
@@ -54,6 +54,7 @@
         </subsection>
         <subsection name="Contributors">
         <ul>
+            <li>Lukas Theussl - Patch to bring Maven configuration files up to date</li>
             <li>Jason Bennett - Rewrite of annotation-based warning suppression to allow for rule-specific suppression, noticed useless line in XSLT scripts, fix for UnnecessaryLocalBeforeReturn, wrote NPathComplexity rule, patches to improve CyclomaticComplexity rule, Implemented: UseCollectionIsEmpty, NcssTypeCount, NcssMethodCount, NcssConstructor</li>
             <li>Brent Fisher - Fixed report backslash bug, SummaryHTML report improvements</li>
             <li>Thomas Leplus - Rewrote UselessStringValueOf</li>