From ed7f85cc5a52e34ef0f5f4cae9ffc6568f297a7a Mon Sep 17 00:00:00 2001 From: Frode Carlsen Date: Mon, 2 Aug 2021 11:54:45 +0200 Subject: [PATCH] Handle import scope dependencies when updating dependencyManagement. Fixes #346, #395 --- .../java/org/codehaus/mojo/versions/UseDepVersionMojo.java | 4 ++++ .../org/codehaus/mojo/versions/UseLatestReleasesMojo.java | 4 ++++ .../org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java | 4 ++++ .../org/codehaus/mojo/versions/UseLatestVersionsMojo.java | 4 ++++ .../java/org/codehaus/mojo/versions/UseNextReleasesMojo.java | 4 ++++ .../java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java | 4 ++++ .../java/org/codehaus/mojo/versions/UseNextVersionsMojo.java | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java b/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java index 317eba5e9..4e835deaa 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseDepVersionMojo.java @@ -76,7 +76,11 @@ protected void update( ModifiedPomXMLEventReader pom ) { if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() ) { + // handle normally declared dependencies useDepVersion( pom, getProject().getDependencyManagement().getDependencies() ); + + // handle import dependencies specially + useDepVersion( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } if ( getProject().getDependencies() != null && isProcessingDependencies() ) diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java b/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java index ab8b948f7..e058a94d0 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseLatestReleasesMojo.java @@ -101,7 +101,11 @@ protected void update( ModifiedPomXMLEventReader pom ) { if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() ) { + // handle normally declared dependencies useLatestReleases( pom, getProject().getDependencyManagement().getDependencies() ); + + // handle import dependencies specially + useLatestReleases( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } if ( getProject().getDependencies() != null && isProcessingDependencies() ) { diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java b/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java index 6867642e8..eaf411e2f 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseLatestSnapshotsMojo.java @@ -100,7 +100,11 @@ protected void update( ModifiedPomXMLEventReader pom ) { if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() ) { + // handle normally declared dependencies useLatestSnapshots( pom, getProject().getDependencyManagement().getDependencies() ); + + // handle import dependencies specially + useLatestSnapshots( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } if ( getProject().getDependencies() != null && isProcessingDependencies() ) { diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java b/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java index d15c45395..663adf8c4 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java @@ -96,7 +96,11 @@ protected void update( ModifiedPomXMLEventReader pom ) PomHelper.getRawModel( getProject() ).getDependencyManagement(); if ( dependencyManagement != null ) { + // handle normally declared dependencies useLatestVersions( pom, dependencyManagement.getDependencies() ); + + // handle import dependencies specially + useLatestVersions( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } } if ( getProject().getDependencies() != null && isProcessingDependencies() ) diff --git a/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java b/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java index 9b176de0e..1d509f94f 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseNextReleasesMojo.java @@ -67,7 +67,11 @@ protected void update( ModifiedPomXMLEventReader pom ) { if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() ) { + // handle normally declared dependencies useNextReleases( pom, getProject().getDependencyManagement().getDependencies() ); + + // handle import dependencies specially + useNextReleases( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } if ( getProject().getDependencies() != null && isProcessingDependencies() ) { diff --git a/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java b/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java index 4a503de27..f2835a1fa 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseNextSnapshotsMojo.java @@ -97,7 +97,11 @@ protected void update( ModifiedPomXMLEventReader pom ) { if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() ) { + // handle normally declared dependencies useNextSnapshots( pom, getProject().getDependencyManagement().getDependencies() ); + + // handle import dependencies specially + useNextSnapshots( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } if ( getProject().getDependencies() != null && isProcessingDependencies() ) { diff --git a/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java b/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java index d1959a644..a305411c6 100644 --- a/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java +++ b/src/main/java/org/codehaus/mojo/versions/UseNextVersionsMojo.java @@ -60,7 +60,11 @@ protected void update( ModifiedPomXMLEventReader pom ) { if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() ) { + // handle normally declared dependencies useNextVersions( pom, getProject().getDependencyManagement().getDependencies() ); + + // handle import dependencies specially + useNextVersions( pom, PomHelper.readImportedPOMsFromDependencyManagementSection(pom) ); } if ( getProject().getDependencies() != null && isProcessingDependencies() ) {