Author: bentmann
Date: Mon Aug 31 22:40:12 2009
New Revision: 809769
URL: http://svn.apache.org/viewvc?rev=809769&view=rev
Log:
o Restored release profile for the sake of backward-compat (its removal needs
to be deferred until we bump the model version)
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
Modified:
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java?rev=809769&r1=809768&r2=809769&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
(original)
+++
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
Mon Aug 31 22:40:12 2009
@@ -124,6 +124,7 @@
problems.setRootModel( inputModel );
ModelData resultData = new ModelData( inputModel );
+ ModelData superData = new ModelData( getSuperModel() );
List<ModelData> lineage = new ArrayList<ModelData>();
@@ -157,15 +158,20 @@
}
}
+ if ( currentData == superData )
+ {
+ break;
+ }
+
configureResolver( request.getModelResolver(), tmpModel, problems
);
currentData = readParent( tmpModel, request, problems );
- }
- ModelData superData = new ModelData( getSuperModel() );
- superData.setRawModel( superData.getModel() );
- superData.setActiveProfiles( Collections.<Profile> emptyList() );
- lineage.add( superData );
+ if ( currentData == null )
+ {
+ currentData = superData;
+ }
+ }
assembleInheritance( lineage, request, problems );
Modified:
maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml?rev=809769&r1=809768&r2=809769&view=diff
==============================================================================
---
maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
(original)
+++
maven/components/trunk/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
Mon Aug 31 22:40:12 2009
@@ -153,5 +153,56 @@
<reporting>
<outputDirectory>${project.build.directory}/site</outputDirectory>
</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>
<!-- END SNIPPET: superpom -->
