Skip to content

[MDEP-925] Require Maven 3.6.3 #381

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

Merged
slawekjaranowski merged 1 commit into from
Apr 23, 2024
Merged

[MDEP-925] Require Maven 3.6.3 #381

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
31 changes: 17 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ under the License.
</distributionManagement>

<properties>
<mavenVersion>3.2.5</mavenVersion>
<mavenVersion>3.6.3</mavenVersion>
<jettyVersion>9.4.54.v20240208</jettyVersion>
<pluginTestingVersion>3.3.0</pluginTestingVersion>
<resolverVersion>1.0.2.v20150114</resolverVersion>
<resolverVersion>1.4.1</resolverVersion>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2023-10-20T21:21:50Z</project.build.outputTimestamp>
<slf4j.version>1.7.36</slf4j.version>
Expand Down Expand Up @@ -148,7 +148,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<artifactId>maven-resolver-provider</artifactId>
<version>${mavenVersion}</version>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -244,6 +244,10 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -282,16 +286,15 @@ under the License.
</dependency>

<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-util</artifactId>
<version>${resolverVersion}</version>
<scope>provided</scope>
</dependency>
<!-- IDE build support (https://github.com/codehaus-plexus/plexus-build-api) -->
<dependency>
Expand All @@ -304,20 +307,20 @@ under the License.

<!-- test -->
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-connector-basic</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-file</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-file</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-http</artifactId>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-transport-http</artifactId>
<version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ protected void setUp() throws Exception {
artifactRepos.add(newRepositoryWithId("ar-snapshots"));
artifactRepos.add(newRepositoryWithId("ar-staging"));

when(buildingRequest.getRepositoryMerging()).thenReturn(ProjectBuildingRequest.RepositoryMerging.POM_DOMINANT);
when(session.getProjectBuildingRequest()).thenReturn(buildingRequest);
}

Expand Down
9 changes: 9 additions & 0 deletions src/test/java/org/apache/maven/plugins/dependency/analyze/TestAnalyzeDepMgt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,32 +111,41 @@ public void testGetManagementKey() throws IOException {
// sure it's ok before
// testing the next one
dep.setType("t");
dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setType("type");
dep.clearManagementKey();
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setArtifactId("a");
dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setArtifactId("artifact");
dep.clearManagementKey();
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setClassifier("c");
dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setClassifier("class");
dep.clearManagementKey();
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setGroupId("g");
dep.clearManagementKey();
assertNotEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setGroupId("group");
dep.setClassifier(null);
dep.clearManagementKey();
artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", null);
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));

dep.setClassifier("");
dep.clearManagementKey();
artifact = stubFactory.createArtifact("group", "artifact", "1.0", Artifact.SCOPE_COMPILE, "type", "");
assertEquals(dep.getManagementKey(), mojo.getArtifactManagementKey(artifact));
}
Expand Down