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. maven-assembly-plugin - 3.6.1-SNAPSHOT + 3.7.0-SNAPSHOT maven-plugin Apache Maven Assembly Plugin @@ -73,14 +73,14 @@ under the License. 8 2.2.0 - 3.2.5 + 3.6.3 1.7.5 3.3.1 3.6.1 2.15.1 true - 2023-05-11T20:36:09Z + 2024-02-17T22:53:24Z @@ -109,11 +109,12 @@ under the License. provided - org.eclipse.aether - aether-util - - 1.0.0.v20140518 + org.apache.maven.resolver + maven-resolver-util + + 1.4.1 + org.slf4j slf4j-api @@ -296,7 +297,12 @@ under the License. - from 3.4.0 + from 3.7.0 + 3.6.3 + 8 + + + from 3.4.0 to 3.6.0 3.2.5 8 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.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 void testAddDependencySet_ShouldInterpolateDefaultOutputFileNameMapping() .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 void testAddDependencySet_ShouldNotAddDependenciesWhenProjectIsStubbed() .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 @@ private void verifyOneDependencyAdded(final String outputLocation, final boolean 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 void useDefaultExcludes() throws Exception { 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);