Author: lindner
Date: Tue Jan 13 03:01:31 2009
New Revision: 734101
URL: http://svn.apache.org/viewvc?rev=734101&view=rev
Log:
SHINDIG-827 | Updated Patch by Henning Schmiedehausen | Allow Maven Reporting
Modified:
incubator/shindig/branches/1.0.x-incubating/pom.xml
Modified: incubator/shindig/branches/1.0.x-incubating/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/pom.xml?rev=734101&r1=734100&r2=734101&view=diff
==============================================================================
--- incubator/shindig/branches/1.0.x-incubating/pom.xml (original)
+++ incubator/shindig/branches/1.0.x-incubating/pom.xml Tue Jan 13 03:01:31 2009
@@ -44,17 +44,26 @@
<maven>2.0.8</maven>
</prerequisites>
+ <!-- ======================================================================
-->
+ <!-- S C M
-->
+ <!-- ======================================================================
-->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating</developerConnection>
<url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating</url>
</scm>
+ <!-- ======================================================================
-->
+ <!-- I S S U E M A N A G E M E N T
-->
+ <!-- ======================================================================
-->
<issueManagement>
<system>jira</system>
<url>http://issues.apache.org/jira/browse/SHINDIG</url>
</issueManagement>
+ <!-- ======================================================================
-->
+ <!-- C I M A N A G E M E N T
-->
+ <!-- ======================================================================
-->
<ciManagement>
<system>Hudson</system>
<url>http://hudson.zones.apache.org/hudson/job/Shindig/</url>
@@ -380,20 +389,72 @@
<profile>
<id>reporting</id>
- <reporting>
+ <modules>
+ <module>java</module>
+ </modules>
+ <build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <check>
+ <haltOnFailure>false</haltOnFailure>
+ <regexes>
+ <regex>
+ <pattern>org.apache.shindig.*</pattern>
+ <branchRate>90</branchRate>
+ <lineRate>90</lineRate>
+ </regex>
+ </regexes>
+ </check>
+ <instrumentation>
+ <includes>
+ <include>org/apache/shindig/**/*.class</include>
+ </includes>
+ </instrumentation>
+ </configuration>
+ <executions>
+ <execution>
+ <id>clean</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>instrument</id>
+ <phase>site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>cobertura</goal>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <!-- ordered alphabetically by owner -->
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+
<configLocation>http://svn.apache.org/repos/asf/incubator/shindig/trunk/site/checkstyle.xml</configLocation>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
<configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
<link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
@@ -401,19 +462,159 @@
<link>http://junit.sourceforge.net/javadoc/</link>
</links>
</configuration>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <configuration>
+ <aggregate>false</aggregate>
+ </configuration>
+ <reports>
+ <report>javadoc</report>
+ <report>test-javadoc</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ <reports>
+ <report>aggregate</report>
+ <report>test-aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+ <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <configuration>
+ <aggregate>false</aggregate>
+ </configuration>
+ <reports>
+ <report>jxr</report>
+ <report>test-jxr</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ <reports>
+ <report>jxr</report>
+ <report>test-jxr</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <configuration>
+ <aggregate>false</aggregate>
+ </configuration>
+ <reports>
+ <report>cpd</report>
+ <report>pmd</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ <reports>
+ <report>cpd</report>
+ <report>pmd</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+
+ <!-- Mojo -->
+ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>clirr-maven-plugin</artifactId>
+ <version>2.2.2</version>
+ </plugin-->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/jsunit/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
+ <version>2.3</version>
<configuration>
<tags>
<tag>TODO</tag>
+ <tag>FIXME</tag>
+ <tag>@todo</tag>
+ <tag>@deprecated</tag>
</tags>
+ <encoding>${project.build.sourceEncoding}</encoding>
</configuration>
+ <reportSets>
+ <reportSet>
+ <id>non-aggregate</id>
+ <configuration>
+ <aggregate>false</aggregate>
+ </configuration>
+ <reports>
+ <report>taglist</report>
+ </reports>
+ </reportSet>
+ <reportSet>
+ <id>aggregate</id>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+ <reports>
+ <report>taglist</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
</plugins>
</reporting>
@@ -533,190 +734,43 @@
<!-- ======================================================================
-->
<!-- B U I L D
-->
<!-- ======================================================================
-->
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <!-- We want to package up license resources in the JARs produced -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>verify-legal-files</id>
- <phase>verify</phase>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <strict>false</strict>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins </groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.5.1</version>
- <!--
- <configuration>
-
<projectNameTemplate>${project.groupId}-${project.artifactId}</projectNameTemplate>
- </configuration>
- -->
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <showDeprecation>true</showDeprecation>
-
<compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally</compilerArgument>
- <fork>true</fork>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludeResources>false</excludeResources>
- <attach>true</attach>
- </configuration>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <check>
- <haltOnFailure>false</haltOnFailure>
- <regexes>
- <regex>
- <pattern>org.apache.shindig.*</pattern>
- <branchRate>90</branchRate>
- <lineRate>90</lineRate>
- </regex>
- </regexes>
- </check>
- <instrumentation>
- <includes>
- <include>org/apache/shindig/**/*.class</include>
- </includes>
- </instrumentation>
- </configuration>
- <executions>
- <execution>
- <id>clean</id>
- <phase>pre-site</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- <execution>
- <id>instrument</id>
- <phase>site</phase>
- <goals>
- <goal>instrument</goal>
- <goal>cobertura</goal>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/jsunit/**/*</exclude>
- </excludes>
- </configuration>
- </plugin>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
- </plugins>
+ <build>
+ <defaultGoal>install</defaultGoal>
<pluginManagement>
+ <!-- set versions/conf of common plugins for reproducibility, ordered
alphabetically by owner -->
<plugins>
- <!-- We want to package up license resources in the JARs produced -->
+ <!-- Maven -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
-
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
- </resourceBundles>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.14</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+
<compilerArgument>-Xlint:unchecked,deprecation,fallthrough,finally</compilerArgument>
+ <fork>true</fork>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
</plugin>
-
- <!-- set versions of common plugins for reproducibility, ordered
alphabetically -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
+ <groupId>org.apache.maven.plugins </groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5.1</version>
+<!-- <configuration>-->
+<!--
<projectNameTemplate>${project.groupId}-${project.artifactId}</projectNameTemplate>-->
+<!-- </configuration>-->
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -725,8 +779,20 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<archive>
<manifest>
@@ -743,12 +809,58 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+ <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
+ <link>http://www.json.org/javadoc/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+ </configuration>
+ </plugin>
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+
<resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
+ <version>2.0-beta-7</version>
+ <configuration>
+ <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
+ <outputEncoding>${project.build.sourceEncoding}</outputEncoding>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -758,9 +870,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.4.2</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1-alpha-2</version>
+ </plugin>
+
+ <!-- Mojo -->
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>2.2</version>
@@ -827,86 +946,77 @@
</plugin>
</plugins>
</pluginManagement>
- </build>
- <!-- ======================================================================
-->
- <!-- R E P O R T I N G
-->
- <!-- ======================================================================
-->
- <reporting>
+
+ <!-- ordered alphabetically by owner -->
<plugins>
+ <!-- Maven -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.2</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>site/checkstyle.xml</configLocation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/products/servlet/2.3/javadoc/</link>
- <link>http://www.json.org/javadoc/</link>
- <link>http://junit.sourceforge.net/javadoc/</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
+ <!-- We want to package up license resources in the JARs produced -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
- <tags>
- <tag>TODO</tag>
- <tag>FIXME</tag>
- <tag>@todo</tag>
- <tag>@deprecated</tag>
- </tags>
+ <excludeResources>false</excludeResources>
+ <attach>true</attach>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
+ <artifactId>maven-site-plugin</artifactId>
</plugin>
+
+ <!-- Mojo -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- </plugin>
+ </plugin>
+
+ <!-- Misc -->
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ </plugin>
</plugins>
- </reporting>
+ </build>
+
<!-- ======================================================================
-->
- <!-- D I S T R I B U T I O N M A N A G E M E N T
-->
+ <!-- R E P O R T I N G
-->
<!-- ======================================================================
-->
- <distributionManagement>
- <site>
- <id>local</id>
- <url>${site.localurl}</url>
- </site>
- </distributionManagement>
+ <reporting>
+ <!-- ordered alphabetically by owner -->
+ <plugins>
+ <!-- Maven -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ </plugins>
+ </reporting>
<!-- ======================================================================
-->
<!-- R E P O S I T O R I E S
-->
