From 3870ab0e6021eb17d04883f97fe144d2db96e745 Mon Sep 17 00:00:00 2001
From: Benjamin Bentmann <bentmann@apache.org>
Date: Mon, 31 Aug 2009 22:40:12 +0000
Subject: [PATCH] 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
---
 .../model/building/DefaultModelBuilder.java   | 16 ++++--
 .../org/apache/maven/model/pom-4.0.0.xml      | 51 +++++++++++++++++++
 2 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 884fe68d5b..149becc0f1 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -124,6 +124,7 @@ public class DefaultModelBuilder
         problems.setRootModel( inputModel );
 
         ModelData resultData = new ModelData( inputModel );
+        ModelData superData = new ModelData( getSuperModel() );
 
         List<ModelData> lineage = new ArrayList<ModelData>();
 
@@ -157,15 +158,20 @@ public class DefaultModelBuilder
                 }
             }
 
+            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 );
 
diff --git a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
index 2621c1c46d..0b4f98c240 100644
--- a/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
+++ b/maven-model-builder/src/main/resources/org/apache/maven/model/pom-4.0.0.xml
@@ -153,5 +153,56 @@ under the License.
   <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 -->