dion        2003/11/10 06:16:40

  Modified:    pmd/xdocs changes.xml
               pmd      project.xml plugin.jelly
  Log:
  Apply MAVEN-1008:
   Patch to add the project dependancies to the pmd classpath.
  This should allow a custom ruleset jar file that is defined as a dependancy to be 
added to the pmd classpath.
  
  Revision  Changes    Path
  1.14      +6 -0      maven-plugins/pmd/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/pmd/xdocs/changes.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- changes.xml       20 Sep 2003 16:54:43 -0000      1.13
  +++ changes.xml       10 Nov 2003 14:16:40 -0000      1.14
  @@ -8,6 +8,12 @@
   
     <body>
   
  +    <release version="1.3" date="in CVS">
  +      <action dev="dion" type="update">
  +        Apply MAVEN-1008. Allow for custom rulesets in the classpath.
  +      </action>
  +    </release>
  +
       <release version="1.2" date="2003-09-20">
         <action dev="vmassol" type="update">
           Upgraded to use PMD 1.2.1.
  
  
  
  1.16      +1 -1      maven-plugins/pmd/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/pmd/project.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- project.xml       10 Oct 2003 19:21:01 -0000      1.15
  +++ project.xml       10 Nov 2003 14:16:40 -0000      1.16
  @@ -5,7 +5,7 @@
     <pomVersion>3</pomVersion>
     <id>maven-pmd-plugin</id>
     <name>Maven PMD Plug-in</name>
  -  <currentVersion>1.2</currentVersion>
  +  <currentVersion>1.3-SNAPSHOT</currentVersion>
     <description>This plugin provides a more or less seamless integration with Maven 
and the PMD static source code analyzer.</description>
     <shortDescription>Maven Plugin for PMD</shortDescription>
     <url>http://maven.apache.org/reference/plugins/pmd/</url>
  
  
  
  1.9       +12 -7     maven-plugins/pmd/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/pmd/plugin.jelly,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- plugin.jelly      22 Jul 2003 16:13:27 -0000      1.8
  +++ plugin.jelly      10 Nov 2003 14:16:40 -0000      1.9
  @@ -61,15 +61,20 @@
       <mkdir dir="${maven.build.dir}"/>
       <mkdir dir="${maven.docs.dest}"/>
   
  +    <!-- Setup the classpath for pmd plugins -->
  +    <path id="pmd-classpath">
  +      <pathelement path="${plugin.getDependencyPath('pmd:pmd')}" />
  +      <pathelement path="${plugin.getDependencyPath('jaxen:jaxen')}" />
  +      <pathelement path="${plugin.getDependencyPath('saxpath:saxpath')}" />
  +      <pathelement path="${pom.getDependencyClasspath()}" />
  +      <path refid="maven.dependency.classpath" />
  +    </path>
  +
       <!-- Define a PMD task with the rulesets and all jars in the 
            classpath -->   
  -    <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
  -      <classpath>
  -        <pathelement location="${plugin.getDependencyPath('pmd:pmd')}"/>
  -        <pathelement location="${plugin.getDependencyPath('jaxen:jaxen')}"/>
  -        <pathelement location="${plugin.getDependencyPath('saxpath:saxpath')}"/>
  -      </classpath>
  -    </taskdef>
  +    <taskdef name="pmd" 
  +      classpathref="pmd-classpath"
  +      classname="net.sourceforge.pmd.ant.PMDTask" />
           
       <!-- Run the PMD task - need a way to define the rulesets dynamically -->
       <echo>Running the PMD task with ${maven.pmd.rulesetfiles} ...</echo>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to