That's interesting. *how* did it break that build? On Fri, May 27, 2011 at 8:49 AM, Daniel Kulp <[email protected]> wrote: > On Friday, May 27, 2011 4:37:45 AM Lukas Theussl wrote: >> Daniel, >> >> This commit breaks jenkins: >> >> https://builds.apache.org//view/M-R/view/Maven/job/maven-plugins-ITs-2.x/ >> >> and I also see it locally, can you review? > > I committed a fix and re-triggered a Jenkins build and it looks OK now. > Thanks for the heads up! I always forget about the ITs. > > I'll blame Benson, it was his patch... ;-) > > > Dan > > > > >> >> Thanks, >> -Lukas >> >> [email protected] wrote: >> > Author: dkulp >> > Date: Thu May 26 14:30:55 2011 >> > New Revision: 1127943 >> > >> > URL: http://svn.apache.org/viewvc?rev=1127943&view=rev >> > Log: >> > [MSHADE-99] Update to latest ASM to fix error message >> > Add javadoc >> > Patch from Benson Margulies applied >> > >> > Modified: >> > maven/plugins/trunk/maven-shade-plugin/pom.xml >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/mave >> > n/plugins/shade/DefaultShader.java >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/mav >> > en/plugins/shade/Shader.java >> > >> > Modified: maven/plugins/trunk/maven-shade-plugin/pom.xml >> > URL: >> > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/pom. >> > xml?rev=1127943&r1=1127942&r2=1127943&view=diff >> > ======================================================================== >> > ====== --- maven/plugins/trunk/maven-shade-plugin/pom.xml (original) >> > +++ maven/plugins/trunk/maven-shade-plugin/pom.xml Thu May 26 14:30:55 >> > 2011 @@ -97,7 +97,7 @@ under the License. >> > >> > <dependency> >> > >> > <groupId>asm</groupId> >> > <artifactId>asm</artifactId> >> > >> > -<version>3.2</version> >> > +<version>3.3.1</version> >> > >> > </dependency> >> > <dependency> >> > >> > <groupId>asm</groupId> >> > >> > Modified: >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/pl >> > ugins/shade/DefaultShader.java URL: >> > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/ >> > main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=1127943&r >> > 1=1127942&r2=1127943&view=diff >> > ======================================================================== >> > ====== --- >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/pl >> > ugins/shade/DefaultShader.java (original) +++ >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/pl >> > ugins/shade/DefaultShader.java Thu May 26 14:30:55 2011 @@ -36,6 +36,7 @@ >> > import java.util.regex.Matcher; >> > >> > import java.util.regex.Pattern; >> > import java.util.zip.ZipException; >> > >> > +import org.apache.maven.plugin.MojoExecutionException; >> > >> > import org.apache.maven.plugins.shade.relocation.Relocator; >> > import >> > org.apache.maven.plugins.shade.resource.ManifestResourceTransformer; >> > import org.apache.maven.plugins.shade.resource.ResourceTransformer; >> > >> > @@ -57,7 +58,7 @@ public class DefaultShader >> > >> > { >> > >> > public void shade( Set jars, File uberJar, List filters, List >> > relocators, List resourceTransformers ) >> > >> > - throws IOException >> > + throws IOException, MojoExecutionException >> > >> > { >> > >> > Set resources = new HashSet(); >> > >> > @@ -241,7 +242,7 @@ public class DefaultShader >> > >> > private void addRemappedClass( RelocatorRemapper remapper, >> > JarOutputStream jos, File jar, String name, >> > >> > InputStream is ) >> > >> > - throws IOException >> > + throws IOException, MojoExecutionException >> > >> > { >> > >> > if ( !remapper.hasRelocators() ) >> > { >> > >> > @@ -264,7 +265,12 @@ public class DefaultShader >> > >> > ClassVisitor cv = new TempRemappingClassAdapter( cw, remapper >> > ); >> > >> > - cr.accept( cv, ClassReader.EXPAND_FRAMES ); >> > + try { >> > + cr.accept( cv, ClassReader.EXPAND_FRAMES ); >> > + } catch ( Throwable ise ) { >> > + throw new MojoExecutionException ("Error in ASM processing >> > class " + + name, ise ); >> > + } >> > >> > byte[] renamedClass = cw.toByteArray(); >> > >> > Modified: >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/pl >> > ugins/shade/Shader.java URL: >> > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/ >> > main/java/org/apache/maven/plugins/shade/Shader.java?rev=1127943&r1=11279 >> > 42&r2=1127943&view=diff >> > ======================================================================== >> > ====== --- >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/pl >> > ugins/shade/Shader.java (original) +++ >> > maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/pl >> > ugins/shade/Shader.java Thu May 26 14:30:55 2011 @@ -24,11 +24,26 @@ >> > import java.io.IOException; >> > >> > import java.util.List; >> > import java.util.Set; >> > >> > -/** @author Jason van Zyl */ >> > +import org.apache.maven.plugin.MojoExecutionException; >> > + >> > +/** >> > + * Interface that defines the process of shading. >> > + * >> > + */ >> > >> > public interface Shader >> > { >> > >> > String ROLE = Shader.class.getName(); >> > >> > + /** >> > + * Perform a shading operation. >> > + * @param jars which jars >> > + * @param uberJar output jar >> > + * @param filters the filters >> > + * @param relocators the relocators >> > + * @param resourceTransformers the transformers >> > + * @throws IOException for IO errors reading the thing >> > + * @throws MojoExecutionException for anything else that goes wrong. >> > + */ >> > >> > void shade( Set jars, File uberJar, List filters, List relocators, >> > List resourceTransformers ) >> > >> > - throws IOException; >> > + throws IOException, MojoExecutionException; >> > >> > } >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: [email protected] >> For additional commands, e-mail: [email protected] > > -- > Daniel Kulp > [email protected] > http://dankulp.com/blog > Talend - http://www.talend.com > > --------------------------------------------------------------------- > 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]
