From: fabrizio g. <fg...@us...> - 2005-10-17 21:18:36
|
Update of /cvsroot/jtidy/jtidy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27147 Modified Files: maven.xml project.xml Log Message: fix for maven 1.1 Index: maven.xml =================================================================== RCS file: /cvsroot/jtidy/jtidy/maven.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- maven.xml 7 Nov 2004 21:33:32 -0000 1.11 +++ maven.xml 17 Oct 2005 21:18:27 -0000 1.12 @@ -1,39 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns:j="jelly:core" xmlns:u="jelly:util" default="rebuild-all"> - - <goal name="rebuild-all" prereqs="pom,clean,ant,dist" /> - - <goal name="nightly" - prereqs="multiproject:clean,multiproject:install,dist,multiproject:site,copy-snapshots, site:sshdeploy" /> - - <preGoal name="dist:prepare-src-filesystem"> - <attainGoal name="ant" /> - </preGoal> - - <postGoal name="dist:prepare-src-filesystem"> - <copy todir="${maven.dist.src.assembly.dir}"> - <fileset dir="."> - <include name="checkstyle.xml" /> - </fileset> - </copy> - </postGoal> - - <goal name="copy-snapshots"> - <mkdir dir="${maven.build.dir}/docs/nightly" /> - <copy todir="${maven.build.dir}/docs/nightly"> - <fileset dir="${maven.build.dir}/distributions" /> - <fileset dir="../jtidyservlet/target"> - <include name="*.jar" /> - </fileset> - <fileset dir="../jtidyservlet-webapp/target"> - <include name="*.war" /> - </fileset> - <fileset dir="${maven.build.dir}/distributions" /> - </copy> - <mkdir dir="${maven.build.dir}/docs/maven" /> - <copy file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar" - todir="${maven.build.dir}/docs/maven/${pom.groupId}/jars" /> - </goal> - +<project xmlns:j="jelly:core" xmlns:u="jelly:util"> + <goal name="rebuild-all" prereqs="pom,clean,ant,dist" /> + <goal name="nightly" prereqs="multiproject:clean,multiproject:install,dist,multiproject:site,copy-snapshots, site:sshdeploy" /> + <preGoal name="dist:prepare-src-filesystem"> + <attainGoal name="ant" /> + </preGoal> + <postGoal name="dist:prepare-src-filesystem"> + <copy todir="${maven.dist.src.assembly.dir}"> + <fileset dir="."> + <include name="checkstyle.xml" /> + </fileset> + </copy> + </postGoal> + <goal name="copy-snapshots"> + <mkdir dir="${maven.build.dir}/docs/nightly" /> + <copy todir="${maven.build.dir}/docs/nightly"> + <fileset dir="${maven.build.dir}/distributions" /> + <fileset dir="../jtidyservlet/target"> + <include name="*.jar" /> + </fileset> + <fileset dir="../jtidyservlet-webapp/target"> + <include name="*.war" /> + </fileset> + <fileset dir="${maven.build.dir}/distributions" /> + </copy> + <mkdir dir="${maven.build.dir}/docs/maven" /> + <copy file="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar" todir="${maven.build.dir}/docs/maven/${pom.groupId}/jars" /> + </goal> </project> - Index: project.xml =================================================================== RCS file: /cvsroot/jtidy/jtidy/project.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- project.xml 7 Nov 2004 18:22:38 -0000 1.27 +++ project.xml 17 Oct 2005 21:18:27 -0000 1.28 @@ -1,266 +1,253 @@ -<project> - <pomVersion>3</pomVersion> - <id>jtidy</id> - <name>JTidy</name> - <groupId>jtidy</groupId> - <currentVersion>r8-SNAPSHOT</currentVersion> - <organization> - <name>sourceforge</name> - <url>http://sourceforge.net</url> - <logo>http://sourceforge.net/sflogo.php?group_id=${maven.sourceforge.project.groupId}&type=2</logo> - </organization> - <inceptionYear>2000</inceptionYear> - <package>org.w3c.tidy</package> - <logo>/images/logo.png</logo> - <description>JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. -Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. -In addition, JTidy provides a DOM interface to the document that is being processed, which effectively makes you able to use JTidy as a DOM parser for real-world HTML.</description> - <shortDescription>JTidy - HTML syntax checker and pretty printer</shortDescription> - <url>http://${pom.groupId}.sourceforge.net</url> - <issueTrackingUrl>http://sourceforge.net/tracker/?group_id=${maven.sourceforge.project.groupId}</issueTrackingUrl> - <siteAddress>shell.sourceforge.net</siteAddress> - <siteDirectory>/home/groups/j/jt/jtidy/htdocs</siteDirectory> - <distributionDirectory>http://sourceforge.net/project/showfiles.php?group_id=${maven.sourceforge.project.groupId}</distributionDirectory> - <repository> - <connection>scm:cvs:pserver:ano...@cv...:/cvsroot/${pom.groupId}:${pom.groupId}</connection> - <developerConnection> - scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/${pom.groupId}:${pom.groupId} - </developerConnection> - <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/${pom.groupId}/${pom.groupId}/</url> - </repository> - <versions> - <version> - <id>04aug2000r2</id> - <name>04aug2000r2</name> - <tag></tag> - </version> - <version> - <id>04aug2000r3</id> - <name>04aug2000r3</name> - <tag></tag> - </version> - <version> - <id>04aug2000r4</id> - <name>04aug2000r4</name> - <tag></tag> - </version> - <version> - <id>04aug2000r5</id> - <name>04aug2000r5</name> - <tag></tag> - </version> - <version> - <id>04aug2000r6</id> - <name>04aug2000r6</name> - <tag></tag> - </version> - <version> - <id>04aug2000r7-dev</id> - <name>04aug2000r7-dev</name> - <tag></tag> - </version> - </versions> - <mailingLists> - <mailingList> - <name>${pom.name} User Mailing list</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-user</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-user</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=${pom.groupId}-user</archive> - </mailingList> - <mailingList> - <name>${pom.name} Developer Mailing list</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-devel</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-devel</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=${pom.groupId}-devel</archive> - </mailingList> - <mailingList> - <name>${pom.name} Cvs Mailing list</name> - <subscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-cvs</subscribe> - <unsubscribe>http://lists.sourceforge.net/lists/listinfo/${pom.groupId}-cvs</unsubscribe> - <archive>http://sourceforge.net/mailarchive/forum.php?forum=${pom.groupId}-cvs</archive> - </mailingList> - </mailingLists> - <developers> - <developer> - <name>Fabrizio Giustina</name> - <id>fgiust</id> - <email>fgiust AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>Current project admin and developer</role> - </roles> - <timezone>+1</timezone> - </developer> - <developer> - <name>Andy Tripp</name> - <id>atripp</id> - <email>atripp AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>Project admin</role> - </roles> - <timezone>0</timezone> - </developer> - <developer> - <name>Russell Gold</name> - <id>russgold</id> - <email>russgold AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>Project admin</role> - </roles> - <timezone>0</timezone> - </developer> - <developer> - <name>Gary L Peskin</name> - <id>garypeskin</id> - <email>garypeskin AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>developer</role> - </roles> - <timezone>0</timezone> - </developer> - <developer> - <name>Sami Lempinen</name> - <id>lempinen</id> - <email>lempinen AT users.sourceforge.net</email> - <organization>Sourceforge</organization> - <roles> - <role>release manager</role> - </roles> - <timezone>0</timezone> - </developer> - </developers> - <licenses> - <license/> - </licenses> - <dependencies> - <dependency> - <groupId>xerces</groupId> - <artifactId>dom3-xml-apis</artifactId> - <version>1.0</version> - <type>jar</type> - <properties/> - </dependency> - <!--<dependency> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - <version>2.6.1</version> - <type>jar</type> - <properties/> - </dependency>--> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - <type>jar</type> - <properties> - <comment>Only used in junit tests. Not needed at runtime.</comment> - </properties> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.2</version> - <type>jar</type> - <url>http://ant.apache.org</url> - <properties> - <comment>Required to build and use the jtidy ant task.</comment> - </properties> - </dependency> - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-sourceforge-plugin</artifactId> - <version>1.0</version> - <type>plugin</type> - <url>http://maven-plugins.sourceforge.net</url> - <properties/> - </dependency> - <dependency> - <groupId>statcvs</groupId> - <artifactId>maven-statcvs-plugin</artifactId> - <version>2.4</version> - <type>plugin</type> - <properties> - <comment>maven plugin for the statcvs report</comment> - </properties> - </dependency> - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-findbugs-plugin</artifactId> - <version>0.8.4</version> - <type>plugin</type> - <properties> - <comment>maven plugin for the findbug report</comment> - </properties> - </dependency> - <dependency> - <groupId>maven-validator</groupId> - <artifactId>maven-xhtml-plugin</artifactId> - <version>1.2</version> - <type>plugin</type> - <url>http://maven-validator.sourceforge.net</url> - <properties> - <comment>maven plugin for the xthml validation report</comment> - </properties> - </dependency> - <dependency> - <groupId>maven</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.4.1</version> - <type>plugin</type> - <url>http://maven.apache.org/reference/plugins/checkstyle</url> - <properties> - <comment>maven plugin for the checkstyle report</comment> - </properties> - </dependency> - </dependencies> - <build> - <sourceDirectory>src/main</sourceDirectory> - <unitTestSourceDirectory>src/test</unitTestSourceDirectory> - <unitTest> - <includes> - <include>**/*Test.*</include> - </includes> - <resources> - <resource> - <directory>src/test-resources</directory> - <includes> - <include>**/*.*</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </unitTest> - <resources> - <resource> - <directory>src/main</directory> - <includes> - <include>**/*Messages.properties</include> - <include>**/*.gif</include> - <include>**/*.txt</include> - <include>**/manifest.mf</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </build> - <reports> - <report>maven-license-plugin</report> - <report>maven-checkstyle-plugin</report> - <report>maven-changes-plugin</report> - <report>maven-javadoc-plugin</report> - <report>maven-jdepend-plugin</report> - <report>maven-pmd-plugin</report> - <report>maven-findbugs-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-clover-plugin</report> - <report>maven-tasklist-plugin</report> - <report>maven-simian-plugin</report> - <report>maven-statcvs-plugin</report> - <report>maven-xhtml-plugin</report> - </reports> - <properties/> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd "> + <pomVersion>3</pomVersion> + <name>JTidy</name> + <groupId>jtidy</groupId> + <currentVersion>r8-SNAPSHOT</currentVersion> + <organization> + <name>sourceforge</name> + <url>http://sourceforge.net</url> + <logo>http://sourceforge.net/sflogo.php?group_id=13153&type=2</logo> + </organization> + <inceptionYear>2000</inceptionYear> + <package>org.w3c.tidy</package> + <logo>/images/logo.png</logo> + <description> + JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM interface to the document that is being processed, which effectively makes you able to + use JTidy as a DOM parser for real-world HTML. + </description> + <shortDescription>JTidy - HTML syntax checker and pretty printer</shortDescription> + <url>http://jtidy.sourceforge.net</url> + <issueTrackingUrl>http://sourceforge.net/tracker/?group_id=13153</issueTrackingUrl> + <siteAddress>shell.sourceforge.net</siteAddress> + <siteDirectory>/home/groups/j/jt/jtidy/htdocs</siteDirectory> + <distributionDirectory>http://sourceforge.net/project/showfiles.php?group_id=13153</distributionDirectory> + <repository> + <connection>scm:cvs:pserver:anonymous:@cvs.sourceforge.net:/cvsroot/jtidy:jtidy</connection> + <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/jtidy:jtidy</developerConnection> + <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jtidy/jtidy/</url> + </repository> + <versions> + <version> + <id>04aug2000r2</id> + <name>04aug2000r2</name> + <tag></tag> + </version> + <version> + <id>04aug2000r3</id> + <name>04aug2000r3</name> + <tag></tag> + </version> + <version> + <id>04aug2000r4</id> + <name>04aug2000r4</name> + <tag></tag> + </version> + <version> + <id>04aug2000r5</id> + <name>04aug2000r5</name> + <tag></tag> + </version> + <version> + <id>04aug2000r6</id> + <name>04aug2000r6</name> + <tag></tag> + </version> + <version> + <id>04aug2000r7-dev</id> + <name>04aug2000r7-dev</name> + <tag></tag> + </version> + </versions> + <mailingLists> + <mailingList> + <name>JTidy User Mailing list</name> + <subscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-user</subscribe> + <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-user</unsubscribe> + <archive>http://sourceforge.net/mailarchive/forum.php?forum=jtidy-user</archive> + </mailingList> + <mailingList> + <name>JTidy Developer Mailing list</name> + <subscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-devel</subscribe> + <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-devel</unsubscribe> + <archive>http://sourceforge.net/mailarchive/forum.php?forum=jtidy-devel</archive> + </mailingList> + <mailingList> + <name>JTidy Cvs Mailing list</name> + <subscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-cvs</subscribe> + <unsubscribe>http://lists.sourceforge.net/lists/listinfo/jtidy-cvs</unsubscribe> + <archive>http://sourceforge.net/mailarchive/forum.php?forum=jtidy-cvs</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <name>Fabrizio Giustina</name> + <id>fgiust</id> + <email>fgiust AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>Current project admin and developer</role> + </roles> + <timezone>+1</timezone> + </developer> + <developer> + <name>Andy Tripp</name> + <id>atripp</id> + <email>atripp AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>Project admin</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> + <name>Russell Gold</name> + <id>russgold</id> + <email>russgold AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>Project admin</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> + <name>Gary L Peskin</name> + <id>garypeskin</id> + <email>garypeskin AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>developer</role> + </roles> + <timezone>0</timezone> + </developer> + <developer> + <name>Sami Lempinen</name> + <id>lempinen</id> + <email>lempinen AT users.sourceforge.net</email> + <organization>Sourceforge</organization> + <roles> + <role>release manager</role> + </roles> + <timezone>0</timezone> + </developer> + </developers> + <licenses> + <license /> + </licenses> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>dom3-xml-apis</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + <properties> + <comment>Only used in junit tests. Not needed at runtime.</comment> + </properties> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.2</version> + <url>http://ant.apache.org</url> + <properties> + <comment>Required to build and use the jtidy ant task.</comment> + </properties> + </dependency> + <dependency> + <groupId>maven-plugins</groupId> + <artifactId>maven-sourceforge-plugin</artifactId> + <version>1.0</version> + <type>plugin</type> + <url>http://maven-plugins.sourceforge.net</url> + </dependency> + <dependency> + <groupId>statcvs</groupId> + <artifactId>maven-statcvs-plugin</artifactId> + <version>2.7</version> + <type>plugin</type> + <properties> + <comment>maven plugin for the statcvs report</comment> + </properties> + </dependency> + <dependency> + <groupId>maven-plugins</groupId> + <artifactId>maven-findbugs-plugin</artifactId> + <version>0.9.2</version> + <type>plugin</type> + <properties> + <comment>maven plugin for the findbug report</comment> + </properties> + </dependency> + <dependency> + <groupId>maven-validator</groupId> + <artifactId>maven-xhtml-plugin</artifactId> + <version>1.2</version> + <type>plugin</type> + <url>http://maven-validator.sourceforge.net</url> + <properties> + <comment>maven plugin for the xthml validation report</comment> + </properties> + </dependency> + <dependency> + <groupId>maven</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.4.1</version> + <type>plugin</type> + <url>http://maven.apache.org/reference/plugins/checkstyle</url> + <properties> + <comment>maven plugin for the checkstyle report</comment> + </properties> + </dependency> + </dependencies> + <build> + <nagEmailAddress>jti...@li...</nagEmailAddress> + <sourceDirectory>src/main</sourceDirectory> + <unitTestSourceDirectory>src/test</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*Test.*</include> + </includes> + <resources> + <resource> + <directory>src/test-resources</directory> + <includes> + <include>**/*.*</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </unitTest> + <resources> + <resource> + <directory>src/main</directory> + <includes> + <include>**/*Messages.properties</include> + <include>**/*.gif</include> + <include>**/*.txt</include> + <include>**/manifest.mf</include> + </includes> + <filtering>false</filtering> + </resource> + </resources> + </build> + <reports> + <report>maven-license-plugin</report> + <report>maven-checkstyle-plugin</report> + <report>maven-changes-plugin</report> + <report>maven-javadoc-plugin</report> + <report>maven-jdepend-plugin</report> + <report>maven-pmd-plugin</report> + <report>maven-findbugs-plugin</report> + <report>maven-jxr-plugin</report> + <report>maven-junit-report-plugin</report> + <report>maven-clover-plugin</report> + <report>maven-tasklist-plugin</report> + <report>maven-simian-plugin</report> + <report>maven-statcvs-plugin</report> + <report>maven-xhtml-plugin</report> + </reports> </project> \ No newline at end of file |