You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/01/24 13:15:34 UTC
svn commit: r126279 - /maven/maven-1/plugins/trunk/linkcheck/project.xml /maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java
Author: brett
Date: Mon Jan 24 04:15:32 2005
New Revision: 126279
URL: http://svn.apache.org/viewcvs?view=rev&rev=126279
Log:
remove need for maven-jelly-tags dependency
Modified:
maven/maven-1/plugins/trunk/linkcheck/project.xml
maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java
Modified: maven/maven-1/plugins/trunk/linkcheck/project.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/linkcheck/project.xml?view=diff&rev=126279&p1=maven/maven-1/plugins/trunk/linkcheck/project.xml&r1=126278&p2=maven/maven-1/plugins/trunk/linkcheck/project.xml&r2=126279
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/project.xml (original)
+++ maven/maven-1/plugins/trunk/linkcheck/project.xml Mon Jan 24 04:15:32 2005
@@ -140,13 +140,8 @@
</dependency>
<dependency>
<groupId>maven</groupId>
- <artifactId>maven-jelly-tags</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
<artifactId>maven-model</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<!-- Required for commons-httpclient -->
@@ -168,7 +163,7 @@
<dependency>
<groupId>maven</groupId>
<artifactId>maven</artifactId>
- <version>1.0-rc2</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<jar>js-1.5R4-RC3.jar</jar>
Modified: maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java?view=diff&rev=126279&p1=maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java&r1=126278&p2=maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java&r2=126279
==============================================================================
--- maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java (original)
+++ maven/maven-1/plugins/trunk/linkcheck/src/main/org/apache/maven/linkcheck/LinkCheck.java Mon Jan 24 04:15:32 2005
@@ -42,7 +42,7 @@
*
* @author <a href="mailto:bwalding@apache.org">Ben Walding</a>
* @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
- * @version $Id: LinkCheck.java,v 1.14 2004/08/01 21:05:33 carlos Exp $
+ * @version $Id$
*/
public class LinkCheck
{
@@ -239,16 +239,12 @@
lvm.setExcludes(tokens);
}
lvm.addLinkValidator(new FileLinkValidator());
- MavenJellyContext ctx;
- if (getProject() == null) {
- LOG.error("maven-linkcheck-plugin: No project set.");
- ctx = new MavenJellyContext();
- } else {
- //System.out.println("Project set:" + getProject());
- ctx = ((Project) getProject()).getContext();
+ // Project is only null in test cases
+ if (getProject() != null) {
+ MavenJellyContext ctx = ((Project) getProject()).getContext();
+ lvm.addLinkValidator(new HTTPLinkValidator(ctx.getProxyHost(), ctx.getProxyPort(), ctx.getProxyUserName(), ctx.getProxyPassword()));
}
- lvm.addLinkValidator(new HTTPLinkValidator(ctx.getProxyHost(), ctx.getProxyPort(), ctx.getProxyUserName(), ctx.getProxyPassword()));
lvm.addLinkValidator(new MailtoLinkValidator());
lvm.loadCache(cache);
}
@@ -330,4 +326,4 @@
this.project = (Project) project;
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org