You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/09/27 15:35:41 UTC

svn commit: r1001733 - in /myfaces/gsoc/webapptest: impl/pom.xml impl/src/main/java/org/apache/myfaces/test/webapp/impl/dependencies/HtmlUnitDependency.java pom.xml

Author: jakobk
Date: Mon Sep 27 13:35:41 2010
New Revision: 1001733

URL: http://svn.apache.org/viewvc?rev=1001733&view=rev
Log:
update htmlunit to newer version

Modified:
    myfaces/gsoc/webapptest/impl/pom.xml
    myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/dependencies/HtmlUnitDependency.java
    myfaces/gsoc/webapptest/pom.xml

Modified: myfaces/gsoc/webapptest/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/impl/pom.xml?rev=1001733&r1=1001732&r2=1001733&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/impl/pom.xml (original)
+++ myfaces/gsoc/webapptest/impl/pom.xml Mon Sep 27 13:35:41 2010
@@ -76,15 +76,32 @@
             <artifactId>el-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        
+
         <!-- HtmlUnit compile-->
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.4</version>
         </dependency>
         <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit-core-js</artifactId>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.cssparser</groupId>
@@ -93,38 +110,38 @@
         </dependency>
         <dependency>
             <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>webdriver</artifactId>
-            <version>2.6</version>
-        </dependency>        
+            <artifactId>htmlunit</artifactId>
+            <version>2.8</version>
+        </dependency>
         <dependency>
-            <groupId>net.sourceforge.nekohtml</groupId>
-            <artifactId>nekohtml</artifactId>
-            <version>1.9.11</version>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit-core-js</artifactId>
+            <version>2.8</version>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
+            <groupId>net.sourceforge.nekohtml</groupId>
+            <artifactId>nekohtml</artifactId>
+            <version>1.9.14</version>
         </dependency>
         <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.1</version>
         </dependency>
         <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.9.1</version>
         </dependency>
         
     </dependencies>

Modified: myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/dependencies/HtmlUnitDependency.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/dependencies/HtmlUnitDependency.java?rev=1001733&r1=1001732&r2=1001733&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/dependencies/HtmlUnitDependency.java (original)
+++ myfaces/gsoc/webapptest/impl/src/main/java/org/apache/myfaces/test/webapp/impl/dependencies/HtmlUnitDependency.java Mon Sep 27 13:35:41 2010
@@ -28,18 +28,26 @@ import org.apache.myfaces.test.webapp.ap
  */
 public enum HtmlUnitDependency implements WebappConfiguration {
 
-    //HtmlUnit compile and run dependencies
-    COMMONS_IO_1_4("commons-io", "commons-io", "1.4"),
-    COMMONS_LANG_2_4("commons-lang", "commons-lang", "2.4"),
-    COMMONS_CODEC_1_3("commons-codec", "commons-codec", "1.3"),
-    COMMONS_HTTPClIENT_3_1("commons-httpclient", "commons-httpclient", "3.1"),
-
-    HTMLUNIT_CORE_2_4("net.sourceforge.htmlunit", "htmlunit-core-js", "2.4"),
-    HTMLUNIT_2_4("net.sourceforge.htmlunit", "htmlunit", "2.4"),
-    HTMLUNIT_DRIVER_2_6("net.sourceforge.htmlunit", "webdriver", "2.6"),
-    CSSPARSER_0_9_5("net.sourceforge.cssparser", "cssparser", "0.9.5"),
-    NEKOHTML_1_9_11("net.sourceforge.nekohtml", "nekohtml", "1.9.11"),
-    W3C_SAC_1_3("org.w3c.css", "sac", "1.3");
+    CODEC("commons-codec", "commons-codec", "1.4"),
+    COLLECTION("commons-collections", "commons-collections", "3.2.1"),
+    IO("commons-io", "commons-io", "1.4"),
+    LANG("commons-lang", "commons-lang", "2.4"),
+    LOGGING("commons-logging", "commons-logging", "1.1.1"),
+    CSSPARSER("net.sourceforge.cssparser", "cssparser", "0.9.5"),
+    HTMLUNIT("net.sourceforge.htmlunit", "htmlunit", "2.8"),
+    HTMLUNITCOREJS("net.sourceforge.htmlunit", "htmlunit-core-js", "2.8"),
+    NEKOHTML("net.sourceforge.nekohtml", "nekohtml", "1.9.14"),
+    HTTPCLIENT("org.apache.httpcomponents", "httpclient", "4.0.1"),
+    HTTPMIME("org.apache.httpcomponents", "httpmime", "4.0.1"),
+    XALAN("xalan", "xalan", "2.7.1"),
+    XERCES("xerces", "xercesImpl", "2.9.1"),
+
+    /* transitive maven dependencies */
+    HTTPCORE("org.apache.httpcomponents", "httpcore", "4.0.1"),
+    MIMEJ("org.apache.james", "apache-mime4j", "0.6"),
+    SAC("org.w3c.css", "sac", "1.3"),
+    SERIALIZER("xalan", "serializer", "2.7.1"),
+    XMLAPIS("xml-apis", "xml-apis", "1.3.04");
 
 
     private String _groupId;

Modified: myfaces/gsoc/webapptest/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/gsoc/webapptest/pom.xml?rev=1001733&r1=1001732&r2=1001733&view=diff
==============================================================================
--- myfaces/gsoc/webapptest/pom.xml (original)
+++ myfaces/gsoc/webapptest/pom.xml Mon Sep 27 13:35:41 2010
@@ -67,7 +67,6 @@
         <junit.version>4.7</junit.version>
         <servlet.version>2.5</servlet.version>
         <tomcat.version>6.0.26</tomcat.version>
-        <htmlunit.version>2.4</htmlunit.version>
     </properties>
 
     <!-- define the versions for some common dependencies -->
@@ -188,18 +187,6 @@
             <type>pom</type>
         </dependency>
 
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>${htmlunit.version}</version>
-        </dependency>
-          
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit-core-js</artifactId>
-            <version>${htmlunit.version}</version>
-        </dependency>
-          
       </dependencies>
     </dependencyManagement>