remove need for maven-jelly-tags dependency
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@126279 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -138,15 +138,10 @@
|
||||
<artifactId>commons-logging</artifactId>
|
||||
<version>1.0.3</version>
|
||||
</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>
|
||||
|
||||
@@ -42,7 +42,7 @@ import org.apache.maven.project.Project;
|
||||
*
|
||||
* @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 @@ public class LinkCheck
|
||||
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 @@ public class LinkCheck
|
||||
this.project = (Project) project;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user