brett 2004/04/07 17:18:17
Modified: linkcheck project.xml
linkcheck/src/main/org/apache/maven/linkcheck
LinkCheckResult.java
linkcheck/xdocs changes.xml
Log:
MPLINKCHECK-11
replace commons-util with commons-lang
remove redundant classloader properties
Revision Changes Path
1.40 +2 -52 maven-plugins/linkcheck/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/linkcheck/project.xml,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- project.xml 10 Mar 2004 12:45:23 -0000 1.39
+++ project.xml 8 Apr 2004 00:18:16 -0000 1.40
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-linkcheck-plugin</id>
<name>Maven LinkCheck Plug-in</name>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<description>Check xdoc links. Requires Maven 1.0 RC2.</description>
<shortDescription>Check xdoc links</shortDescription>
<url>http://maven.apache.org/reference/plugins/linkcheck/</url>
@@ -39,25 +39,16 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.6.1</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>2.1</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-grant</groupId>
<artifactId>commons-grant</artifactId>
<version>1.0-beta-4</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -68,59 +59,33 @@
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly</artifactId>
<version>20030902.160215</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-util</groupId>
- <artifactId>commons-util</artifactId>
- <version>final</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>1.0.1</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-jsl</artifactId>
<version>20030211.143151</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-xml</artifactId>
<version>20030211.142705</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-ant</artifactId>
<version>20030211.142045</version>
<url>http://jakarta.apache.org/commons/jelly/libs/ant/</url>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<!-- Required for commons-httpclient -->
@@ -128,25 +93,16 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.4-dev-8</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>jtidy</groupId>
<artifactId>jtidy</artifactId>
<version>4aug2000r7-dev</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>maven</groupId>
@@ -158,18 +114,12 @@
<groupId>rhino</groupId>
<artifactId>rhino</artifactId>
<version>1.5R4-RC3</version>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
<dependency>
<groupId>werkz</groupId>
<artifactId>werkz</artifactId>
<version>1.0-beta-10</version>
<url>http://werkz.sourceforge.net/</url>
- <properties>
- <classloader>root.maven</classloader>
- </properties>
</dependency>
</dependencies>
<versions>
1.6 +4 -4
maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheckResult.java
Index: LinkCheckResult.java
===================================================================
RCS file:
/home/cvs/maven-plugins/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheckResult.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LinkCheckResult.java 2 Mar 2004 15:09:17 -0000 1.5
+++ LinkCheckResult.java 8 Apr 2004 00:18:17 -0000 1.6
@@ -16,9 +16,9 @@
* limitations under the License.
* ====================================================================
*/
-
-import org.apache.commons.util.XmlUtils;
+import org.apache.commons.lang.StringEscapeUtils;
+
/**
* An class containing the results of a single check of a link.
* @author <a href="mailto:[EMAIL PROTECTED]">Ben Walding</a>
@@ -74,7 +74,7 @@
StringBuffer buf = new StringBuffer();
buf.append(" <result>\n");
- buf.append(" <target>" + XmlUtils.escapeXml(getTarget()) + "</target>\n");
+ buf.append(" <target>" + StringEscapeUtils.escapeXml(getTarget()) +
"</target>\n");
buf.append(" <status>" + getStatus() + "</status>\n");
buf.append(" </result>\n");
1.13 +3 -0 maven-plugins/linkcheck/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/linkcheck/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 10 Mar 2004 12:45:23 -0000 1.12
+++ changes.xml 8 Apr 2004 00:18:17 -0000 1.13
@@ -24,6 +24,9 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.3-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="fix" issue="MPLINKCHECK-11" due-to="Ralph
Apel">Remove commons-util dependency. Must update to commons-lang 2.0.</action>
+ </release>
<release version="1.2" date="2004-03-10">
<action dev="evenisse" type="fix" issue="MPLINKCHECK-7">Fix HTML.</action>
</release>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
