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/03/08 10:49:05 UTC
[maven-archiver] branch mvn4 updated (36d08bb -> 3ae7dcd)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a change to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git.
from 36d08bb Switch a few core plugins to the new api
new b35520c Fix tests
new 3ae7dcd runtime support
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/maven/archiver/MavenArchiver.java | 3 +-
.../apache/maven/archiver/MavenArchiverTest.java | 109 +++------------------
.../org/apache/maven/archiver/MockArtifact.java | 22 ++++-
.../org/apache/maven/archiver/MockProject.java | 6 ++
.../apache/maven/archiver/MockProjectManager.java | 2 +-
5 files changed, 40 insertions(+), 102 deletions(-)
[maven-archiver] 02/02: runtime support
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit 3ae7dcd182bd6c094e00be9d6cd0288b22ae17cf
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 8 11:49:03 2022 +0100
runtime support
---
src/test/java/org/apache/maven/archiver/MockProjectManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/maven/archiver/MockProjectManager.java b/src/test/java/org/apache/maven/archiver/MockProjectManager.java
index 1f73822..78e1ef1 100644
--- a/src/test/java/org/apache/maven/archiver/MockProjectManager.java
+++ b/src/test/java/org/apache/maven/archiver/MockProjectManager.java
@@ -52,7 +52,7 @@ public class MockProjectManager implements ProjectManager
}
@Override
- public void attachArtifact( Project project, String type, String classifier, Path path )
+ public void attachArtifact( Project project, Artifact artifact, Path path )
{
}
[maven-archiver] 01/02: Fix tests
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-archiver.git
commit b35520c33e6b38cf186f075829decfcc665b51d3
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Wed Mar 2 15:29:17 2022 +0100
Fix tests
---
.../org/apache/maven/archiver/MavenArchiver.java | 3 +-
.../apache/maven/archiver/MavenArchiverTest.java | 109 +++------------------
.../org/apache/maven/archiver/MockArtifact.java | 22 ++++-
.../org/apache/maven/archiver/MockProject.java | 6 ++
4 files changed, 39 insertions(+), 101 deletions(-)
diff --git a/src/main/java/org/apache/maven/archiver/MavenArchiver.java b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
index 79fc66a..9d6f8e2 100644
--- a/src/main/java/org/apache/maven/archiver/MavenArchiver.java
+++ b/src/main/java/org/apache/maven/archiver/MavenArchiver.java
@@ -446,6 +446,7 @@ public class MavenArchiver
.getCollectedDependencies( project, ProjectManager.ResolutionScope.Test );
List<Node> extensions = root.stream()
+ .filter( n -> n != root )
.filter( n -> !Objects.equals( n.getDependency().getScope(), ResolutionScope.TEST.id() ) )
.filter( n -> "jar".equals( n.getArtifact().getExtension() ) )
.collect( Collectors.toList() );
@@ -499,7 +500,7 @@ public class MavenArchiver
if ( version == null )
{
throw new ManifestException( "Failed to get selected artifact version to calculate"
- + " the specification version: " + project.getArtifact().getVersion() );
+ + " the specification version: " + project.getArtifact().getVersion() );
}
String specVersion = String.format( "%s.%s", version.getMajorVersion(), version.getMinorVersion() );
addManifestAttribute( m, entries, "Specification-Version", specVersion );
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 37777d1..daad8d0 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -22,13 +22,8 @@ package org.apache.maven.archiver;
import org.apache.maven.api.Node;
import org.apache.maven.api.Project;
import org.apache.maven.api.Session;
-import org.apache.maven.api.Artifact;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.model.Organization;
@@ -36,8 +31,6 @@ import org.apache.maven.shared.utils.StringUtils;
import org.apache.maven.shared.utils.io.FileUtils;
import org.codehaus.plexus.archiver.jar.JarArchiver;
import org.codehaus.plexus.archiver.jar.ManifestException;
-import org.eclipse.aether.DefaultRepositorySystemSession;
-import org.eclipse.aether.RepositorySystemSession;
import org.junit.Test;
import java.io.File;
@@ -47,7 +40,6 @@ import java.net.URI;
import java.net.URL;
import java.nio.file.Path;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -71,20 +63,6 @@ public class MavenArchiverTest
{
private MockProjectManager mockProjectManager = new MockProjectManager();
- static class ArtifactComparator
- implements Comparator<Artifact>
- {
- public int compare( Artifact o1, Artifact o2 )
- {
- return o1.getArtifactId().compareTo( o2.getArtifactId() );
- }
-
- public boolean equals( Object o )
- {
- return false;
- }
- }
-
@Test
public void testInvalidModuleNames()
{
@@ -126,13 +104,8 @@ public class MavenArchiverTest
SortedSet<Node> artifacts = new TreeSet<>( Comparator.comparing( n -> n.getArtifact().getArtifactId() ) );
// there should be a mock or a setter for this field.
- ManifestConfiguration config = new ManifestConfiguration()
- {
- public boolean isAddExtensions()
- {
- return true;
- }
- };
+ ManifestConfiguration config = new ManifestConfiguration();
+ config.setAddExtensions( true );
mockProjectManager.setResolvedDependencies( artifacts );
@@ -149,8 +122,6 @@ public class MavenArchiverTest
artifact1.setExtension( "dll" );
artifacts.add( new MockNode( artifact1, "compile" ) );
- mockProjectManager.setResolvedDependencies( artifacts );
-
manifest = archiver.getManifest( session, project, config );
assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isNull();
@@ -162,8 +133,6 @@ public class MavenArchiverTest
artifact2.setExtension( "jar" );
artifacts.add( new MockNode( artifact2, "compile" ) );
- mockProjectManager.setResolvedDependencies( artifacts );
-
manifest = archiver.getManifest( session, project, config );
assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isEqualTo( "dummy2" );
@@ -175,8 +144,6 @@ public class MavenArchiverTest
artifact3.setExtension( "jar" );
artifacts.add( new MockNode( artifact3, "test" ) );
- mockProjectManager.setResolvedDependencies( artifacts );
-
manifest = archiver.getManifest( session, project, config );
assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isEqualTo( "dummy2" );
@@ -188,8 +155,6 @@ public class MavenArchiverTest
artifact4.setExtension( "jar" );
artifacts.add( new MockNode( artifact4, "compile" ) );
- mockProjectManager.setResolvedDependencies( artifacts );
-
manifest = archiver.getManifest( session, project, config );
assertThat( manifest.getMainAttributes().getValue( "Extension-List" ) ).isEqualTo( "dummy2 dummy4" );
@@ -221,13 +186,9 @@ public class MavenArchiverTest
new MockNode( mockArtifact, "compile" ) ) );
// there should be a mock or a setter for this field.
- ManifestConfiguration manifestConfig = new ManifestConfiguration()
- {
- public boolean isAddClasspath()
- {
- return true;
- }
- };
+ ManifestConfiguration manifestConfig = new ManifestConfiguration();
+ manifestConfig.setAddClasspath( true );
+ manifestConfig.setClasspathLayoutType( null );
MavenArchiveConfiguration archiveConfiguration = new MavenArchiveConfiguration();
archiveConfiguration.setManifest( manifestConfig );
@@ -349,7 +310,7 @@ public class MavenArchiverTest
@Test
public void testDashesInClassPath_MSHARED_134()
- throws IOException, ManifestException, DependencyResolutionRequiredException
+ throws Exception
{
File jarFile = new File( "target/test/dummyWithDashes.jar" );
JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
@@ -379,7 +340,7 @@ public class MavenArchiverTest
@Test
public void testDashesInClassPath_MSHARED_182()
- throws IOException, ManifestException, DependencyResolutionRequiredException
+ throws Exception
{
File jarFile = new File( "target/test/dummy.jar" );
JarArchiver jarArchiver = getCleanJarArchiver( jarFile );
@@ -1208,7 +1169,7 @@ public class MavenArchiverTest
artifact.setGroupId( "org.apache.dummy" );
artifact.setArtifactId( "dummy" );
artifact.setVersion( "0.1.1" );
-// artifact.setBaseVersion( "0.1.2" );
+ artifact.setBaseVersion( "0.1.2" );
artifact.setExtension( "jar" );
// artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
project.setArtifact( artifact );
@@ -1263,7 +1224,7 @@ public class MavenArchiverTest
artifact.setGroupId( "org.apache.dummy" );
artifact.setArtifactId( "dummy" );
artifact.setVersion( "0.1.1" );
-// artifact.setBaseVersion( "0.1.1" );
+ artifact.setBaseVersion( "0.1.1" );
artifact.setExtension( "jar" );
// artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
project.setArtifact( artifact );
@@ -1274,49 +1235,6 @@ public class MavenArchiverTest
return project;
}
- private ArtifactHandler getMockArtifactHandler()
- {
- return new ArtifactHandler()
- {
-
- public String getClassifier()
- {
- return null;
- }
-
- public String getDirectory()
- {
- return null;
- }
-
- public String getExtension()
- {
- return "jar";
- }
-
- public String getLanguage()
- {
- return null;
- }
-
- public String getPackaging()
- {
- return null;
- }
-
- public boolean isAddedToClasspath()
- {
- return true;
- }
-
- public boolean isIncludesDependencies()
- {
- return false;
- }
-
- };
- }
-
private MockNode getMockArtifact2()
{
MockArtifact artifact2 = new MockArtifact();
@@ -1344,7 +1262,7 @@ public class MavenArchiverTest
MockArtifact artifact1 = new MockArtifact();
artifact1.setGroupId( "org.apache.dummy" );
artifact1.setArtifactId( "dummy1" );
-// artifact1.setSnapshotVersion( "1.1-20081022.112233-1", "1.1-SNAPSHOT" );
+ artifact1.setSnapshotVersion( "1.1-20081022.112233-1", "1.1-SNAPSHOT" );
artifact1.setExtension( "jar" );
artifact1.setPath( getClasspathFile( artifact1.getArtifactId() + "-" + artifact1.getVersion() + ".jar" ) );
return new MockNode( artifact1, "runtime" );
@@ -1356,7 +1274,7 @@ public class MavenArchiverTest
artifact1.setGroupId( "org.apache.dummy" );
artifact1.setArtifactId( "dummy1" );
artifact1.setVersion( "1.0" );
-// artifact1.setBaseVersion( "1.0.1" );
+ artifact1.setBaseVersion( "1.0.1" );
artifact1.setExtension( "jar" );
artifact1.setPath( getClasspathFile( artifact1.getArtifactId() + "-" + artifact1.getVersion() + ".jar" ) );
return new MockNode( artifact1, "runtime" );
@@ -1402,15 +1320,10 @@ public class MavenArchiverTest
request.setStartTime( startTime );
request.setUserSettingsFile( settings );
- MavenExecutionResult result = new DefaultMavenExecutionResult();
-
- RepositorySystemSession rss = new DefaultRepositorySystemSession();
-
MockSession session = new MockSession();
session.setProjectManager( mockProjectManager );
session.setSystemProperties( systemProperties );
return session;
-// return new MavenSession( null, rss, request, result );
}
private List<Node> getArtifacts( Node... artifacts )
diff --git a/src/test/java/org/apache/maven/archiver/MockArtifact.java b/src/test/java/org/apache/maven/archiver/MockArtifact.java
index 7be48ce..21386cc 100644
--- a/src/test/java/org/apache/maven/archiver/MockArtifact.java
+++ b/src/test/java/org/apache/maven/archiver/MockArtifact.java
@@ -31,9 +31,11 @@ public class MockArtifact implements Artifact
private String groupId;
private String artifactId;
private String version;
+ private String baseVersion;
private String extension;
private String classifier;
private Path path;
+ private boolean snapshot;
@Nonnull
@Override
@@ -74,13 +76,17 @@ public class MockArtifact implements Artifact
@Override
public String getBaseVersion()
{
- return null;
+ if ( baseVersion == null && version != null )
+ {
+ baseVersion = version;
+ }
+ return baseVersion;
}
@Override
public boolean isSnapshot()
{
- return false;
+ return snapshot;
}
@Nonnull
@@ -105,6 +111,18 @@ public class MockArtifact implements Artifact
this.version = version;
}
+ public void setBaseVersion( String baseVersion )
+ {
+ this.baseVersion = baseVersion;
+ }
+
+ public void setSnapshotVersion( String version, String baseVersion )
+ {
+ this.snapshot = true;
+ this.version = version;
+ this.baseVersion = baseVersion;
+ }
+
public void setExtension( String extension )
{
this.extension = extension;
diff --git a/src/test/java/org/apache/maven/archiver/MockProject.java b/src/test/java/org/apache/maven/archiver/MockProject.java
index b830a92..67adfff 100644
--- a/src/test/java/org/apache/maven/archiver/MockProject.java
+++ b/src/test/java/org/apache/maven/archiver/MockProject.java
@@ -109,6 +109,12 @@ class MockProject implements Project
return null;
}
+ @Override
+ public boolean isExecutionRoot()
+ {
+ return false;
+ }
+
public void setPomPath( Path pomPath )
{
this.pomPath = pomPath;