You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/11/21 08:50:41 UTC
[maven] branch master updated: [MNG-7576] Restore compatibility with maven 3.x (#841)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 3f03f0e7b [MNG-7576] Restore compatibility with maven 3.x (#841)
3f03f0e7b is described below
commit 3f03f0e7b29c0b68365d570d55b78ded9daea2ac
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Nov 21 09:50:33 2022 +0100
[MNG-7576] Restore compatibility with maven 3.x (#841)
---
.../maven/internal/impl/TestRepositorySystem.java | 4 ++--
.../apache/maven/repository/TestRepositorySystem.java | 2 +-
.../maven/model/building/DefaultModelBuilder.java | 14 ++++++++------
.../maven/model/building/DefaultModelProcessor.java | 2 +-
.../org/apache/maven/model/io/DefaultModelReader.java | 18 ++++++++----------
.../java/org/apache/maven/model/io/ModelReader.java | 5 ++---
.../maven/model/superpom/DefaultSuperPomProvider.java | 4 ++--
.../inheritance/DefaultInheritanceAssemblerTest.java | 2 +-
8 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
index 430b27631..6bba90b06 100644
--- a/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
+++ b/maven-core/src/test/java/org/apache/maven/internal/impl/TestRepositorySystem.java
@@ -251,7 +251,7 @@ public class TestRepositorySystem
try
{
- Model model = modelReader.read( pomFile, null );
+ Model model = modelReader.read( pomFile, null ).getDelegate();
dependencies = Dependency.dependencyToApiV3( model.getDependencies() );
}
@@ -338,4 +338,4 @@ public class TestRepositorySystem
{
}
-}
\ No newline at end of file
+}
diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
index 7fdaef8d5..cec73d273 100644
--- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
+++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java
@@ -248,7 +248,7 @@ public class TestRepositorySystem
try
{
- Model model = modelReader.read( pomFile, null );
+ Model model = modelReader.read( pomFile, null ).getDelegate();
dependencies = model.getDependencies().stream().map( Dependency::new ).collect( Collectors.toList() );
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 6899f0304..f1a997672 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -850,7 +850,7 @@ public class DefaultModelBuilder
if ( request.isLocationTracking() )
{
source = new InputSource( null, modelSource.getLocation() );
- options.put( ModelProcessor.INPUT_SOURCE, source );
+ options.put( ModelProcessor.INPUT_SOURCE, new org.apache.maven.model.InputSource( source ) );
}
else
{
@@ -859,7 +859,7 @@ public class DefaultModelBuilder
try
{
- model = modelProcessor.read( modelSource.getInputStream(), options );
+ model = modelProcessor.read( modelSource.getInputStream(), options ).getDelegate();
}
catch ( ModelParseException e )
{
@@ -872,7 +872,7 @@ public class DefaultModelBuilder
try
{
- model = modelProcessor.read( modelSource.getInputStream(), options );
+ model = modelProcessor.read( modelSource.getInputStream(), options ).getDelegate();
}
catch ( ModelParseException ne )
{
@@ -890,9 +890,11 @@ public class DefaultModelBuilder
{
try
{
+ org.apache.maven.api.model.InputSource v4src
+ = model.getLocation( "" ).getSource();
Field field = InputSource.class.getDeclaredField( "modelId" );
field.setAccessible( true );
- field.set( source, ModelProblemUtils.toId( model ) );
+ field.set( v4src, ModelProblemUtils.toId( model ) );
}
catch ( Throwable t )
{
@@ -974,14 +976,14 @@ public class DefaultModelBuilder
try
{
// must implement TransformContext, but should use request to access properties/model cache
- org.apache.maven.api.model.Model transformedFileModel = modelProcessor.read( pomFile,
+ Model transformedFileModel = modelProcessor.read( pomFile,
Collections.singletonMap( ModelReader.TRANSFORMER_CONTEXT, context ) );
// rawModel with locationTrackers, required for proper feedback during validations
// Apply enriched data
rawModel = new Model( modelMerger.merge( rawModel.getDelegate(),
- transformedFileModel, false, null ) );
+ transformedFileModel.getDelegate(), false, null ) );
}
catch ( IOException e )
{
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
index 82af820d0..168612d39 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProcessor.java
@@ -29,7 +29,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.maven.api.model.Model;
+import org.apache.maven.model.Model;
import org.apache.maven.model.io.ModelReader;
import org.apache.maven.model.locator.ModelLocator;
import org.eclipse.sisu.Typed;
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
index 568dfac19..964dea786 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -31,8 +31,8 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import org.apache.maven.api.model.InputSource;
-import org.apache.maven.api.model.Model;
+import org.apache.maven.model.InputSource;
+import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelSourceTransformer;
import org.apache.maven.model.building.TransformerContext;
import org.apache.maven.model.v4.MavenXpp3Reader;
@@ -72,7 +72,9 @@ public class DefaultModelReader
{
Model model = read( in, input.toPath(), options );
- return model.withPomFile( input.toPath() );
+ model.setPomFile( input );
+
+ return model;
}
}
@@ -109,11 +111,6 @@ public class DefaultModelReader
private InputSource getSource( Map<String, ?> options )
{
Object value = ( options != null ) ? options.get( INPUT_SOURCE ) : null;
- if ( value instanceof org.apache.maven.model.InputSource )
- {
- org.apache.maven.model.InputSource src = ( org.apache.maven.model.InputSource ) value;
- return new InputSource( src.getModelId(), src.getLocation() );
- }
return (InputSource) value;
}
@@ -164,14 +161,15 @@ public class DefaultModelReader
throws XmlPullParserException, IOException
{
MavenXpp3Reader mr = new MavenXpp3Reader();
- return mr.read( parser, strict );
+ return new Model( mr.read( parser, strict ) );
}
private Model readModelEx( XmlPullParser parser, InputSource source, boolean strict )
throws XmlPullParserException, IOException
{
MavenXpp3ReaderEx mr = new MavenXpp3ReaderEx();
- return mr.read( parser, strict, source );
+ return new Model( mr.read( parser, strict,
+ new org.apache.maven.api.model.InputSource( source.getModelId(), source.getLocation() ) ) );
}
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java
index c6ab1cf71..04b1a3017 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/io/ModelReader.java
@@ -25,8 +25,7 @@ import java.io.InputStream;
import java.io.Reader;
import java.util.Map;
-import org.apache.maven.api.model.InputSource;
-import org.apache.maven.api.model.Model;
+import org.apache.maven.model.Model;
/**
* Handles deserialization of a model from some kind of textual format like XML.
@@ -44,7 +43,7 @@ public interface ModelReader
/**
* The key for the option to enable tracking of line/column numbers. This option is of type
- * {@link InputSource} and defaults to {@code null}. Providing an input source enables
+ * {@link org.apache.maven.model.InputSource} and defaults to {@code null}. Providing an input source enables
* location tracking.
*/
String INPUT_SOURCE = "org.apache.maven.model.io.inputSource";
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
index bb6a82025..f83231739 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/superpom/DefaultSuperPomProvider.java
@@ -80,9 +80,9 @@ public class DefaultSuperPomProvider
+ this.getClass().getPackage().getImplementationVersion() + ":super-pom";
InputSource inputSource = new InputSource(
modelId, getClass().getResource( resource ).toExternalForm() );
- options.put( ModelProcessor.INPUT_SOURCE, inputSource );
+ options.put( ModelProcessor.INPUT_SOURCE, new org.apache.maven.model.InputSource( inputSource ) );
- superModel = modelProcessor.read( is, options );
+ superModel = modelProcessor.read( is, options ).getDelegate();
}
catch ( IOException e )
{
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index a2191f0b9..3bab8c0a9 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -76,7 +76,7 @@ public class DefaultInheritanceAssemblerTest
private Model getModel( String name )
throws IOException
{
- return reader.read( getPom( name ), null );
+ return reader.read( getPom( name ), null ).getDelegate();
}
@Test