Well, its fixed now. I have a bad habit of only running the Maven tests semi-regularly because they take so long on my laptop :(
- Brett > -----Original Message----- > From: Arnaud Heritier [mailto:[EMAIL PROTECTED] > Sent: Wednesday, 12 May 2004 3:42 PM > To: 'Maven Developers List' > Subject: RE: cvs commit: maven/src/test/touchstone-build maven.xml > > > No, I don't still run the tests ;-) > But I had a problem with my CVS (conflict on files) and I > checked out maven and maven-plugins. I made a build-bootstrap > and found this problem :-) > > > -----Message d'origine----- > > De : Brett Porter [mailto:[EMAIL PROTECTED] > > Envoyé : mercredi 12 mai 2004 00:58 > > À : 'Maven Developers List' > > Objet : RE: cvs commit: maven/src/test/touchstone-build maven.xml > > > > You still run the tests? :) > > > > Thanks. > > > > > -----Original Message----- > > > From: Heritier Arnaud [mailto:[EMAIL PROTECTED] > > > Sent: Tuesday, 11 May 2004 11:11 PM > > > To: Maven Developers List > > > Subject: RE: cvs commit: maven/src/test/touchstone-build maven.xml > > > > > > > > > Patch to fix this bug : > > > > > > Index: > > > src/test/java/org/apache/maven/plugin/PluginCacheManagerTest.java > > > > =================================================================== > > > RCS file: > > > /home/cvspublic/maven/src/test/java/org/apache/maven/plugin/Pl > > > uginCacheManagerTest.java,v > > > retrieving revision 1.5.4.4 > > > diff -u -r1.5.4.4 PluginCacheManagerTest.java > > > --- src/test/java/org/apache/maven/plugin/PluginCacheManagerTe > > > st.java 1 Apr 2004 01:52:20 -0000 1.5.4.4 > > > +++ > > > src/test/java/org/apache/maven/plugin/PluginCacheManagerTe > > > st.java 11 May 2004 12:58:53 -0000 > > > @@ -57,7 +57,7 @@ > > > { > > > PluginCacheManager pgb = new PluginCacheManager(); > > > JellyScriptHousing housing = new JellyScriptHousing( new > > > File( PLUGIN_SCRIPT ).getParentFile(), null ); > > > - housing.parse( pgb, new FileInputStream( new File( > > > PLUGIN_SCRIPT ))); > > > + housing.parse( pgb, null, new FileInputStream( new File( > > > + PLUGIN_SCRIPT ))); > > > > > > assertEquals("Generate docs in APT > > > format>xdoc:generate-from-pom", > > > pgb.getGoalCache().getProperty("apt:generate")); > > > > > > > > > > -----Message d'origine----- > > > > De : Heritier Arnaud > > > > Envoyé : mardi 11 mai 2004 14:57 > > > > À : Maven Developers List > > > > Objet : RE: cvs commit: maven/src/test/touchstone-build > maven.xml > > > > > > > > > > > > hello brett > > > > > > > > the bootstrap failed. > > > > > > > > I think that it is due to this commit > > > > > > > > > > > > [exec] __ __ > > > > [exec] | \/ |__ _Apache__ ___ > > > > [exec] | |\/| / _` \ V / -_) ' \ ~ intelligent projects ~ > > > > [exec] |_| |_\__,_|\_/\___|_||_| v. 1.0-rc3-SNAPSHOT > > > > > > > > [exec] plugin license is cached (dynatag dep) but > no longer > > > > present > > > > [exec] Cache invalidated due to out of date plugins > > > > [exec] build:start: > > > > > > > > [exec] clean:clean: > > > > > > > > [exec] clean: > > > > > > > > [exec] java:prepare-filesystem: > > > > [exec] [mkdir] Created dir: > > > > C:\Work\Opensources\maven-1.0\target\classes > > > > > > > > [exec] java:compile: > > > > [exec] [echo] Compiling to > > > > C:\Work\Opensources\maven-1.0/target/classes > > > > [exec] [javac] Compiling 77 source files to > > > > C:\Work\Opensources\maven-1.0\target\classes > > > > > > > > [exec] java:jar-resources: > > > > [exec] Copying 1 file to > > > > C:\Work\Opensources\maven-1.0\target\classes\META-INF > > > > [exec] Copying 4 files to > > > > C:\Work\Opensources\maven-1.0\target\classes > > > > [exec] Copying 10 files to > > > > > > > > C:\Work\Opensources\maven-1.0\target\classes\org\apache\maven\messag > > > es > > > > > > > > [exec] test:prepare-filesystem: > > > > [exec] [mkdir] Created dir: > > > > C:\Work\Opensources\maven-1.0\target\test-classes > > > > [exec] [mkdir] Created dir: > > > > C:\Work\Opensources\maven-1.0\target\test-reports > > > > > > > > [exec] test:test-resources: > > > > > > > > [exec] test:compile: > > > > [exec] [javac] Compiling 38 source files to > > > > C:\Work\Opensources\maven-1.0\target\test-classes > > > > [exec] > > > > C:\Work\Opensources\maven-1.0\src\test\java\org\apache\maven\p > > > > lugin\PluginCacheManagerTest.java:60: cannot resolve symbol > > > > [exec] symbol : method parse > > > > > (org.apache.maven.plugin.PluginCacheManager,java.io.FileInputStream) > > > > [exec] location: class > > > org.apache.maven.plugin.JellyScriptHousing > > > > [exec] housing.parse( pgb, new FileInputStream( > > > > new File( PLUGIN_SCRIPT ))); > > > > [exec] ^ > > > > [exec] 1 error > > > > > > > > [exec] BUILD FAILED > > > > [exec] File...... > > > > C:\Work\Config\maven\plugins\maven-test-plugin-1.6-SNAPSHOT\pl > > > > ugin.jelly > > > > [exec] Element... javac > > > > [exec] Line...... 52 > > > > [exec] Column.... 46 > > > > [exec] Compile failed; see the compiler error output > > > for details. > > > > [exec] Total time: 23 seconds > > > > [exec] Finished at: Tue May 11 14:43:00 CEST 2004 > > > > > > > > Arnaud > > > > > > > > > > > > > -----Message d'origine----- > > > > > De : [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] > > > > > Envoyé : mardi 11 mai 2004 11:48 > > > > > À : [EMAIL PROTECTED] > > > > > Objet : cvs commit: maven/src/test/touchstone-build maven.xml > > > > > > > > > > > > > > > brett 2004/05/11 02:48:16 > > > > > > > > > > Modified: src/java/org/apache/maven/plugin Tag: > > > > MAVEN-1_0-BRANCH > > > > > JellyScriptHousing.java > PluginManager.java > > > > > PluginScriptParser.java > > > > > src/test/touchstone-build Tag: > MAVEN-1_0-BRANCH > > > > > maven.xml > > > > > Log: > > > > > PR: MAVEN-1223 > > > > > Submitted by: joseph benavidez > > > > > Reviewed by: Brett Porter > > > > > Applied with modifications. > > > > > Have system entities with relative paths in maven.xml and > > > > > plugin scripts resolve relative to the correct location. > > > > > Also v1.16.1.10 of JellyUtils.java is included here but has > > > > > the wrong log message. > > > > > > > > > > Revision Changes Path > > > > > No revision > > > > > No revision > > > > > 1.3.4.14 +4 -3 > > > > > maven/src/java/org/apache/maven/plugin/JellyScriptHousing.java > > > > > > > > > > Index: JellyScriptHousing.java > > > > > > > > > > ================================================================== > > > > = > > > > > RCS file: > > > > > /home/cvs/maven/src/java/org/apache/maven/plugin/JellyScriptHo > > > > > using.java,v > > > > > retrieving revision 1.3.4.13 > > > > > retrieving revision 1.3.4.14 > > > > > diff -u -r1.3.4.13 -r1.3.4.14 > > > > > --- JellyScriptHousing.java 2 Apr 2004 03:42:25 > > > > -0000 1.3.4.13 > > > > > +++ JellyScriptHousing.java 11 May 2004 09:48:16 > > > > -0000 1.3.4.14 > > > > > @@ -145,7 +145,7 @@ > > > > > return name; > > > > > } > > > > > > > > > > - void parse( PluginDefinitionHandler handler, > > > > > InputStream inStream ) throws MavenException > > > > > + void parse( PluginDefinitionHandler handler, String > > > > > systemId, InputStream inStream ) throws MavenException > > > > > { > > > > > try > > > > > { > > > > > @@ -153,6 +153,7 @@ > > > > > factory.setNamespaceAware( true ); > > > > > SAXParser parser = factory.newSAXParser(); > > > > > InputSource is = new InputSource( inStream ); > > > > > + is.setSystemId( systemId ); > > > > > parser.parse( is, new PluginScriptParser( > > > > > handler, this ) ); > > > > > } > > > > > catch ( ParserConfigurationException e ) > > > > > @@ -173,7 +174,7 @@ > > > > > { > > > > > try > > > > > { > > > > > - parse( handler, new FileInputStream( > source ) ); > > > > > + parse( handler, source.getAbsolutePath(), new > > > > > FileInputStream( source ) ); > > > > > } > > > > > catch ( FileNotFoundException e ) > > > > > { > > > > > > > > > > > > > > > > > > > > 1.70.4.45 +2 -2 > > > > > 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.44 > > > > > retrieving revision 1.70.4.45 > > > > > diff -u -r1.70.4.44 -r1.70.4.45 > > > > > --- PluginManager.java 7 May 2004 22:56:08 -0000 > > > > > 1.70.4.44 > > > > > +++ PluginManager.java 11 May 2004 09:48:16 -0000 > > > > > 1.70.4.45 > > > > > @@ -521,7 +521,7 @@ > > > > > // TODO: stop reading all scripts 2 times > > > > > driver.close(); > > > > > driver = getClass().getResourceAsStream( > > > > "/driver.jelly" ); > > > > > - driverHousing.parse( transientMapper, driver ); > > > > > + driverHousing.parse( transientMapper, > null, driver ); > > > > > driver.close(); > > > > > > > > > > List projectHousings = readMavenXml( project, > > > > > transientMapper ); > > > > > > > > > > > > > > > > > > > > 1.1.4.12 +3 -1 > > > > > maven/src/java/org/apache/maven/plugin/PluginScriptParser.java > > > > > > > > > > Index: PluginScriptParser.java > > > > > > > > > > ================================================================== > > > > = > > > > > RCS file: > > > > > /home/cvs/maven/src/java/org/apache/maven/plugin/PluginScriptP > > > > > arser.java,v > > > > > retrieving revision 1.1.4.11 > > > > > retrieving revision 1.1.4.12 > > > > > diff -u -r1.1.4.11 -r1.1.4.12 > > > > > --- PluginScriptParser.java 1 Apr 2004 01:52:21 > > > > -0000 1.1.4.11 > > > > > +++ PluginScriptParser.java 11 May 2004 09:48:16 > > > > -0000 1.1.4.12 > > > > > @@ -26,6 +26,7 @@ > > > > > import org.xml.sax.SAXParseException; > > > > > import org.xml.sax.helpers.DefaultHandler; > > > > > > > > > > +import java.io.File; > > > > > import java.io.FileInputStream; > > > > > import java.io.IOException; > > > > > import java.util.HashSet; > > > > > @@ -117,7 +118,8 @@ > > > > > log.debug( rawName + " importing > from uri " + > > > > > importUri ); > > > > > try > > > > > { > > > > > - jellyScriptHousing.parse( handler, new > > > > > FileInputStream( importUri ) ); > > > > > + File f = new File( importUri ); > > > > > + jellyScriptHousing.parse( handler, > > > > > f.getAbsolutePath(), new FileInputStream( f ) ); > > > > > } > > > > > catch ( MavenException e ) > > > > > { > > > > > > > > > > > > > > > > > > > > No revision > > > > > No revision > > > > > 1.43.4.15 +15 -0 > maven/src/test/touchstone-build/maven.xml > > > > > > > > > > Index: maven.xml > > > > > > > > > > ================================================================== > > > > = > > > > > RCS file: > /home/cvs/maven/src/test/touchstone-build/maven.xml,v > > > > > retrieving revision 1.43.4.14 > > > > > retrieving revision 1.43.4.15 > > > > > diff -u -r1.43.4.14 -r1.43.4.15 > > > > > --- maven.xml 5 May 2004 11:04:10 -0000 > 1.43.4.14 > > > > > +++ maven.xml 11 May 2004 09:48:16 -0000 > 1.43.4.15 > > > > > @@ -15,6 +15,7 @@ > > > > > * limitations under the License. > > > > > */ > > > > > --> > > > > > + > > > > > <project > > > > > default="jar:jar" > > > > > xmlns:j="jelly:core" > > > > > @@ -214,6 +215,7 @@ > > > > > <attainGoal name="test-defaults" /> > > > > > <attainGoal name="test-inheritence" /> > > > > > <attainGoal name="test-non-jar-dependency-path" /> > > > > > + <attainGoal name="test-entity-goal" /> > > > > > > > > > > <!-- TODO - this is still broken (as in RC1) > > > > > <attainGoal name="test-reactor-maven-username" /> > > > > > @@ -803,6 +805,19 @@ > > > > > <j:if test="${warPath != warRepoPath}"> > > > > > <ant:fail>path = ${warPath}, expected > > > > > ${warRepoPath}</ant:fail> > > > > > </j:if> > > > > > + </goal> > > > > > + > > > > > + <goal name="test-entity-goal"> > > > > > + <maven:maven > > > > > + > > > > > > descriptor="${basedir}/src/reactor-build/entity-test/project.xml" > > > > > + goals="" > > > > > + ignoreFailures="false" > > > > > + /> > > > > > + <maven:maven > > > > > + > > > > > descriptor="${basedir}/src/reactor-build/entity-test/subprojec > > > > > t/project.xml" > > > > > + goals="" > > > > > + ignoreFailures="false" > > > > > + /> > > > > > </goal> > > > > > </project> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > -------------------------------------------------------------------- > > > - > > > > > To unsubscribe, e-mail: [EMAIL PROTECTED] For > > > > > additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > > > > > > > > > > > > > > > > -------------------------------------------------------------------- > > > - > > > > To unsubscribe, e-mail: [EMAIL PROTECTED] For > > > > additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > > > > > > > > > -------------------------------------------------------------------- > > > - > > > To unsubscribe, e-mail: [EMAIL PROTECTED] > > > For additional commands, e-mail: [EMAIL PROTECTED] > > > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] >
