Handle import scope dependencies when updating dependencyManagement. F…

…ixes mojohaus#346, mojohaus#395 (cherry picked from commit ed7f85c)
agaengel · Sep 3, 2021 · 678e00c · 678e00c
1 parent f38c23d
commit 678e00c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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() )
             {