You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/06/08 18:47:14 UTC
[maven-assembly-plugin] branch MASSEMBLY-959 created (now 65b3a23f)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a change to branch MASSEMBLY-959
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
at 65b3a23f [MASSEMBLY-959] Update to Java8 and drop m-shared-utils
This branch includes the following new commits:
new 65b3a23f [MASSEMBLY-959] Update to Java8 and drop m-shared-utils
The 1 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.
[maven-assembly-plugin] 01/01: [MASSEMBLY-959] Update to Java8 and drop m-shared-utils
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch MASSEMBLY-959
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit 65b3a23fdaf50ee1c78f3b5ca213d5d1ad19df31
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Wed Jun 8 20:46:28 2022 +0200
[MASSEMBLY-959] Update to Java8 and drop m-shared-utils
---
https://issues.apache.org/jira/browse/MASSEMBLY-959
---
pom.xml | 19 +++++---------
.../phase/DependencySetAssemblyPhaseTest.java | 19 +++++++-------
.../archive/phase/ModuleSetAssemblyPhaseTest.java | 30 +++++++++++-----------
.../archive/phase/RepositoryAssemblyPhaseTest.java | 5 ++--
.../assembly/archive/task/AddArtifactTaskTest.java | 7 +++--
.../archive/task/AddDependencySetsTaskTest.java | 6 ++---
6 files changed, 38 insertions(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index 24ca9411..d2ab0c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<mdoVersion>2.1.1</mdoVersion>
<mavenVersion>3.2.5</mavenVersion>
<slf4jVersion>1.7.5</slf4jVersion>
@@ -140,11 +140,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
- </dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
@@ -176,12 +171,12 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.2.1</version>
+ <version>4.2.7</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -191,17 +186,17 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-io</artifactId>
- <version>3.2.0</version>
+ <version>3.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.5.1</version>
+ <version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.3.0</version>
+ <version>3.4.2</version>
</dependency>
<!-- Test -->
@@ -246,7 +241,7 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.28.2</version>
+ <version>4.5.1</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
index 71798aaf..60661299 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/DependencySetAssemblyPhaseTest.java
@@ -19,7 +19,7 @@ package org.apache.maven.plugins.assembly.archive.phase;
* under the License.
*/
-import static org.mockito.ArgumentMatchers.anyListOf;
+import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.mock;
@@ -33,7 +33,6 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Model;
-import org.apache.maven.plugins.assembly.AssemblerConfigurationSource;
import org.apache.maven.plugins.assembly.InvalidAssemblerConfigurationException;
import org.apache.maven.plugins.assembly.archive.ArchiveCreationException;
import org.apache.maven.plugins.assembly.artifact.DependencyResolutionException;
@@ -92,15 +91,15 @@ public class DependencySetAssemblyPhaseTest
project.setArtifacts( Collections.singleton( artifact ) );
when( dependencyResolver.resolveDependencySets( eq( assembly ),
- isNull(AssemblerConfigurationSource.class),
- anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
+ isNull(),
+ anyList() ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
this.phase.execute( assembly, null, null );
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
verify( dependencyResolver ).resolveDependencySets( eq( assembly ),
- isNull(AssemblerConfigurationSource.class),
- anyListOf( DependencySet.class ) );
+ isNull(),
+ anyList() );
}
@Test
@@ -112,15 +111,15 @@ public class DependencySetAssemblyPhaseTest
assembly.setIncludeBaseDirectory( false );
when( dependencyResolver.resolveDependencySets( eq( assembly ),
- isNull( AssemblerConfigurationSource.class ),
- anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
+ isNull(),
+ anyList() ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
this.phase.execute( assembly, null, null );
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
verify( dependencyResolver ).resolveDependencySets( eq( assembly ),
- isNull( AssemblerConfigurationSource.class ),
- anyListOf( DependencySet.class ) );
+ isNull(),
+ anyList() );
}
private MavenProject newMavenProject( final String groupId, final String artifactId, final String version )
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
index c408edee..4952a251 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/ModuleSetAssemblyPhaseTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyListOf;
+import static org.mockito.Mockito.anyList;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.isNull;
@@ -312,7 +312,7 @@ public class ModuleSetAssemblyPhaseTest
when( dependencyResolver.resolveDependencySets( eq( assembly ),
eq( ms ),
eq( configSource ),
- anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
+ anyList() ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
DefaultAssemblyArchiverTest.setupInterpolators( configSource, module );
this.phase.execute( assembly, archiver, configSource );
@@ -332,7 +332,7 @@ public class ModuleSetAssemblyPhaseTest
verify( dependencyResolver ).resolveDependencySets( eq( assembly ),
eq( ms ),
eq( configSource ),
- anyListOf( DependencySet.class ) );
+ anyList() );
}
@Test
@@ -396,10 +396,10 @@ public class ModuleSetAssemblyPhaseTest
final Set<MavenProject> projects = singleton( project );
- when( dependencyResolver.resolveDependencySets( isNull( Assembly.class ),
- isNull( ModuleSet.class ),
+ when( dependencyResolver.resolveDependencySets( isNull(),
+ isNull(),
eq( configSource ),
- anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
+ anyList() ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
DefaultAssemblyArchiverTest.setupInterpolators( configSource, project );
this.phase.addModuleBinaries( null, null, binaries, projects, archiver, configSource );
@@ -416,10 +416,10 @@ public class ModuleSetAssemblyPhaseTest
verify( archiver ).setFileMode( 511 );
verify( archiver ).setFileMode( 146 );
- verify( dependencyResolver ).resolveDependencySets( isNull( Assembly.class ),
- isNull( ModuleSet.class ),
+ verify( dependencyResolver ).resolveDependencySets( isNull(),
+ isNull(),
eq( configSource ),
- anyListOf( DependencySet.class ) );
+ anyList() );
}
@Test
@@ -486,10 +486,10 @@ public class ModuleSetAssemblyPhaseTest
final Set<MavenProject> projects = singleton( project );
- when( dependencyResolver.resolveDependencySets( isNull( Assembly.class ),
- isNull( ModuleSet.class ),
+ when( dependencyResolver.resolveDependencySets( isNull(),
+ isNull(),
any( AssemblerConfigurationSource.class ),
- anyListOf( DependencySet.class ) ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
+ anyList() ) ).thenReturn( new LinkedHashMap<DependencySet, Set<Artifact>>() );
DefaultAssemblyArchiverTest.setupInterpolators( configSource, project );
this.phase.addModuleBinaries( null, null, binaries, projects, archiver, configSource );
@@ -499,10 +499,10 @@ public class ModuleSetAssemblyPhaseTest
verify( configSource, atLeastOnce() ).getMavenSession();
verify( configSource, atLeastOnce() ).getProject();
- verify( dependencyResolver ).resolveDependencySets( isNull( Assembly.class ),
- isNull( ModuleSet.class ),
+ verify( dependencyResolver ).resolveDependencySets( isNull(),
+ isNull(),
any( AssemblerConfigurationSource.class ),
- anyListOf( DependencySet.class ) );
+ anyList() );
verify( archiver ).addFile( artifactFile, "out/artifact", 511 );
verify( archiver, atLeastOnce() ).getDestFile();
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
index bd492a47..d3f5f6e0 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/phase/RepositoryAssemblyPhaseTest.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import java.io.File;
@@ -82,8 +82,7 @@ public class RepositoryAssemblyPhaseTest
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
verify( configSource, atLeastOnce() ).getTemporaryRootDirectory();
-
- verifyZeroInteractions( repositoryAssembler );
+ verifyNoInteractions( repositoryAssembler );
}
@Test
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
index c20979b3..aa959f46 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddArtifactTaskTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.Charset;
import java.util.Arrays;
import org.apache.maven.artifact.Artifact;
@@ -199,7 +198,7 @@ public class AddArtifactTaskTest
task.execute( archiver, configSource );
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
- verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull( Charset.class ) );
+ verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull() );
verify( archiver, atLeastOnce() ).getDestFile();
verify( archiver ).getOverrideDirectoryMode();
verify( archiver ).getOverrideFileMode();
@@ -232,7 +231,7 @@ public class AddArtifactTaskTest
task.execute( archiver, configSource );
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
- verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull( Charset.class ) );
+ verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull() );
verify( archiver, atLeastOnce() ).getDestFile();
verify( archiver ).getOverrideDirectoryMode();
verify( archiver ).getOverrideFileMode();
@@ -270,7 +269,7 @@ public class AddArtifactTaskTest
task.execute( archiver, configSource );
// result of easymock migration, should be assert of expected result instead of verifying methodcalls
- verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull( Charset.class ) );
+ verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull() );
verify( archiver, atLeastOnce() ).getDestFile();
verify( archiver ).getOverrideDirectoryMode();
verify( archiver ).getOverrideFileMode();
diff --git a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
index 99ad00d1..21cdaa6a 100644
--- a/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
+++ b/src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
@@ -35,7 +34,6 @@ import static org.mockito.Mockito.when;
import java.io.File;
import java.io.IOException;
-import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -343,7 +341,7 @@ public class AddDependencySetsTaskTest
if ( unpack )
{
- verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull( Charset.class ) );
+ verify( archiver ).addArchivedFileSet( any( ArchivedFileSet.class ), isNull() );
}
else
{
@@ -495,7 +493,7 @@ public class AddDependencySetsTaskTest
task.addDependencySet( dependencySet, archiver, configSource );
ArgumentCaptor<ArchivedFileSet> archivedFileSet = ArgumentCaptor.forClass( ArchivedFileSet.class );
- verify( archiver ).addArchivedFileSet( archivedFileSet.capture(), isNull( Charset.class ) );
+ verify( archiver ).addArchivedFileSet( archivedFileSet.capture(), isNull() );
assertThat( archivedFileSet.getValue().isUsingDefaultExcludes(), is( false ) );
ArgumentCaptor<FileSet> fileSet = ArgumentCaptor.forClass( FileSet.class );