brett 2004/03/08 14:17:49
Modified: src/java/org/apache/maven/plugin Tag: MAVEN-1_0-BRANCH
PluginManager.java
Log:
PR: MAVEN-1154, MPCHECKSTYLE-18
fix maven.xml inheritence of POM, and fix build failures on checkstyle plugin
Revision Changes Path
No revision
No revision
1.70.4.23 +2 -7 maven/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.70.4.22
retrieving revision 1.70.4.23
diff -u -r1.70.4.22 -r1.70.4.23
--- PluginManager.java 5 Mar 2004 05:17:16 -0000 1.70.4.22
+++ PluginManager.java 8 Mar 2004 22:17:49 -0000 1.70.4.23
@@ -407,7 +407,6 @@
ForeheadClassLoader classLoader = new ForeheadClassLoader(
Forehead.getInstance().getClassLoader( ROOT_MAVEN_CLASSLOADER ), project.getId() );
processDependencies( project, classLoader );
-
// Set up the ant project.
AntProjectBuilder.build( project, baseContext );
@@ -460,7 +459,7 @@
{
File mavenXml = p.getMavenXml();
- JellyScriptHousing jellyScriptHousing = createJellyScriptHousing(
p, mavenXml );
+ JellyScriptHousing jellyScriptHousing = createJellyScriptHousing(
project, mavenXml );
jellyScriptHousing.parse( transientMapper );
projectHousings.add( jellyScriptHousing );
}
@@ -832,11 +831,7 @@
s = loadScript( jellyScriptHousing );
jellyScriptHousing.setScript( s );
}
-
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( context.getClassLoader() );
s.run( context, context.getXMLOutput() );
- Thread.currentThread().setContextClassLoader( loader );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
