Revision: 665
http://svn.sourceforge.net/jwebunit/?rev=665&view=rev
Author: henryju
Date: 2007-01-27 11:21:51 -0800 (Sat, 27 Jan 2007)
Log Message:
-----------
Fix dependencies (use only released dependencies and plugins when possible).
Modified Paths:
--------------
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/exception/UnableToSetFormException.java
branches/1.x/jwebunit-htmlunit-plugin/pom.xml
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
branches/1.x/pom.xml
Modified:
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/exception/UnableToSetFormException.java
===================================================================
---
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/exception/UnableToSetFormException.java
2007-01-27 19:12:06 UTC (rev 664)
+++
branches/1.x/jwebunit-core/src/main/java/net/sourceforge/jwebunit/exception/UnableToSetFormException.java
2007-01-27 19:21:51 UTC (rev 665)
@@ -4,14 +4,13 @@
******************************************************************************/
package net.sourceforge.jwebunit.exception;
-import junit.framework.AssertionFailedError;
/**
* Represents a problem establishing a form on the current response for which
a request is to be built.
*
* @author Wilkes Joiner
*/
-public class UnableToSetFormException extends AssertionFailedError {
+public class UnableToSetFormException extends RuntimeException {
public UnableToSetFormException() {
}
Modified: branches/1.x/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- branches/1.x/jwebunit-htmlunit-plugin/pom.xml 2007-01-27 19:12:06 UTC
(rev 664)
+++ branches/1.x/jwebunit-htmlunit-plugin/pom.xml 2007-01-27 19:21:51 UTC
(rev 665)
@@ -1,83 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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";>
- <parent>
- <artifactId>jwebunit</artifactId>
- <groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <name>HtmlUnit Plugin</name>
- <description>HtmlUnit plugin for JWebUnit.</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <testFailureIgnore>false</testFailureIgnore>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*Tests.java</include>
- </includes>
- <excludes>
- <exclude>**/*AbstractTest.java</exclude>
- <exclude>**/*AbstractTests.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.10</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-commons-tests</artifactId>
- <version>${pom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>logkit</groupId>
- <artifactId>logkit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <topDirectoryLocation>..</topDirectoryLocation>
- </properties>
-</project>
\ No newline at end of file
+ <parent>
+ <artifactId>jwebunit</artifactId>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <version>1.4-SNAPSHOT</version>
+ <relativePath>../</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <name>HtmlUnit Plugin</name>
+ <description>HtmlUnit plugin for JWebUnit.</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <testFailureIgnore>false</testFailureIgnore>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*Tests.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/*AbstractTest.java</exclude>
+ <exclude>**/*AbstractTests.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.10</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-commons-tests</artifactId>
+ <version>${pom.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>logkit</artifactId>
+ <groupId>logkit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+</project>
+
Modified:
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
===================================================================
---
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
2007-01-27 19:12:06 UTC (rev 664)
+++
branches/1.x/jwebunit-htmlunit-plugin/src/main/java/net/sourceforge/jwebunit/htmlunit/HtmlUnitDialog.java
2007-01-27 19:21:51 UTC (rev 665)
@@ -49,9 +49,6 @@
import com.gargoylesoftware.htmlunit.html.xpath.HtmlUnitXPath;
import com.gargoylesoftware.htmlunit.xml.XmlPage;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
Modified: branches/1.x/pom.xml
===================================================================
--- branches/1.x/pom.xml 2007-01-27 19:12:06 UTC (rev 664)
+++ branches/1.x/pom.xml 2007-01-27 19:21:51 UTC (rev 665)
@@ -165,92 +165,16 @@
<organization>
<name>SourceForge</name>
<url>http://sourceforge.net</url>
- </organization>
- <pluginRepositories>
- <pluginRepository>
- <id>Maven CodeHaus Snapshots</id>
- <url>http://snapshots.maven.codehaus.org/maven2</url>
- <releases>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>Maven Snapshots</id>
- <url>
-
http://people.apache.org/maven-snapshot-repository/
- </url>
- <releases>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </pluginRepository>
- <pluginRepository>
- <id>stat-scm-sourceforge</id>
- <url>http://stat-scm.sourceforge.net/maven2</url>
- </pluginRepository>
- <pluginRepository>
- <id>stat-scm-sourceforge-snapshot</id>
-
<url>http://stat-scm.sourceforge.net/maven2-snapshots</url>
- </pluginRepository>
- </pluginRepositories>
- <!--
- <profiles>
- <profile>
- <id>release-profile</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>release</id>
- <phase>package</phase>
- <inherited>true</inherited>
- <goals>
- <goal>assembly</goal>
- </goals>
- <configuration>
- <attach>false</attach>
- <descriptors>
- <descriptor>
- src/assemble/release.xml
- </descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- -->
+ </organization>
+ <repositories>
+ <repository>
+ <id>Codehaus</id>
+ <name>Mojo Codehaus Repository</name>
+ <url>http://repository.codehaus.org/org/codehaus/mojo/</url>
+ </repository>
+ </repositories>
<build>
<plugins>
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
@@ -298,16 +222,6 @@
</descriptor>
</descriptors>
</configuration>
- <!-- executions>
- <execution>
- <id>release</id>
- <phase>package</phase>
- <inherited>false</inherited>
- <goals>
- <goal>assembly</goal>
- </goals>
- </execution>
- </executions-->
</plugin>
</plugins>
</build>
@@ -322,13 +236,9 @@
<version>3.8.2</version>
</dependency>
</dependencies>
- </dependencyManagement>
+ </dependencyManagement>
<reporting>
<plugins>
- <!--plugin>
- <groupId>net.sf</groupId>
- <artifactId>stat-scm</artifactId>
- </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -349,17 +259,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
</plugin>
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin-->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
<configuration>
<generateHistorical>true</generateHistorical>
@@ -382,14 +288,14 @@
</issueLinkTemplate>
</configuration>
</plugin>
- <!--plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- </plugin-->
- <plugin>
+ </plugin>
+ <!--plugin> //Still not released
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -459,7 +365,6 @@
<name>JWebUnit WebSite - Sourceforge</name>
<url>
scp://shell.sourceforge.net/home/groups/j/jw/jwebunit/htdocs
- <!--file://c:/temp/site-jwebunit-->
</url>
</site>
<repository>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
