Revision: 688
http://svn.sourceforge.net/jwebunit/?rev=688&view=rev
Author: henryju
Date: 2007-03-31 11:29:40 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Update pom version.
Update plugins version.
Modified Paths:
--------------
trunk/jwebunit-commons-tests/pom.xml
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
trunk/jwebunit-core/pom.xml
trunk/jwebunit-htmlunit-plugin/pom.xml
trunk/jwebunit-webtestcase-generator/pom.xml
trunk/pom.xml
trunk/src/site/xdoc/building-maven.xml
Modified: trunk/jwebunit-commons-tests/pom.xml
===================================================================
--- trunk/jwebunit-commons-tests/pom.xml 2007-03-17 18:00:02 UTC (rev
687)
+++ trunk/jwebunit-commons-tests/pom.xml 2007-03-31 18:29:40 UTC (rev
688)
@@ -2,7 +2,7 @@
<parent>
<artifactId>jwebunit</artifactId>
<groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -17,7 +17,6 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.0.1</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
@@ -27,7 +26,6 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1</version>
</dependency>
</dependencies>
<properties>
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
2007-03-17 18:00:02 UTC (rev 687)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/NonHtmlContentTest.java
2007-03-31 18:29:40 UTC (rev 688)
@@ -41,7 +41,6 @@
public void testImageContent() throws IOException {
beginAt("/image.png");
- saveAs(new File("C:\\test.png"));
assertDownloadedFileEquals(this.getClass().getResource("/testcases/NonHtmlContentTest/image.png"));
}
}
\ No newline at end of file
Modified:
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
===================================================================
---
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2007-03-17 18:00:02 UTC (rev 687)
+++
trunk/jwebunit-commons-tests/src/main/java/net/sourceforge/jwebunit/tests/util/JettySetup.java
2007-03-31 18:29:40 UTC (rev 688)
@@ -13,22 +13,14 @@
import org.mortbay.jetty.bio.SocketConnector;
import org.mortbay.jetty.handler.DefaultHandler;
import org.mortbay.jetty.handler.HandlerCollection;
-import org.mortbay.jetty.security.Authenticator;
-import org.mortbay.jetty.security.BasicAuthenticator;
-import org.mortbay.jetty.security.Constraint;
-import org.mortbay.jetty.security.ConstraintMapping;
import org.mortbay.jetty.security.HashUserRealm;
-import org.mortbay.jetty.security.Password;
-import org.mortbay.jetty.security.SecurityHandler;
import org.mortbay.jetty.security.UserRealm;
import org.mortbay.jetty.webapp.WebAppContext;
-import org.mortbay.xml.XmlConfiguration;
import junit.extensions.TestSetup;
import junit.framework.Test;
import net.sourceforge.jwebunit.tests.JWebUnitAPITestCase;
-import net.sourceforge.jwebunit.util.TestingEngineRegistry;
/**
* Sets up and tears down the Jetty servlet engine before and after the tests
in
Modified: trunk/jwebunit-core/pom.xml
===================================================================
--- trunk/jwebunit-core/pom.xml 2007-03-17 18:00:02 UTC (rev 687)
+++ trunk/jwebunit-core/pom.xml 2007-03-31 18:29:40 UTC (rev 688)
@@ -2,7 +2,7 @@
<parent>
<artifactId>jwebunit</artifactId>
<groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,12 +19,10 @@
<dependency>
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
</dependency>
</dependencies>
<properties>
@@ -71,7 +69,7 @@
<artifactId>
jwebunit-webtestcase-generator
</artifactId>
- <version>1.4-SNAPSHOT</version>
+
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</plugin>
Modified: trunk/jwebunit-htmlunit-plugin/pom.xml
===================================================================
--- trunk/jwebunit-htmlunit-plugin/pom.xml 2007-03-17 18:00:02 UTC (rev
687)
+++ trunk/jwebunit-htmlunit-plugin/pom.xml 2007-03-31 18:29:40 UTC (rev
688)
@@ -2,7 +2,7 @@
<parent>
<artifactId>jwebunit</artifactId>
<groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -36,7 +36,6 @@
<dependency>
<groupId>htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.11</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jwebunit</groupId>
@@ -52,34 +51,10 @@
<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>
Modified: trunk/jwebunit-webtestcase-generator/pom.xml
===================================================================
--- trunk/jwebunit-webtestcase-generator/pom.xml 2007-03-17 18:00:02 UTC
(rev 687)
+++ trunk/jwebunit-webtestcase-generator/pom.xml 2007-03-31 18:29:40 UTC
(rev 688)
@@ -2,7 +2,7 @@
<parent>
<artifactId>jwebunit</artifactId>
<groupId>net.sourceforge.jwebunit</groupId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.5-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-03-17 18:00:02 UTC (rev 687)
+++ trunk/pom.xml 2007-03-31 18:29:40 UTC (rev 688)
@@ -169,42 +169,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <flushPolicy>threaded</flushPolicy>
- <flushInterval>100</flushInterval>
- <targetPercentage>0%</targetPercentage>
- <licenseLocation>
-
${basedir}/${topDirectoryLocation}/src/test/clover/clover.license
- </licenseLocation>
- </configuration>
- <executions>
- <execution>
- <id>main</id>
- <phase>verify</phase>
- <goals>
- <goal>instrument</goal>
- <goal>aggregate</goal>
- <goal>check</goal>
- <goal>log</goal>
- </goals>
- </execution>
- <execution>
- <id>site</id>
- <phase>pre-site</phase>
- <goals>
- <goal>instrument</goal>
- <goal>aggregate</goal>
-
- <!-- We save a history point in order to have data
to generate a historical report -->
- <goal>save-history</goal>
-
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-SNAPSHOT</version>
<configuration>
@@ -215,6 +182,73 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1-beta-1</version>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3-SNAPSHOT</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <flushPolicy>threaded</flushPolicy>
+ <flushInterval>100</flushInterval>
+ <targetPercentage>0%</targetPercentage>
+ <licenseLocation>
+
${basedir}/${topDirectoryLocation}/src/test/clover/clover.license
+ </licenseLocation>
+ </configuration>
+ <executions>
+ <execution>
+ <id>main</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+ <goal>check</goal>
+ <goal>log</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>site</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>instrument</goal>
+ <goal>aggregate</goal>
+
+ <!-- We save a history point in order to have
data to generate a historical report -->
+ <goal>save-history</goal>
+
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<properties>
<topDirectoryLocation>.</topDirectoryLocation>
@@ -225,12 +259,59 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.2rc2</version>
</dependency>
<dependency>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2</version>
</dependency>
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.11</version>
+ </dependency>
+ <dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </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>
</dependencies>
</dependencyManagement>
<reporting>
@@ -298,6 +379,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.3-SNAPSHOT</version>
<configuration>
<aggregate>true</aggregate>
<excludePackageNames>
@@ -349,7 +431,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
<reportSets>
<reportSet>
<reports>
Modified: trunk/src/site/xdoc/building-maven.xml
===================================================================
--- trunk/src/site/xdoc/building-maven.xml 2007-03-17 18:00:02 UTC (rev
687)
+++ trunk/src/site/xdoc/building-maven.xml 2007-03-31 18:29:40 UTC (rev
688)
@@ -78,13 +78,6 @@
</p>
<ul>
<li>
- exec-maven-plugin-1.1-SNAPSHOT from
- <a
- href="http://snapshots.repository.codehaus.org/";>
- Codehaus Snapshot Repository
- </a>
- </li>
- <li>
javacc-maven-plugin build from SVN + patch for
this
<a
@@ -93,17 +86,7 @@
</a>
</li>
<li>
- [cosmetic] maven-javadoc-plugin from SVN + 2
- patches.
- <a
-
href="http://jira.codehaus.org/browse/MJAVADOC-105";>
- issue 1
- </a>
- ,
- <a
-
href="http://jira.codehaus.org/browse/MJAVADOC-104";>
- issue 2
- </a>
+ [cosmetic] maven-javadoc-plugin 2.3-SNAPSHOT.
</li>
<li>
[only required to build SF packages]
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
