This is an automated email from the ASF dual-hosted git repository. sjaranowski pushed a commit to branch MASSEMBLY-1019 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit d2fdc3de072eb807fcdbbab75514549c102b4a30 Author: Slawomir Jaranowski <s.jaranow...@gmail.com> AuthorDate: Sun Feb 18 00:18:41 2024 +0100 [MASSEMBLY-1019] Maven 3.6.3 as minimum requirements --- pom.xml | 22 ++++++++++++++-------- .../archive/task/AddDependencySetsTaskTest.java | 9 +++++---- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 0b3aab8b..a5868392 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ under the License. </parent> <artifactId>maven-assembly-plugin</artifactId> - <version>3.6.1-SNAPSHOT</version> + <version>3.7.0-SNAPSHOT</version> <packaging>maven-plugin</packaging> <name>Apache Maven Assembly Plugin</name> @@ -73,14 +73,14 @@ under the License. <javaVersion>8</javaVersion> <mdoVersion>2.2.0</mdoVersion> - <mavenVersion>3.2.5</mavenVersion> + <mavenVersion>3.6.3</mavenVersion> <slf4jVersion>1.7.5</slf4jVersion> <mavenFilteringVersion>3.3.1</mavenFilteringVersion> <mavenArchiverVersion>3.6.1</mavenArchiverVersion> <commonsIoVersion>2.15.1</commonsIoVersion> <testOutputToFile>true</testOutputToFile> - <project.build.outputTimestamp>2023-05-11T20:36:09Z</project.build.outputTimestamp> + <project.build.outputTimestamp>2024-02-17T22:53:24Z</project.build.outputTimestamp> </properties> <dependencies> @@ -109,11 +109,12 @@ under the License. <scope>provided</scope> </dependency> <dependency> - <groupId>org.eclipse.aether</groupId> - <artifactId>aether-util</artifactId> - <!-- the same version as in Maven 3.2.5 --> - <version>1.0.0.v20140518</version> + <groupId>org.apache.maven.resolver</groupId> + <artifactId>maven-resolver-util</artifactId> + <!-- the same version as in Maven 3.6.3 --> + <version>1.4.1</version> </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> @@ -296,7 +297,12 @@ under the License. <configuration> <requirementsHistories> <requirementsHistory> - <version>from 3.4.0</version> + <version>from 3.7.0</version> + <maven>3.6.3</maven> + <jdk>8</jdk> + </requirementsHistory> + <requirementsHistory> + <version>from 3.4.0 to 3.6.0</version> <maven>3.2.5</maven> <jdk>8</jdk> </requirementsHistory> 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 b364c714..463449f3 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 @@ -37,6 +37,7 @@ import org.apache.maven.plugins.assembly.archive.DefaultAssemblyArchiverTest; import org.apache.maven.plugins.assembly.format.AssemblyFormattingException; import org.apache.maven.plugins.assembly.model.DependencySet; import org.apache.maven.plugins.assembly.model.UnpackOptions; +import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingException; @@ -123,7 +124,7 @@ public class AddDependencySetsTaskTest { .thenReturn(pbr); final MavenSession session = mock(MavenSession.class); - when(session.getProjectBuildingRequest()).thenReturn(mock(ProjectBuildingRequest.class)); + when(session.getProjectBuildingRequest()).thenReturn(new DefaultProjectBuildingRequest()); when(session.getUserProperties()).thenReturn(new Properties()); when(session.getSystemProperties()).thenReturn(new Properties()); @@ -212,7 +213,7 @@ public class AddDependencySetsTaskTest { .thenThrow(pbe); final MavenSession session = mock(MavenSession.class); - when(session.getProjectBuildingRequest()).thenReturn(mock(ProjectBuildingRequest.class)); + when(session.getProjectBuildingRequest()).thenReturn(new DefaultProjectBuildingRequest()); when(session.getUserProperties()).thenReturn(new Properties()); when(session.getSystemProperties()).thenReturn(new Properties()); @@ -272,7 +273,7 @@ public class AddDependencySetsTaskTest { ds.setFileMode(Integer.toString(10, 8)); final MavenSession session = mock(MavenSession.class); - when(session.getProjectBuildingRequest()).thenReturn(mock(ProjectBuildingRequest.class)); + when(session.getProjectBuildingRequest()).thenReturn(new DefaultProjectBuildingRequest()); when(session.getUserProperties()).thenReturn(new Properties()); when(session.getSystemProperties()).thenReturn(new Properties()); @@ -447,7 +448,7 @@ public class AddDependencySetsTaskTest { final MavenProject project = new MavenProject(new Model()); project.setGroupId("GROUPID"); - ProjectBuildingRequest pbReq = mock(ProjectBuildingRequest.class); + ProjectBuildingRequest pbReq = new DefaultProjectBuildingRequest(); ProjectBuildingResult pbRes = mock(ProjectBuildingResult.class); when(pbRes.getProject()).thenReturn(project);