svn commit: r1876962 - in /jackrabbit/oak/branches/1.8: ./ oak-store-document/ oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/ oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/

[reschke]

Author: reschke
Date: Sat Apr 25 08:11:40 2020
New Revision: 1876962

URL: http://svn.apache.org/viewvc?rev=1876962&view=rev
Log:
OAK-8846: oak-store-document: remove commons-lang test dependency (merged 
r1872575 into 1.8)

Modified:
    jackrabbit/oak/branches/1.8/   (props changed)
    jackrabbit/oak/branches/1.8/oak-store-document/pom.xml
    
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
    
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinterTest.java

Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1872575

Modified: jackrabbit/oak/branches/1.8/oak-store-document/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/pom.xml?rev=1876962&r1=1876961&r2=1876962&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-store-document/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-store-document/pom.xml Sat Apr 25 08:11:40 
2020
@@ -298,11 +298,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <scope>test</scope>

Modified: 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java?rev=1876962&r1=1876961&r2=1876962&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/fixture/DocumentRdbFixture.java
 Sat Apr 25 08:11:40 2020
@@ -23,11 +23,11 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.sql.DataSource;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
 import org.apache.jackrabbit.oak.plugins.document.rdb.RDBDataSourceFactory;
 import 
org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentNodeStoreBuilder;
@@ -78,6 +78,6 @@ public class DocumentRdbFixture extends
 
     @Override
     public String toString() {
-        return "DocumentNodeStore[RDB] on " + 
StringUtils.defaultString(this.jdbcUrl, this.pUrl);
+        return "DocumentNodeStore[RDB] on " + Objects.toString(this.jdbcUrl, 
this.pUrl);
     }
 }

Modified: 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinterTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinterTest.java?rev=1876962&r1=1876961&r2=1876962&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinterTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.8/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreStatsPrinterTest.java
 Sat Apr 25 08:11:40 2020
@@ -27,7 +27,6 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import static java.util.Arrays.asList;
-import static org.apache.commons.lang.StringUtils.split;
 import static org.hamcrest.Matchers.hasItem;
 import static org.junit.Assert.assertThat;
 
@@ -46,7 +45,7 @@ public class DocumentStoreStatsPrinterTe
         PrintWriter pw = new PrintWriter(sw);
         printer.print(pw, Format.TEXT, false);
 
-        List<String> lines = asList(split(sw.toString(),"\r\n"));
+        List<String> lines = asList(sw.toString().split("\\r?\\n"));
         assertThat(lines, hasItem("type=memory"));
         assertThat(lines, hasItem("nodes=1"));
         assertThat(lines, hasItem("clusterNodes=1"));