Skip to content

[MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4 #27

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
gnodet merged 1 commit into from
Feb 15, 2023
+22 −21
Merged

[MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 17 additions & 16 deletions ...ugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
import org.apache.maven.api.Session;
import org.apache.maven.api.plugin.Log;
import org.apache.maven.api.plugin.Mojo;
import org.apache.maven.api.xml.Dom;
import org.apache.maven.api.xml.XmlNode;
import org.apache.maven.configuration.internal.EnhancedComponentConfigurator;
import org.apache.maven.internal.impl.DefaultLog;
import org.apache.maven.internal.xml.XmlNodeImpl;
import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
import org.apache.maven.plugin.PluginParameterExpressionEvaluatorV4;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
Expand Down Expand Up @@ -197,15 +198,15 @@ else if ( pom.contains( "<project>" ) )
Path path = Paths.get( getBasedir() ).resolve( pom );
pomDom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( path.toFile() ) );
}
Dom pluginConfiguration = extractPluginConfiguration( coord[1], pomDom );
XmlNode pluginConfiguration = extractPluginConfiguration( coord[1], pomDom );
if ( !mojoParameters.isEmpty() )
{
List<Dom> children = mojoParameters.stream()
.map( mp -> new org.apache.maven.internal.xml.Xpp3Dom( mp.name(), mp.value() ) )
List<XmlNode> children = mojoParameters.stream()
.map( mp -> new XmlNodeImpl( mp.name(), mp.value() ) )
.collect( Collectors.toList() );
Dom config = new org.apache.maven.internal.xml.Xpp3Dom( "configuration",
XmlNode config = new XmlNodeImpl( "configuration",
null, null, children, null );
pluginConfiguration = Dom.merge( config, pluginConfiguration );
pluginConfiguration = XmlNode.merge( config, pluginConfiguration );
}
Mojo mojo = lookupMojo( coord, pluginConfiguration, descriptor );
return mojo;
Expand All @@ -232,7 +233,7 @@ protected String[] mojoCoordinates( String goal )
/**
* lookup the mojo while we have all of the relavent information
*/
protected Mojo lookupMojo( String[] coord, Dom pluginConfiguration, PluginDescriptor descriptor )
protected Mojo lookupMojo( String[] coord, XmlNode pluginConfiguration, PluginDescriptor descriptor )
throws Exception
{
// pluginkey = groupId : artifactId : version : goal
Expand Down Expand Up @@ -283,21 +284,21 @@ protected Mojo lookupMojo( String[] coord, Dom pluginConfiguration, PluginDescri
return mojo;
}

private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor )
private XmlNode finalizeConfig( XmlNode config, MojoDescriptor mojoDescriptor )
{
List<Dom> children = new ArrayList<>();
List<XmlNode> children = new ArrayList<>();
if ( mojoDescriptor != null && mojoDescriptor.getParameters() != null )
{
Dom defaultConfiguration = MojoDescriptorCreator.convert( mojoDescriptor ).getDom();
XmlNode defaultConfiguration = MojoDescriptorCreator.convert( mojoDescriptor ).getDom();
for ( Parameter parameter : mojoDescriptor.getParameters() )
{
Dom parameterConfiguration = config.getChild( parameter.getName() );
XmlNode parameterConfiguration = config.getChild( parameter.getName() );
if ( parameterConfiguration == null )
{
parameterConfiguration = config.getChild( parameter.getAlias() );
}
Dom parameterDefaults = defaultConfiguration.getChild( parameter.getName() );
parameterConfiguration = Dom.merge( parameterConfiguration, parameterDefaults, Boolean.TRUE );
XmlNode parameterDefaults = defaultConfiguration.getChild( parameter.getName() );
parameterConfiguration = XmlNode.merge( parameterConfiguration, parameterDefaults, Boolean.TRUE );
if ( parameterConfiguration != null )
{
Map<String, String> attributes = new HashMap<>( parameterConfiguration.getAttributes() );
Expand All @@ -306,7 +307,7 @@ private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor )
{
attributes.put( "implementation", parameter.getImplementation() );
}
parameterConfiguration = new org.apache.maven.internal.xml.Xpp3Dom(
parameterConfiguration = new XmlNodeImpl(
parameter.getName(), parameterConfiguration.getValue(),
attributes, parameterConfiguration.getChildren(),
parameterConfiguration.getInputLocation() );
Expand All @@ -315,7 +316,7 @@ private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor )
}
}
}
return new org.apache.maven.internal.xml.Xpp3Dom( "configuration", null, null, children, null );
return new XmlNodeImpl( "configuration", null, null, children, null );
}

private boolean isEmpty( String str )
Expand All @@ -333,7 +334,7 @@ private static Stream<Xpp3Dom> children( Xpp3Dom element )
return Stream.of( element.getChildren() );
}

public static Dom extractPluginConfiguration( String artifactId, Xpp3Dom pomDom )
public static XmlNode extractPluginConfiguration( String artifactId, Xpp3Dom pomDom )
throws Exception
{
Xpp3Dom pluginConfigurationElement = child( pomDom, "build" )
Expand Down
8 changes: 4 additions & 4 deletions ...ng-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import org.apache.maven.api.MojoExecution;
import org.apache.maven.api.model.Plugin;
import org.apache.maven.api.xml.Dom;
import org.apache.maven.api.xml.XmlNode;

/**
* Stub for {@link MojoExecution}.
Expand All @@ -33,14 +33,14 @@ public class MojoExecutionStub implements MojoExecution
private final String artifactId;
private final String executionId;
private final String goal;
private final Dom dom;
private final XmlNode dom;

public MojoExecutionStub( String artifactId, String executionId, String goal )
{
this( artifactId, executionId, goal, null );
}

public MojoExecutionStub( String artifactId, String executionId, String goal, Dom dom )
public MojoExecutionStub( String artifactId, String executionId, String goal, XmlNode dom )
{
this.artifactId = artifactId;
this.executionId = executionId;
Expand Down Expand Up @@ -69,7 +69,7 @@ public String getGoal()
}

@Override
public Optional<Dom> getConfiguration()
public Optional<XmlNode> getConfiguration()
{
return Optional.ofNullable( dom );
}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ under the License.

<properties>
<surefire.version>3.0.0-M7</surefire.version>
<mavenVersion>4.0.0-alpha-2</mavenVersion>
<mavenVersion>4.0.0-alpha-4</mavenVersion>
<maven.site.path>plugin-testing-archives/LATEST</maven.site.path>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>
Expand Down