2012/5/24 Konstantin Kolinko <knst.koli...@gmail.com>: > 2012/5/21 <ol...@apache.org>: >> Author: olamy >> Date: Mon May 21 08:36:51 2012 >> New Revision: 1340932 >> >> URL: http://svn.apache.org/viewvc?rev=1340932&view=rev >> Log: >> [MTOMCAT-156] exec-war should allow creation of exec-war in projects with >> any packaging type >> Submitted by Peter Lynch. >> >> Modified: >> >> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java >> > > Apparently this commit caused error in testsuite run by Jenkins (run #151). > The output can be seen here: > > https://builds.apache.org/job/TomcatMavenPlugin-mvn3.x/151/org.apache.tomcat.maven$tomcat7-maven-plugin/testReport/junit/org.apache.tomcat.maven.it/Tomcat7SimpleWarProjectIT/testIt/ > > java.lang.AssertionError: Received message body must not be null. > at org.junit.Assert.fail(Assert.java:93) > at org.junit.Assert.assertTrue(Assert.java:43) > at org.junit.Assert.assertNotNull(Assert.java:526) > at > org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT.testIt(AbstractSimpleWarProjectIT.java:59) > > > I do not know why. Just saying that subsequent runs are failing as > well and that run #150 was OK. This seems to be the only change > between the 150 and 151. and #154 is fine without huge changes :-). And that build locally. Yup sometimes that fail on jenkins (I don't know why) > > Best regards, > Konstantin Kolinko > >> Modified: >> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java >> URL: >> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1340932&r1=1340931&r2=1340932&view=diff >> ============================================================================== >> --- >> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java >> (original) >> +++ >> tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java >> Mon May 21 08:36:51 2012 >> @@ -311,9 +311,7 @@ public abstract class AbstractExecWarMoj >> >> properties.put( Tomcat7Runner.WARS_KEY, >> StringUtils.removeStart( path, "/" ) + ".war|" + path ); >> } >> - >> - if ( "pom".equals( project.getPackaging() ) && ( >> warRunDependencies != null >> - && !warRunDependencies.isEmpty() ) ) >> + else if ( warRunDependencies != null && >> !warRunDependencies.isEmpty() ) >> { >> for ( WarRunDependency warRunDependency : warRunDependencies >> ) >> { >> @@ -353,8 +351,6 @@ public abstract class AbstractExecWarMoj >> } >> } >> >> - // FIXME if no war has been added here we must stop with a >> human readable and user friendly error message >> - >> if ( serverXml != null && serverXml.exists() ) >> { >> os.putArchiveEntry( new JarArchiveEntry( "conf/server.xml" ) >> ); >> >> > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org >
-- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
