Skip to content

Commit 7bacd0e

Browse files
Fix for Maven 3.10.x (#517)
* Fix for Maven 3.10.x What changed: - ignore resolve-properties-ci 4.x and 3.10.x required all properties in dependence to be resolved - Add remote project repositories in `ArtifactDescriptorRequest` fix #513 * temporally skip flatten-deploy for 4.x
1 parent bcadf77 commit 7bacd0e

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
invoker.goals=clean deploy
2+
3+
# FIXME Failed with Maven 4.0.0-rc-5
4+
invoker.maven.version = !4.0.0+
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
invoker.mavenOpts = -Drevision=1.2.3.4 -Drevision1=1.2.3.5 -Dsmall=small -Dsha1=abcdefg -Dchangelist=1,2,3,4
2-
# Maven 4 requires all properties to be resolved in dependencies
3-
invoker.maven.version = !4.0.0+
2+
# Maven 4 and 3.10.0 requires all properties to be resolved in dependencies
3+
invoker.maven.version = !4.0.0+,!3.10.0

‎src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,8 @@ public boolean visitLeave(DependencyNode node) {
11981198

11991199
org.eclipse.aether.artifact.Artifact aetherArtifact = new DefaultArtifact(
12001200
artifact.getGroupId(), artifact.getArtifactId(), null, artifact.getVersion());
1201-
ArtifactDescriptorRequest request = new ArtifactDescriptorRequest(aetherArtifact, null, null);
1201+
ArtifactDescriptorRequest request =
1202+
new ArtifactDescriptorRequest(aetherArtifact, project.getRemoteProjectRepositories(), null);
12021203
ArtifactDescriptorResult artifactDescriptorResult =
12031204
repositorySystem.readArtifactDescriptor(this.session.getRepositorySession(), request);
12041205

0 commit comments

Comments
 (0)