jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1843410 - in /jackrabbit/branches/2.16: ./ jackrabbit-webapp/pom.xml jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Date Wed, 10 Oct 2018 08:43:45 GMT
Author: reschke
Date: Wed Oct 10 08:43:45 2018
New Revision: 1843410

URL: http://svn.apache.org/viewvc?rev=1843410&view=rev
Log:
JCR-4367: Update htmlunit test dependency to 2.32 (ported to 2.16)

Modified:
    jackrabbit/branches/2.16/   (props changed)
    jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml
    jackrabbit/branches/2.16/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java

Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 10 08:43:45 2018
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1820753,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836341,1836349,1836620,1836722,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910,1839924,1839931,1839937,1839945,1839964,1839966,1840027,1841459,1841858,1841865,1841917,1841924
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1820753,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836341,1836349,1836620,1836722,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910,1839924,1839931,1839937,1839945,1839964,1839966,1840007,1840027,1841459,1841858,1841865,1841917,1841924

Modified: jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml?rev=1843410&r1=1843409&r2=1843410&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-webapp/pom.xml Wed Oct 10 08:43:45 2018
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>net.sourceforge.htmlunit</groupId>
       <artifactId>htmlunit</artifactId>
-      <version>2.8</version>
+      <version>2.32</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -139,12 +139,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-mime4j</artifactId>
-      <version>0.6</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
       <version>4.4.10</version>

Modified: jackrabbit/branches/2.16/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java?rev=1843410&r1=1843409&r2=1843410&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
(original)
+++ jackrabbit/branches/2.16/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Wed Oct 10 08:43:45 2018
@@ -129,7 +129,7 @@ public class TomcatIT extends TestCase {
     }
 
     protected void tearDown() throws Exception {
-        client.closeAllWindows();
+        client.close();
 
         tomcat.stop();
     }



Mime
View raw message