Skip to content

Commit

Permalink
[MPLUGIN-387] Bump Ant to 1.9.16
Browse files Browse the repository at this point in the history
  • Loading branch information
@slachiewicz
slachiewicz committed Jan 10, 2022
1 parent f14830d commit c8ddcdc
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 137 deletions.
108 changes: 35 additions & 73 deletions ...script/maven-script-ant/src/test/java/org/apache/maven/script/ant/AntMojoWrapperTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,14 @@ public void test2xStylePlugin()
{
String pluginXml = "META-INF/maven/plugin-2.1.xml";

List<String> messages = run( pluginXml, true );
List<String> messages = run( pluginXml );

assertPresence( messages, "Unpacked Ant build scripts (in Maven build directory).", false );
assertPresence( messages, "Maven parameter expression evaluator for Ant properties.", false );
assertPresence( messages, "Maven standard project-based classpath references.", false );
assertPresence( messages, "Maven standard plugin-based classpath references.", false );
assertPresence( messages,
"Maven project, session, mojo-execution, or path-translation parameter information is", false );
assertPresence( messages, "maven-script-ant < 2.1.0, or used maven-plugin-tools-ant < 2.2 during release",
false );
assertPresence( messages, "Unpacked Ant build scripts (in Maven build directory)." );
assertPresence( messages, "Maven parameter expression evaluator for Ant properties." );
assertPresence( messages, "Maven standard project-based classpath references." );
assertPresence( messages, "Maven standard plugin-based classpath references." );
assertPresence( messages, "Maven project, session, mojo-execution, or path-translation parameter information is" );
assertPresence( messages, "maven-script-ant < 2.1.0, or used maven-plugin-tools-ant < 2.2 during release" );

ArgumentCaptor<BuildEvent> buildEvent = ArgumentCaptor.forClass(BuildEvent.class);
verify( buildListener, atLeastOnce() ).messageLogged( buildEvent.capture() );
Expand All @@ -106,52 +104,19 @@ public void test2xStylePlugin()
assertThat( buildEvent.getValue().getMessage(), endsWith( ".test.jar" ) );
}

@Test
public void test20StylePlugin()
throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
ComponentConfigurationException, ArchiverException, URISyntaxException
{
String pluginXml = "META-INF/maven/plugin-2.0.xml";

List<String> messages = run( pluginXml, false );

assertPresence( messages, "Unpacked Ant build scripts (in Maven build directory).", true );
assertPresence( messages, "Maven parameter expression evaluator for Ant properties.", true );
assertPresence( messages, "Maven standard project-based classpath references.", true );
assertPresence( messages, "Maven standard plugin-based classpath references.", true );
assertPresence( messages,
"Maven project, session, mojo-execution, or path-translation parameter information is", true );
assertPresence( messages, "maven-script-ant < 2.1.0, or used maven-plugin-tools-ant < 2.2 during release", true );

ArgumentCaptor<BuildEvent> buildEvent = ArgumentCaptor.forClass(BuildEvent.class);
verify( buildListener, atLeastOnce() ).messageLogged( buildEvent.capture() );

// last message
assertThat( buildEvent.getValue().getMessage(), startsWith( "plugin classpath is: " ) );
assertThat( buildEvent.getValue().getMessage(), endsWith( "path-is-missing" ) );
}

private void assertPresence( List<String> messages, String test, boolean shouldBePresent )
private void assertPresence( List<String> messages, String test )
{
for ( String message : messages )
{
if ( message.contains( test ) )
{
if ( !shouldBePresent )
{
fail( "Test string: '" + test + "' was found in output, but SHOULD NOT BE THERE." );
}
fail( "Test string: '" + test + "' was found in output, but SHOULD NOT BE THERE." );
return;
}
}

if ( shouldBePresent )
{
fail( "Test string: '" + test + "' was NOT found in output, but SHOULD BE THERE." );
}
}

