You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2016/10/12 08:27:12 UTC
svn commit: r1764402 - in /jackrabbit/oak/trunk: oak-auth-external/
oak-blob/ oak-commons/ oak-core/ oak-examples/standalone/
oak-examples/webapp/ oak-parent/ oak-pojosr/ oak-run/ oak-segment-tar/
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak...
Author: mduerig
Date: Wed Oct 12 08:27:12 2016
New Revision: 1764402
URL: http://svn.apache.org/viewvc?rev=1764402&view=rev
Log:
OAK-4467: Upgrade io-commons to 2.5 and remove ReversedLinesFileReader
bump io-commons version and replace refetence to copied ReversedLinesFileReader
Removed:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReader.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/pom.xml
jackrabbit/oak/trunk/oak-blob/pom.xml
jackrabbit/oak/trunk/oak-commons/pom.xml
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-pojosr/pom.xml
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/JournalReader.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java
jackrabbit/oak/trunk/oak-segment/pom.xml
Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Wed Oct 12 08:27:12 2016
@@ -167,7 +167,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-blob/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob/pom.xml Wed Oct 12 08:27:12 2016
@@ -93,7 +93,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<!-- Optional dependency for jclouds s3 to enable s3 cloud store -->
Modified: jackrabbit/oak/trunk/oak-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-commons/pom.xml Wed Oct 12 08:27:12 2016
@@ -74,7 +74,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Oct 12 08:27:12 2016
@@ -197,7 +197,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>io.dropwizard.metrics</groupId>
Modified: jackrabbit/oak/trunk/oak-examples/standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/standalone/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/standalone/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/standalone/pom.xml Wed Oct 12 08:27:12 2016
@@ -116,7 +116,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
Modified: jackrabbit/oak/trunk/oak-examples/webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-examples/webapp/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-examples/webapp/pom.xml Wed Oct 12 08:27:12 2016
@@ -50,7 +50,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Oct 12 08:27:12 2016
@@ -567,6 +567,11 @@
<version>2.6</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
<version>3.6.1</version>
Modified: jackrabbit/oak/trunk/oak-pojosr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-pojosr/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-pojosr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-pojosr/pom.xml Wed Oct 12 08:27:12 2016
@@ -110,7 +110,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<!-- Required to route OSGi LogEvents to Slf4j-->
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Wed Oct 12 08:27:12 2016
@@ -343,7 +343,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Wed Oct 12 08:27:12 2016
@@ -225,7 +225,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/JournalReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/JournalReader.java?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/JournalReader.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/JournalReader.java Wed Oct 12 08:27:12 2016
@@ -19,11 +19,14 @@
package org.apache.jackrabbit.oak.segment.file;
+import static java.nio.charset.Charset.defaultCharset;
+
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
import com.google.common.collect.AbstractIterator;
+import org.apache.commons.io.input.ReversedLinesFileReader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +40,7 @@ public final class JournalReader extends
private final ReversedLinesFileReader journal;
public JournalReader(File journalFile) throws IOException {
- journal = new ReversedLinesFileReader(journalFile);
+ journal = new ReversedLinesFileReader(journalFile, defaultCharset());
}
/**
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamBlockSize.java Wed Oct 12 08:27:12 2016
@@ -27,6 +27,7 @@ import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.Collection;
+import org.apache.commons.io.input.ReversedLinesFileReader;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/ReversedLinesFileReaderTestParamFile.java Wed Oct 12 08:27:12 2016
@@ -36,6 +36,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Stack;
+import org.apache.commons.io.input.ReversedLinesFileReader;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-segment/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/pom.xml?rev=1764402&r1=1764401&r2=1764402&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment/pom.xml Wed Oct 12 08:27:12 2016
@@ -120,7 +120,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>