From b66a7a939d5cd20dc9037a1b646a5b9958b029c3 Mon Sep 17 00:00:00 2001 From: didfet Date: Sat, 6 Aug 2016 20:22:50 +0200 Subject: [PATCH] Copied RandomAccessFile code into the util package because of compiler version in maven dependencies. --- LICENSE.md | 4 +++- pom.xml | 7 +------ .../java/info/fetter/logstashforwarder/FileReader.java | 2 +- .../java/info/fetter/logstashforwarder/FileSigner.java | 3 ++- src/main/java/info/fetter/logstashforwarder/FileState.java | 5 +++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 284d4f4..dd9d5a8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -10,4 +10,6 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. + +RandomAccessFile and KMPMatch classes by UCAR/Unidata. \ No newline at end of file diff --git a/pom.xml b/pom.xml index ad389ad..09b4866 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 logstash-forwarder-java logstash-forwarder-java - 0.2.4-SNAPSHOT + 0.2.4-BUFFEREDRANDOMACCESSFILE logstash-forwarder-java Java version of logstash forwarder https://github.com/didfet/logstash-forwarder-java @@ -165,11 +165,6 @@ commons-cli 1.2 - - edu.ucar - unidataCommon - 4.2.20 - \ No newline at end of file diff --git a/src/main/java/info/fetter/logstashforwarder/FileReader.java b/src/main/java/info/fetter/logstashforwarder/FileReader.java index 460dc19..d66c022 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileReader.java +++ b/src/main/java/info/fetter/logstashforwarder/FileReader.java @@ -18,6 +18,7 @@ package info.fetter.logstashforwarder; */ import info.fetter.logstashforwarder.util.AdapterException; +import info.fetter.logstashforwarder.util.RandomAccessFile; import java.io.File; import java.io.IOException; @@ -29,7 +30,6 @@ import java.util.Map; import org.apache.log4j.Logger; -import ucar.unidata.io.RandomAccessFile; public class FileReader extends Reader { private static Logger logger = Logger.getLogger(FileReader.class); diff --git a/src/main/java/info/fetter/logstashforwarder/FileSigner.java b/src/main/java/info/fetter/logstashforwarder/FileSigner.java index f02c7e2..8480f80 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileSigner.java +++ b/src/main/java/info/fetter/logstashforwarder/FileSigner.java @@ -1,10 +1,11 @@ package info.fetter.logstashforwarder; +import info.fetter.logstashforwarder.util.RandomAccessFile; + import java.io.IOException; //import java.io.RandomAccessFile; import java.util.zip.Adler32; -import ucar.unidata.io.RandomAccessFile; public class FileSigner { private static final Adler32 adler32 = new Adler32(); diff --git a/src/main/java/info/fetter/logstashforwarder/FileState.java b/src/main/java/info/fetter/logstashforwarder/FileState.java index 35fa6b9..eefb5e3 100644 --- a/src/main/java/info/fetter/logstashforwarder/FileState.java +++ b/src/main/java/info/fetter/logstashforwarder/FileState.java @@ -17,15 +17,16 @@ package info.fetter.logstashforwarder; * */ +import info.fetter.logstashforwarder.util.RandomAccessFile; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; //import java.io.RandomAccessFile; -import org.apache.commons.lang.builder.ToStringBuilder; -import ucar.unidata.io.RandomAccessFile; +import org.apache.commons.lang.builder.ToStringBuilder; import com.fasterxml.jackson.annotation.JsonIgnore;