Author: bentmann Date: Thu Oct 1 22:17:24 2009 New Revision: 820822 URL: http://svn.apache.org/viewvc?rev=820822&view=rev Log: o Made lifecycle bindings injector optional
Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Modified: maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=820822&r1=820821&r2=820822&view=diff ============================================================================== --- maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java (original) +++ maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java Thu Oct 1 22:17:24 2009 @@ -103,7 +103,7 @@ @Requirement private DependencyManagementImporter dependencyManagementImporter; - @Requirement + @Requirement( optional = true ) private LifecycleBindingsInjector lifecycleBindingsInjector; @Requirement @@ -246,6 +246,11 @@ if ( request.isProcessPlugins() ) { + if ( lifecycleBindingsInjector == null ) + { + throw new IllegalStateException( "lifecycle bindings injector is missing" ); + } + lifecycleBindingsInjector.injectLifecycleBindings( resultModel, request, problems ); }