Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MASSEMBLY-1019] Maven 3.6.3 as minimum requirements #185

Merged
merged 1 commit into from
Feb 18, 2024
Merged

[MASSEMBLY-1019] Maven 3.6.3 as minimum requirements #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
9 changes: 5 additions & 4 deletions src/test/java/org/apache/maven/plugins/assembly/archive/task/AddDependencySetsTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand Down Expand Up @@ -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);

Expand Down