Good point, Dan! I have just done this. Cheers,
David On 10 December 2010 17:00, Daniel Kulp <dk...@apache.org> wrote: > > David, > > I don't think this is completely a "maven version" issue. It looks like its > an issue of not locking down the version of the plugins. Specifically teh > maven-assembly-plugin. > > With maven 2.2, it's getting version 2.2-beta-2. With 3.0, it's getting 2.2- > beta-5. The best best is to lock down the various versions of the plugins > to make sure they are consistent no matter the maven version being used. > > Then fix the test. :-) > > Dan > > > On Friday 10 December 2010 11:49:33 am dav...@apache.org wrote: >> Author: davidb >> Date: Fri Dec 10 16:49:33 2010 >> New Revision: 1044430 >> >> URL: http://svn.apache.org/viewvc?rev=1044430&view=rev >> Log: >> Reverting system test change which apparently only applies to Maven 3 while >> Hudson seems to be using 2.x >> >> Modified: >> >> cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/ >> systests2/multi/MultiBundleTools.java >> >> Modified: >> cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/ >> systests2/multi/MultiBundleTools.java URL: >> http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/te >> st/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=1044 >> 430&r1=1044429&r2=1044430&view=diff >> ========================================================================== >> ==== --- >> cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/ >> systests2/multi/MultiBundleTools.java (original) +++ >> cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/ >> systests2/multi/MultiBundleTools.java Fri Dec 10 16:49:33 2010 @@ -44,7 >> +44,7 @@ public class MultiBundleTools { >> } >> >> private static int getDistroBundles(File mdRoot, String pomVersion, >> Map<Integer, String> bundles, boolean discovery) throws Exception { - >> File distroDir = new File(mdRoot, >> "target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion); + >> File distroDir = new File(mdRoot, >> "target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion + ".dir"); >> Properties p = new Properties(); >> File confDir = new File(distroDir, "apache-cxf-dosgi-ri-" + >> pomVersion + "/conf"); p.load(new FileInputStream(new File(confDir, >> "felix.config.properties.append"))); > > -- > Daniel Kulp > dk...@apache.org > http://dankulp.com/blog >
