Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Restored release profile for the sake of backward-compat (its removal needs to be deferred until we bump the model version) 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@809769 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-31 22:40:12 +00:00
parent d45b4e09a5
commit 3870ab0e60
2 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -124,6 +124,7 @@ public class DefaultModelBuilder
problems.setRootModel( inputModel ); problems.setRootModel( inputModel );
ModelData resultData = new ModelData( inputModel ); ModelData resultData = new ModelData( inputModel );
ModelData superData = new ModelData( getSuperModel() );
List<ModelData> lineage = new ArrayList<ModelData>(); List<ModelData> lineage = new ArrayList<ModelData>();
@ -157,15 +158,20 @@ public class DefaultModelBuilder
} }
} }
if ( currentData == superData )
{
break;
}
configureResolver( request.getModelResolver(), tmpModel, problems ); configureResolver( request.getModelResolver(), tmpModel, problems );
currentData = readParent( tmpModel, request, problems ); currentData = readParent( tmpModel, request, problems );
}
ModelData superData = new ModelData( getSuperModel() ); if ( currentData == null )
superData.setRawModel( superData.getModel() ); {
superData.setActiveProfiles( Collections.<Profile> emptyList() ); currentData = superData;
lineage.add( superData ); }
}
assembleInheritance( lineage, request, problems ); assembleInheritance( lineage, request, problems );

51
maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
View File

@ -153,5 +153,56 @@ under the License.
<reporting> <reporting>
<outputDirectory>${project.build.directory}/site</outputDirectory> <outputDirectory>${project.build.directory}/site</outputDirectory>
</reporting> </reporting>
<profiles>
<!-- NOTE: The release profile will be removed from future versions of the super POM -->
<profile>
<id>release-profile</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<inherited>true</inherited>
<artifactId>maven-source-plugin</artifactId>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<inherited>true</inherited>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<inherited>true</inherited>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project> </project>
<!-- END SNIPPET: superpom --> <!-- END SNIPPET: superpom -->