Revision: 850
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=850&view=rev
Author: henryju
Date: 2010-10-05 14:29:31 +0000 (Tue, 05 Oct 2010)
Log Message:
-----------
Updated Maven configuration (especially site & reporting) to works with Maven 3.
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-10-05 11:59:59 UTC (rev 849)
+++ trunk/pom.xml 2010-10-05 14:29:31 UTC (rev 850)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.jwebunit</groupId>
<artifactId>jwebunit</artifactId>
@@ -60,8 +61,8 @@
<name>Julien Henry</name>
<email>henryju at users.sourceforge.net</email>
<url />
- <organization>Capgemini</organization>
- <organizationUrl>http://www.capgemini.com</organizationUrl>
+ <organization>SERLI</organization>
+ <organizationUrl>http://www.serli.com</organizationUrl>
<roles>
<role>Developer</role>
</roles>
@@ -198,49 +199,49 @@
<build>
<pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <configuration>
- <attach>false</attach>
- <descriptors>
- <descriptor>
- src/assemble/release.xml
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <attach>false</attach>
+ <descriptors>
+ <descriptor>
+ src/assemble/release.xml
</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <preparationGoals>clean install</preparationGoals>
- <mavenExecutorId>forked-path</mavenExecutorId>
- </configuration>
- </plugin>
+ </descriptors>
+ </configuration>
+ </plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <preparationGoals>clean install</preparationGoals>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
@@ -253,8 +254,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <quiet>true</quiet>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -296,8 +305,8 @@
<exclude>src/main/javacc/Java1.5.jj</exclude>
<exclude>src/main/javacc/Token.java</exclude>
<exclude>src/main/resources/testcases/CharsetTest/charset.html_utf-8</exclude>
-
<exclude>src/main/resources/testcases/NonHtmlContentTest/text.bin</exclude>
-
<exclude>src/main/resources/testcases/FramesAndWindowsTest/TopFrame.html</exclude>
+
<exclude>src/main/resources/testcases/NonHtmlContentTest/text.bin</exclude>
+
<exclude>src/main/resources/testcases/FramesAndWindowsTest/TopFrame.html</exclude>
</excludes>
</configuration>
<executions>
@@ -407,13 +416,46 @@
</plugins>
</build>
</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>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0-beta-2</version>
+ </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>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
<configLocation>
${basedir}/${topDirectoryLocation}/src/checkstyle/jwebunit-checkstyle.xml
@@ -421,13 +463,18 @@
<headerLocation>
${basedir}/${topDirectoryLocation}/src/checkstyle/header-checkstyle.txt
</headerLocation>
- <xrefLocation>xref</xrefLocation>
+ <xrefLocation>
+
${project.reporting.outputDirectory}/${topDirectoryLocation}/xref
+ </xrefLocation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.6</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -437,7 +484,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
<inherited>false</inherited>
<reportSets>
<reportSet>
@@ -448,59 +495,48 @@
</reportSets>
<configuration>
<issueLinkTemplate>
- http://sourceforge.net/support/tracker.php?aid=%ISSUE%
- </issueLinkTemplate>
+ http://sourceforge.net/support/tracker.php?aid=%ISSUE%
</issueLinkTemplate>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.1</version>
+ <configuration>
+ <xrefLocation>
+
${project.reporting.outputDirectory}/${topDirectoryLocation}/xref
+ </xrefLocation>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.6.1</version>
+ <version>2.7</version>
<reportSets>
<reportSet>
<id>aggregate</id>
<configuration>
- <excludePackageNames>
-
net.sourceforge.jwebunit.javacc:net.sourceforge.jwebunit.tests
- </excludePackageNames>
- <links>
- <link>
-
http://java.sun.com/j2se/1.5.0/docs/api/
- </link>
- <link>
-
http://hc.apache.org/httpclient-3.x/apidocs/
- </link>
-
<link>http://junit.sourceforge.net/junit3.8.1/javadoc/</link>
- <link>
-
http://htmlunit.sourceforge.net/apidocs/
- </link>
-
<link>http://release.seleniumhq.org/selenium-remote-control/0.9.2/doc/java/</link>
- </links>
- <groups>
- <group>
- <title>Core Packages</title>
- <packages>
-
net.sourceforge.jwebunit.api*:net.sourceforge.jwebunit.junit*:net.sourceforge.jwebunit.exception*:net.sourceforge.jwebunit.html*:net.sourceforge.jwebunit.javascript*:net.sourceforge.jwebunit.util*
- </packages>
- </group>
- <group>
- <title>HtmlUnit Packages</title>
- <packages>
- net.sourceforge.jwebunit.htmlunit*
- </packages>
- </group>
- <group>
- <title>Selenium Packages</title>
- <packages>
- net.sourceforge.jwebunit.selenium*
- </packages>
- </group>
- </groups>
+
<excludePackageNames>net.sourceforge.jwebunit.javacc:net.sourceforge.jwebunit.tests</excludePackageNames>
+ <links>
+
<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+
<link>http://hc.apache.org/httpcomponents-client-ga/httpclient/apidocs/</link>
+
<link>http://kentbeck.github.com/junit/javadoc/latest/</link>
+
<link>http://htmlunit.sourceforge.net/apidocs/</link>
+ </links>
+ <groups>
+ <group>
+ <title>Core Packages</title>
+
<packages>net.sourceforge.jwebunit.api*:net.sourceforge.jwebunit.junit*:net.sourceforge.jwebunit.exception*:net.sourceforge.jwebunit.html*:net.sourceforge.jwebunit.javascript*:net.sourceforge.jwebunit.util*</packages>
+ </group>
+ <group>
+ <title>HtmlUnit Packages</title>
+
<packages>net.sourceforge.jwebunit.htmlunit*</packages>
+ </group>
+ <group>
+ <title>Selenium Packages</title>
+
<packages>net.sourceforge.jwebunit.selenium*</packages>
+ </group>
+ </groups>
</configuration>
<reports>
<report>aggregate</report>
@@ -511,7 +547,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -520,15 +556,16 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<version>2.4</version>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<configuration>
- <xrefLocation>
-
${project.reporting.outputDirectory}/${topDirectoryLocation}/xref
- </xrefLocation>
+ <aggregate>true</aggregate>
<targetJdk>1.5</targetJdk>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
