Author: ltheussl
Date: Mon Sep 19 21:49:55 2005
New Revision: 290356
URL: http://svn.apache.org/viewcvs?rev=290356&view=rev
Log:
Make pom:validate use the new plugin:validate-xml tag
Modified:
maven/maven-1/plugins/trunk/pom/plugin.jelly
maven/maven-1/plugins/trunk/pom/project.xml
Modified: maven/maven-1/plugins/trunk/pom/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pom/plugin.jelly?rev=290356&r1=290355&r2=290356&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pom/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/pom/plugin.jelly Mon Sep 19 21:49:55 2005
@@ -22,6 +22,7 @@
xmlns:j="jelly:core"
xmlns:d="jelly:define"
xmlns:pom="pom"
+ xmlns:plugin="plugin"
xmlns:util="jelly:util"
xmlns:ant="jelly:ant"
xmlns:artifact="artifact">
@@ -54,17 +55,10 @@
<!-- ================================================================== -->
<!-- V A L I D A T E P O M -->
<!-- ================================================================== -->
- <goal name="pom:validate" prereqs="pom:verify-version"
- description="Validate the Maven XML project descriptor">
+ <goal
+ name="pom:validate"
+ description="Validate the Maven XML project descriptor">
- <path id="validate.path">
- <pathelement path="${plugin.getDependencyPath('isorelax')}"/>
- <pathelement path="${plugin.getDependencyPath('thaiopensource:jing')}"/>
- <pathelement path="${plugin.getDependencyPath('xml-apis')}"/>
- <pathelement path="${plugin.getDependencyPath('xerces')}"/>
- </path>
-
- <!-- Support Maven 1.0 rc1 and before which only had a single XSD file. -->
<j:set var="xsd"
value="${maven.home}/maven-project-${pom.pomVersion}.xsd"/>
<util:file var="xsdAsFile" name="${xsd}"/>
@@ -72,15 +66,15 @@
<j:set var="xsd"
value="${maven.home}/maven-project.xsd"/>
</j:if>
-
- <java classname="com.thaiopensource.relaxng.util.Driver" fork="true">
- <classpath refid="validate.path"/>
- <arg value="${xsd}"/>
- <arg value="${pom.file.canonicalPath}"/>
- </java>
+ <echo>xsd file: ${xsd}</echo>
+
+ <plugin:validate-xml
+ schema="${xsd}"
+ file="${pom.file.canonicalPath}"/>
</goal>
-
+
+
<goal name="pom:contentvalidate"
description="Validate the content of the Maven POM">
Modified: maven/maven-1/plugins/trunk/pom/project.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/pom/project.xml?rev=290356&r1=290355&r2=290356&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/pom/project.xml (original)
+++ maven/maven-1/plugins/trunk/pom/project.xml Mon Sep 19 21:49:55 2005
@@ -88,31 +88,9 @@
<version>1.4-dev-8</version>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>1.0.b2</version>
- </dependency>
- <dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
<version>1.0</version>
- </dependency>
- <dependency>
- <groupId>isorelax</groupId>
- <artifactId>isorelax</artifactId>
- <version>20030108</version>
- </dependency>
- <!-- validator being used -->
-
- <dependency>
- <groupId>thaiopensource</groupId>
- <artifactId>jing</artifactId>
- <version>20030619</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>2.4.0</version>
</dependency>
</dependencies>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
