Skip to content

[MPLUGINTESTING-69] update plexus-utils #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elharo merged 3 commits into from
Jun 15, 2020
Merged

[MPLUGINTESTING-69] update plexus-utils #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e386152
update plexus-utils
elharo Jun 15, 2020
98faf30
fix AbstractMojoTestCase
elharo Jun 15, 2020
83dfb1d
close streams
elharo Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions ...n-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.InterpolationFilterReader;
import org.codehaus.plexus.util.ReaderFactory;
Expand Down Expand Up @@ -144,34 +145,35 @@ protected void setUp()
MAVEN_VERSION == null || new DefaultArtifactVersion( "3.2.3" ).compareTo( MAVEN_VERSION ) < 0 );

configurator = getContainer().lookup( ComponentConfigurator.class, "basic" );
Context context = container.getContext();
Map<Object, Object> map = context.getContextData();

InputStream is = getClass().getResourceAsStream( "/" + getPluginDescriptorLocation() );

XmlStreamReader reader = new XmlStreamReader( is );

InterpolationFilterReader interpolationFilterReader =
new InterpolationFilterReader( new BufferedReader( reader ), container.getContext().getContextData() );

PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationFilterReader );

Artifact artifact =
lookup( RepositorySystem.class ).createArtifact( pluginDescriptor.getGroupId(),
pluginDescriptor.getArtifactId(),
pluginDescriptor.getVersion(), ".jar" );

artifact.setFile( getPluginArtifactFile() );
pluginDescriptor.setPluginArtifact( artifact );
pluginDescriptor.setArtifacts( Arrays.asList( artifact ) );

for ( ComponentDescriptor<?> desc : pluginDescriptor.getComponents() )
try ( InputStream is = getClass().getResourceAsStream( "/" + getPluginDescriptorLocation() );
Reader reader = new BufferedReader( new XmlStreamReader( is ) );
InterpolationFilterReader interpolationReader = new InterpolationFilterReader( reader, map, "${", "}" ) )
{
getContainer().addComponentDescriptor( desc );
}

mojoDescriptors = new HashMap<>();
for ( MojoDescriptor mojoDescriptor : pluginDescriptor.getMojos() )
{
mojoDescriptors.put( mojoDescriptor.getGoal(), mojoDescriptor );

PluginDescriptor pluginDescriptor = new PluginDescriptorBuilder().build( interpolationReader );

Artifact artifact =
lookup( RepositorySystem.class ).createArtifact( pluginDescriptor.getGroupId(),
pluginDescriptor.getArtifactId(),
pluginDescriptor.getVersion(), ".jar" );

artifact.setFile( getPluginArtifactFile() );
pluginDescriptor.setPluginArtifact( artifact );
pluginDescriptor.setArtifacts( Arrays.asList( artifact ) );

for ( ComponentDescriptor<?> desc : pluginDescriptor.getComponents() )
{
getContainer().addComponentDescriptor( desc );
}

mojoDescriptors = new HashMap<>();
for ( MojoDescriptor mojoDescriptor : pluginDescriptor.getMojos() )
{
mojoDescriptors.put( mojoDescriptor.getGoal(), mojoDescriptor );
}
}
}

Expand Down Expand Up @@ -573,11 +575,12 @@ private void finalizeMojoConfiguration( MojoExecution mojoExecution )
protected PlexusConfiguration extractPluginConfiguration( String artifactId, File pom )
throws Exception
{
Reader reader = ReaderFactory.newXmlReader( pom );

Xpp3Dom pomDom = Xpp3DomBuilder.build( reader );

return extractPluginConfiguration( artifactId, pomDom );

try ( Reader reader = ReaderFactory.newXmlReader( pom ) )
{
Xpp3Dom pomDom = Xpp3DomBuilder.build( reader );
return extractPluginConfiguration( artifactId, pomDom );
}
}

/**
Expand Down
7 changes: 1 addition & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.15</version>
<scope>provided</scope>
<version>3.3.0</version>
</dependency>

<dependency>
Expand All @@ -192,16 +191,12 @@ under the License.
</dependencyManagement>

<dependencies>

<!-- misc -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>

</dependencies>


<build>
<pluginManagement>
<plugins>
Expand Down