You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kalumet-commits@incubator.apache.org by ol...@apache.org on 2012/07/09 14:56:59 UTC
svn commit: r1359198 - in /incubator/kalumet/trunk: documentation/pom.xml
documentation/src/site/assembly/docs.xml documentation/src/site/site.xml
pom.xml
Author: olamy
Date: Mon Jul 9 14:56:58 2012
New Revision: 1359198
URL: http://svn.apache.org/viewvc?rev=1359198&view=rev
Log:
prevent infinite loop and NPE with a plexus-utils SNAPSHOT
Modified:
incubator/kalumet/trunk/documentation/pom.xml
incubator/kalumet/trunk/documentation/src/site/assembly/docs.xml
incubator/kalumet/trunk/documentation/src/site/site.xml
incubator/kalumet/trunk/pom.xml
Modified: incubator/kalumet/trunk/documentation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/documentation/pom.xml?rev=1359198&r1=1359197&r2=1359198&view=diff
==============================================================================
--- incubator/kalumet/trunk/documentation/pom.xml (original)
+++ incubator/kalumet/trunk/documentation/pom.xml Mon Jul 9 14:56:58 2012
@@ -39,15 +39,23 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>3.1</version>
<executions>
<execution>
<id>site</id>
- <phase>generate-resources</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>site</goal>
</goals>
</execution>
</executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: incubator/kalumet/trunk/documentation/src/site/assembly/docs.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/documentation/src/site/assembly/docs.xml?rev=1359198&r1=1359197&r2=1359198&view=diff
==============================================================================
--- incubator/kalumet/trunk/documentation/src/site/assembly/docs.xml (original)
+++ incubator/kalumet/trunk/documentation/src/site/assembly/docs.xml Mon Jul 9 14:56:58 2012
@@ -17,5 +17,15 @@
limitations under the License.
-->
<assembly>
-
+ <id>docs</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>target/site</directory>
+ <outputDirectory>/docs/</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
Modified: incubator/kalumet/trunk/documentation/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/documentation/src/site/site.xml?rev=1359198&r1=1359197&r2=1359198&view=diff
==============================================================================
--- incubator/kalumet/trunk/documentation/src/site/site.xml (original)
+++ incubator/kalumet/trunk/documentation/src/site/site.xml Mon Jul 9 14:56:58 2012
@@ -27,7 +27,7 @@
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
- <version>1.1</version>
+ <version>1.2.1</version>
</skin>
<publishDate format="yyyy-MM-dd" position="right"/>
Modified: incubator/kalumet/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kalumet/trunk/pom.xml?rev=1359198&r1=1359197&r2=1359198&view=diff
==============================================================================
--- incubator/kalumet/trunk/pom.xml (original)
+++ incubator/kalumet/trunk/pom.xml Mon Jul 9 14:56:58 2012
@@ -561,46 +561,4 @@
</plugins>
</build>
- <reporting>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>${project-info-reports-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${javadoc-plugin.version}</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.sonar-plugins</groupId>
- <artifactId>maven-report</artifactId>
- <version>0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.9.1</version>
- <inherited>false</inherited>
- <reportSets>
- <reportSet>
- <reports>
- <report>checkstyle-aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- </plugins>
- </reporting>
-
</project>