Merge pull request #73 from tavin/master

fix #25 use raw model for dependencyManagement
mojohaus · Jun 12, 2016 · 0f79ff0 · 0f79ff0
2 parents ddf38a1 + 54ba815
commit 0f79ff0
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java b/src/main/java/org/codehaus/mojo/versions/UseLatestVersionsMojo.java
@@ -23,13 +23,16 @@
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Model;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.codehaus.mojo.versions.api.ArtifactVersions;
 import org.codehaus.mojo.versions.api.PomHelper;
 import org.codehaus.mojo.versions.rewriting.ModifiedPomXMLEventReader;
 
 import javax.xml.stream.XMLStreamException;
+import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -85,7 +88,11 @@ protected void update( ModifiedPomXMLEventReader pom )
         {
             if ( getProject().getDependencyManagement() != null && isProcessingDependencyManagement() )
             {
-                useLatestVersions( pom, getProject().getDependencyManagement().getDependencies() );
+                DependencyManagement dependencyManagement = PomHelper.getRawModel( getProject() ).getDependencyManagement();
+                if ( dependencyManagement != null )
+                {
+                    useLatestVersions( pom, dependencyManagement.getDependencies() );
+                }
             }
             if ( isProcessingDependencies() )
             {
@@ -96,6 +103,9 @@ protected void update( ModifiedPomXMLEventReader pom )
         {
             throw new MojoExecutionException( e.getMessage(), e );
         }
+        catch ( IOException e ) {
+            throw new MojoExecutionException( e.getMessage(), e );
+        }
     }
 
     private void useLatestVersions( ModifiedPomXMLEventReader pom, Collection dependencies )
@@ -136,4 +146,4 @@ private void useLatestVersions( ModifiedPomXMLEventReader pom, Collection depend
         }
     }
 
-}
+}