Эх сурвалжийг харах

Copied RandomAccessFile code into the util package because of compiler
version in maven dependencies.

didfet 9 жил өмнө
parent
commit
b66a7a939d

+ 3 - 1
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,
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.
+
+RandomAccessFile and KMPMatch classes by UCAR/Unidata.

+ 1 - 6
pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>logstash-forwarder-java</groupId>
 	<groupId>logstash-forwarder-java</groupId>
 	<artifactId>logstash-forwarder-java</artifactId>
 	<artifactId>logstash-forwarder-java</artifactId>
-	<version>0.2.4-SNAPSHOT</version>
+	<version>0.2.4-BUFFEREDRANDOMACCESSFILE</version>
 	<name>logstash-forwarder-java</name>
 	<name>logstash-forwarder-java</name>
 	<description>Java version of logstash forwarder</description>
 	<description>Java version of logstash forwarder</description>
 	<url>https://github.com/didfet/logstash-forwarder-java</url>
 	<url>https://github.com/didfet/logstash-forwarder-java</url>
@@ -165,11 +165,6 @@
 			<artifactId>commons-cli</artifactId>
 			<artifactId>commons-cli</artifactId>
 			<version>1.2</version>
 			<version>1.2</version>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>edu.ucar</groupId>
-			<artifactId>unidataCommon</artifactId>
-			<version>4.2.20</version>
-		</dependency>
 	</dependencies>
 	</dependencies>
 
 
 </project>
 </project>

+ 1 - 1
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.AdapterException;
+import info.fetter.logstashforwarder.util.RandomAccessFile;
 
 
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
@@ -29,7 +30,6 @@ import java.util.Map;
 
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 
 
-import ucar.unidata.io.RandomAccessFile;
 
 
 public class FileReader extends Reader {
 public class FileReader extends Reader {
 	private static Logger logger = Logger.getLogger(FileReader.class);
 	private static Logger logger = Logger.getLogger(FileReader.class);

+ 2 - 1
src/main/java/info/fetter/logstashforwarder/FileSigner.java

@@ -1,10 +1,11 @@
 package info.fetter.logstashforwarder;
 package info.fetter.logstashforwarder;
 
 
+import info.fetter.logstashforwarder.util.RandomAccessFile;
+
 import java.io.IOException;
 import java.io.IOException;
 //import java.io.RandomAccessFile;
 //import java.io.RandomAccessFile;
 import java.util.zip.Adler32;
 import java.util.zip.Adler32;
 
 
-import ucar.unidata.io.RandomAccessFile;
 
 
 public class FileSigner {
 public class FileSigner {
 	private static final Adler32 adler32 = new Adler32();
 	private static final Adler32 adler32 = new Adler32();

+ 3 - 2
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.File;
 import java.io.FileNotFoundException;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.IOException;
 //import java.io.RandomAccessFile;
 //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;
 import com.fasterxml.jackson.annotation.JsonIgnore;