dion        2003/09/23 21:46:33

  Modified:    src/plugins-build/pom plugin.jelly project.xml
  Log:
  Make pom:validate work again.
  
  Revision  Changes    Path
  1.10      +11 -11    maven/src/plugins-build/pom/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/pom/plugin.jelly,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- plugin.jelly      29 Jun 2003 12:23:07 -0000      1.9
  +++ plugin.jelly      24 Sep 2003 04:46:33 -0000      1.10
  @@ -31,17 +31,17 @@
       name="pom:validate"
       description="Validate the Maven XML project descriptor">
   
  -    <taskdef name="validate" classname="org.iso_relax.ant.JARVTask">
  -      <classpath path="${plugin.getDependencyPath('isorelax')}"/>
  -      <classpath path="${plugin.getDependencyPath('xercesjarv')}"/>
  -      <classpath path="${plugin.getDependencyPath('xerces')}"/>
  -    </taskdef>
  -
  -    <validate
  -      schemaLanguage="http://www.w3.org/2001/XMLSchema";
  -      schema="${maven.home}/maven-project.xsd"
  -      file="${pom.file.canonicalPath}" />
  -
  +    <path id="validate.path">
  +      <pathelement path="${plugin.getDependencyPath('isorelax')}"/>
  +      <pathelement path="${plugin.getDependencyPath('thaiopensource:jing')}"/>
  +      <pathelement path="${plugin.getDependencyPath('xerces')}"/>
  +    </path>
  +    
  +    <java classname="com.thaiopensource.relaxng.util.Driver" fork="true">
  +      <classpath refid="validate.path"/>
  +      <arg value="${maven.home}/maven-project.xsd"/>
  +      <arg value="${pom.file.canonicalPath}"/>
  +    </java>
     </goal>
     
     <goal
  
  
  
  1.25      +3 -8      maven/src/plugins-build/pom/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/pom/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml       6 Sep 2003 07:28:55 -0000       1.24
  +++ project.xml       24 Sep 2003 04:46:33 -0000      1.25
  @@ -49,17 +49,11 @@
       <dependency>
         <id>dom4j</id>
         <version>1.4</version>
  -      <properties>
  -        <classloader>root.maven</classloader>
  -      </properties>
       </dependency>
   
       <dependency>
         <id>xml-apis</id>
         <version>1.0.b2</version>
  -      <properties>
  -        <classloader>root</classloader>
  -      </properties>
       </dependency>
       
       <dependency>
  @@ -78,8 +72,9 @@
   
       <!-- validator being used -->
       <dependency>
  -      <id>xercesjarv</id>
  -      <version>20020712-DG</version>
  +      <groupId>thaiopensource</groupId>
  +      <artifactId>jing</artifactId>
  +      <version>20030619</version>
         <properties>
           <classloader>root</classloader>
         </properties>
  
  
  

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

Reply via email to