the plxus/components.xml of maven-interceptor and maven2.1-interceptor
are picked up in the MavenEmbedder while parsing POM, which breaks
Maven 2.0.7 (that is, I needed to run the tests on Maven 2.0.7 to reproduce
the problem.)
So I'm adding the marker file so that our MaskedClassLoader can hide
them from Plexus when we start MavenEmbedder.
I hate making this kind of change in the RC branch, and this problem
doesn't appear to affect my RC deployment so far (so maybe this only
reproduces when we run Hudson inside Maven), but OTOH this should be
a fairly low risk change.
git-svn-id: https://hudson.dev.java.net/svn/hudson/branches/rc@18126 71c3de6d-444a-0410-be80-ed276b4c234a
https://www.dev.java.net/svn/hudson/branches/rc
........
r18002 | kohsuke | 2009-05-12 12:14:24 -0700 (Tue, 12 May 2009) | 1 line
merging the RC branch
........
r18026 | kohsuke | 2009-05-12 21:31:09 -0700 (Tue, 12 May 2009) | 1 line
if "e" is <textarea> there won't be any @type
........
r18027 | kohsuke | 2009-05-12 21:36:25 -0700 (Tue, 12 May 2009) | 1 line
If distributed build isn't enabled, slave selection drop-down shouldn't be displayed in the job config.
........
r18029 | kohsuke | 2009-05-12 22:00:03 -0700 (Tue, 12 May 2009) | 1 line
documenting why we set system props
........
r18030 | kohsuke | 2009-05-12 22:51:55 -0700 (Tue, 12 May 2009) | 1 line
This just ends up passing the -B option twice.
........
r18036 | kohsuke | 2009-05-12 23:17:30 -0700 (Tue, 12 May 2009) | 7 lines
[FIXED HUDSON-2373] Modified to work with Maven 2.1. Sorry for a long delay, folks. This change will be in 1.305.
We basically need an ability to feed different components.xml depending on Maven's version (which will be read by DefaultComponentDiscoverer in Plexus.) The implementation in this fix is hacky, and based on placing one more jar in front of the classpath when run on Maven 2.1, while maven-interceptor still contains the default components.xml for 2.0.x.
Ideally 2.0.x components.xml should move to its own jar and so that we can switch between them, as opposed to pass in extra jar only when it's Maven 2.1.
We'll see how Maven 3.0 works with this regard.
........
r18040 | kohsuke | 2009-05-13 10:31:59 -0700 (Wed, 13 May 2009) | 1 line
improved error handling
........
r18041 | kohsuke | 2009-05-13 10:34:14 -0700 (Wed, 13 May 2009) | 1 line
Long lines in console output are now wrapped in most browsers.
........
r18042 | kohsuke | 2009-05-13 11:02:52 -0700 (Wed, 13 May 2009) | 1 line
documenting what it does.
........
r18068 | kohsuke | 2009-05-13 15:15:24 -0700 (Wed, 13 May 2009) | 1 line
[FIXED HUDSON-3653] Fixed in 1.305
........
r18070 | kohsuke | 2009-05-13 15:28:04 -0700 (Wed, 13 May 2009) | 1 line
creating a new RC branch
........
r18093 | kohsuke | 2009-05-14 10:05:16 -0700 (Thu, 14 May 2009) | 1 line
[HUDSON-3684] In 1.305 I improved error diagnostics to show why the loading of Winp failed, so please try that and report back the new error message you get.
........
r18094 | kohsuke | 2009-05-14 10:28:33 -0700 (Thu, 14 May 2009) | 1 line
fixed a typo as pointed out by Jesse, so that this change can make it into 1.305.
........
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18097 71c3de6d-444a-0410-be80-ed276b4c234a
We basically need an ability to feed different components.xml depending on Maven's version (which will be read by DefaultComponentDiscoverer in Plexus.) The implementation in this fix is hacky, and based on placing one more jar in front of the classpath when run on Maven 2.1, while maven-interceptor still contains the default components.xml for 2.0.x.
Ideally 2.0.x components.xml should move to its own jar and so that we can switch between them, as opposed to pass in extra jar only when it's Maven 2.1.
We'll see how Maven 3.0 works with this regard.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18036 71c3de6d-444a-0410-be80-ed276b4c234a
kohsuke
sogabe
abayer
jglick