From d814c09e333795b603ebab7df9c359a38a7070f4 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Fri, 29 Jan 2010 19:56:59 +0000
Subject: [PATCH] baby step toward working with Maven 3.0.

The next step is to write a new bootstrap code that works with plexus classworlds, which is package-renamed.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@26722 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../java/hudson/maven/MavenProcessFactory.java | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
index 3f06e99976c2..1133731440b6 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
@@ -378,9 +378,25 @@ private Node getCurrentNode() {
         return Executor.currentExecutor().getOwner().getNode();
     }
 
+    /**
+     * Locates classworlds jar file.
+     *
+     * Note that Maven 3.0 changed the name to plexus-classworlds 
+     *
+     * <pre>
+     * $ find tools/ -name "*classworlds*.jar"
+     * tools/maven/boot/classworlds-1.1.jar
+     * tools/maven-2.2.1/boot/classworlds-1.1.jar
+     * tools/maven-3.0-alpha-2/boot/plexus-classworlds-1.3.jar
+     * tools/maven-3.0-alpha-3/boot/plexus-classworlds-2.2.2.jar
+     * tools/maven-3.0-alpha-4/boot/plexus-classworlds-2.2.2.jar
+     * tools/maven-3.0-alpha-5/boot/plexus-classworlds-2.2.2.jar
+     * tools/maven-3.0-alpha-6/boot/plexus-classworlds-2.2.2.jar
+     * </pre>
+     */
     private static final FilenameFilter CLASSWORLDS_FILTER = new FilenameFilter() {
         public boolean accept(File dir, String name) {
-            return name.startsWith("classworlds") && name.endsWith(".jar");
+            return name.contains("classworlds") && name.endsWith(".jar");
         }
     };