From e5cd97b93a86d4e2205b36788c0e6f5fbc226570 Mon Sep 17 00:00:00 2001 From: olamy Date: Tue, 9 Nov 2010 15:49:29 +0000 Subject: [PATCH] cleanup unused stuff git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/main-maven3-support@36789 71c3de6d-444a-0410-be80-ed276b4c234a --- .../src/main/java/hudson/maven/MavenComputerListener.java | 5 ----- .../resources/org/jvnet/hudson/maven3/agent/classworlds.conf | 1 - 2 files changed, 6 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java index 63796a2dc8..1886884a4a 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java @@ -38,10 +38,8 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; -import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Zip; -import org.codehaus.plexus.classworlds.ClassWorld; import org.jvnet.hudson.maven3.agent.Maven3Main; import org.jvnet.hudson.maven3.launcher.Maven3Launcher; @@ -60,9 +58,6 @@ public class MavenComputerListener extends ComputerListener { copyJar(logger, root, Maven3Launcher.class, "maven3-listener"); copyJar(logger, root, PluginManagerInterceptor.class, "maven-interceptor"); copyJar(logger, root, Maven21Interceptor.class, "maven2.1-interceptor"); - // FIXME not needed - copyJar(logger, root, ClassWorld.class, "plexus-classworld"); - copyJar(logger, root, AntClassLoader.class, "maven-plugin-ant"); } /** diff --git a/maven3-agent/src/main/resources/org/jvnet/hudson/maven3/agent/classworlds.conf b/maven3-agent/src/main/resources/org/jvnet/hudson/maven3/agent/classworlds.conf index e2d3b6a041..f4675ae49a 100755 --- a/maven3-agent/src/main/resources/org/jvnet/hudson/maven3/agent/classworlds.conf +++ b/maven3-agent/src/main/resources/org/jvnet/hudson/maven3/agent/classworlds.conf @@ -1,7 +1,6 @@ # # mostly copied as-is from $MAVEN_HOME/bin/m2.conf # -#main is org.apache.maven.cli.MavenCli from plexus.core.maven main is org.jvnet.hudson.maven3.launcher.Maven3Launcher from plexus.core set maven.home default ${user.home}/m2