Revision: 933
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=933&view=rev
Author: henryju
Date: 2011-11-28 10:11:30 +0000 (Mon, 28 Nov 2011)
Log Message:
-----------
Update Maven build/plugins + Fix a deadlock in a test with refresh handler
Modified Paths:
--------------
trunk/jwebunit-htmlunit-plugin/src/test/java/net/sourceforge/jwebunit/htmlunit/RefreshHandlerTest.java
trunk/pom.xml
trunk/src/changes/changes.xml
trunk/src/site/site.xml
Modified:
trunk/jwebunit-htmlunit-plugin/src/test/java/net/sourceforge/jwebunit/htmlunit/RefreshHandlerTest.java
===================================================================
---
trunk/jwebunit-htmlunit-plugin/src/test/java/net/sourceforge/jwebunit/htmlunit/RefreshHandlerTest.java
2011-10-10 15:53:54 UTC (rev 932)
+++
trunk/jwebunit-htmlunit-plugin/src/test/java/net/sourceforge/jwebunit/htmlunit/RefreshHandlerTest.java
2011-11-28 10:11:30 UTC (rev 933)
@@ -18,6 +18,8 @@
*/
package net.sourceforge.jwebunit.htmlunit;
+import org.junit.After;
+
import com.gargoylesoftware.htmlunit.ThreadedRefreshHandler;
import com.gargoylesoftware.htmlunit.WaitingRefreshHandler;
import net.sourceforge.jwebunit.tests.JWebUnitAPITestCase;
@@ -109,5 +111,13 @@
.println("[WARN] skipping test
[testChangeRefreshHandler] b/c it only applies to HtmlUnitTestEngineImpl");
}
}
+
+ @After
+ public void cleanup() {
+ if (getTestingEngine() instanceof HtmlUnitTestingEngineImpl) {
+ HtmlUnitTestingEngineImpl engine = (HtmlUnitTestingEngineImpl)
getTestingEngine();
+ engine.setRefreshHandler(null);
+ }
+ }
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-10 15:53:54 UTC (rev 932)
+++ trunk/pom.xml 2011-11-28 10:11:30 UTC (rev 933)
@@ -221,12 +221,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -236,7 +236,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
- <version>2.6</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -283,12 +283,12 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.3</version>
+ <version>3.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -433,7 +433,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<executions>
<execution>
<id>sign-artifacts</id>
@@ -447,64 +447,13 @@
</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-3</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>
- <profile>
- <id>m2e</id>
- <activation>
- <property>
- <name>m2e.version</name><!-- Activate only when within
eclipse -->
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <!-- Set to false to work around Maven Eclipse plugin
(m2e) bug MNGECLIPSE-2215 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <inherited>false</inherited>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
<configuration>
<configLocation>
${basedir}/${topDirectoryLocation}/src/checkstyle/jwebunit-checkstyle.xml
@@ -524,7 +473,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
+ <version>2.10</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -617,7 +566,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>2.6</version>
<configuration>
<aggregate>true</aggregate>
<targetJdk>1.5</targetJdk>
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2011-10-10 15:53:54 UTC (rev 932)
+++ trunk/src/changes/changes.xml 2011-11-28 10:11:30 UTC (rev 933)
@@ -32,7 +32,7 @@
<body>
<release version="3.1" date="UNKNOW" description="Cleanup for
Webdriver integration">
<action type="update" dev="henryju">
- getPageText() (and all related assertXX methods) now only
deals with what is inside <body> element. Previously it was also returning page
title for example.
+ getPageText() (and all related assertXX methods) now only
deals with what is inside <body> element. Previously it was also
returning page title for example.
</action>
<action type="update" dev="henryju">
gotoRootWindow() now goes to the root "frame" in a multi-frame
window. Previously it was only by chance.
Modified: trunk/src/site/site.xml
===================================================================
--- trunk/src/site/site.xml 2011-10-10 15:53:54 UTC (rev 932)
+++ trunk/src/site/site.xml 2011-11-28 10:11:30 UTC (rev 933)
@@ -22,8 +22,8 @@
<project name="JWebUnit">
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
- <version>1.1</version>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.0</version>
</skin>
<bannerLeft>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
JWebUnit-development mailing list
JWebUnit-development@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