private List<String> run( String pluginXml, boolean includeImplied )
private List<String> run( String pluginXml )
throws PlexusConfigurationException, IOException, ComponentInstantiationException, MojoExecutionException,
ComponentConfigurationException, ArchiverException, URISyntaxException
{
Expand Down Expand Up @@ -185,43 +150,40 @@ private List<String> run( String pluginXml, boolean includeImplied )
Artifact artifact = mock( Artifact.class );
PathTranslator pt = mock( PathTranslator.class );

if ( includeImplied )
{
File pluginXmlFile = Paths.get( resource.toURI() ).toFile();
File pluginXmlFile = Paths.get( resource.toURI() ).toFile();

File jarFile = File.createTempFile( "AntMojoWrapperTest.", ".test.jar" );
jarFile.deleteOnExit();
File jarFile = File.createTempFile( "AntMojoWrapperTest.", ".test.jar" );
jarFile.deleteOnExit();

JarArchiver archiver = new JarArchiver();
archiver.enableLogging( new ConsoleLogger( Logger.LEVEL_ERROR, "archiver" ) );
archiver.setDestFile( jarFile );
archiver.addFile( pluginXmlFile, pluginXml );
archiver.createArchive();
JarArchiver archiver = new JarArchiver();
archiver.enableLogging( new ConsoleLogger( Logger.LEVEL_ERROR, "archiver" ) );
archiver.setDestFile( jarFile );
archiver.addFile( pluginXmlFile, pluginXml );
archiver.createArchive();

when( artifact.getFile() ).thenReturn( jarFile );
when( artifact.getFile() ).thenReturn( jarFile );

Model model = new Model();
Model model = new Model();

Build build = new Build();
build.setDirectory( "target" );
Build build = new Build();
build.setDirectory( "target" );

model.setBuild( build );
model.setBuild( build );

MavenProject project = new MavenProject( model );
project.setFile( new File( "pom.xml" ).getAbsoluteFile() );
MavenProject project = new MavenProject( model );
project.setFile( new File( "pom.xml" ).getAbsoluteFile() );

pd.setPluginArtifact( artifact );
pd.setArtifacts( Collections.singletonList( artifact ) );
pd.setPluginArtifact( artifact );
pd.setArtifacts( Collections.singletonList( artifact ) );

config.put( "project", project );
config.put( "session", new MavenSession( null, null, null, null, null, null, null, null, null, null ) );
config.put( "mojoExecution", new MojoExecution( md ) );
config.put( "project", project );
config.put( "session", new MavenSession( null, null, null, null, null, null, null, null, null, null ) );
config.put( "mojoExecution", new MojoExecution( md ) );

ComponentRequirement cr = new ComponentRequirement();
cr.setRole( PathTranslator.class.getName() );
ComponentRequirement cr = new ComponentRequirement();
cr.setRole( PathTranslator.class.getName() );

wrapper.addComponentRequirement( cr, pt );
}
wrapper.addComponentRequirement( cr, pt );

wrapper.setComponentConfiguration( config );

Expand Down Expand Up @@ -251,15 +213,15 @@ private List<String> run( String pluginXml, boolean includeImplied )
messages.addAll( tbl.messages );
}

messages.add( new String( baos.toByteArray() ) );
messages.add( baos.toString() );

return messages;
}

private static final class TestBuildListener
implements BuildListener
{
private List<String> messages = new ArrayList<>();
private final List<String> messages = new ArrayList<>();

public void buildFinished( BuildEvent arg0 )
{
Expand Down
63 changes: 0 additions & 63 deletions maven-script/maven-script-ant/src/test/resources/META-INF/maven/plugin-2.0.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<javaVersion>7</javaVersion>
<pluginTestingHarnessVersion>3.3.0</pluginTestingHarnessVersion>
<mavenVersion>3.2.5</mavenVersion>
<antVersion>1.7.1</antVersion>
<antVersion>1.9.16</antVersion>
<sisuVersion>0.3.5</sisuVersion>
<mavenInvokerPluginVersion>3.2.2</mavenInvokerPluginVersion>
<maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
Expand Down

0 comments on commit c8ddcdc

Please sign in to comment.