Author: brianf
Date: Thu Feb 10 23:26:14 2011
New Revision: 1069610
URL: http://svn.apache.org/viewvc?rev=1069610&view=rev
Log:
move the attach descriptor to the maven pom since there's no site with the asf
pom. Also set the inherited flag to false so it's not run for every child of
maven.
Modified:
maven/pom/trunk/asf/pom.xml
maven/pom/trunk/maven/pom.xml
Modified: maven/pom/trunk/asf/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/asf/pom.xml?rev=1069610&r1=1069609&r2=1069610&view=diff
==============================================================================
--- maven/pom/trunk/asf/pom.xml (original)
+++ maven/pom/trunk/asf/pom.xml Thu Feb 10 23:26:14 2011
@@ -386,19 +386,6 @@ under the License.
</plugin>
</plugins>
</pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-descriptor</id>
- <goals>
- <goal>attach-descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
</profile>
</profiles>
Modified: maven/pom/trunk/maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1069610&r1=1069609&r2=1069610&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Thu Feb 10 23:26:14 2011
@@ -775,5 +775,31 @@ under the License.
</plugins>
</reporting>
</profile>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized by
Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <build>
+ <!-- we need to attach the descriptor for this pom -->
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
