Textual cleanups, updated slf4j dependency

nielsbasjes · Dec 13, 2019 · 2d613cf · 2d613cf
1 parent d808e2a
commit 2d613cf
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -24,7 +24,7 @@ trim_trailing_whitespace = true
 indent_style = space
 
 [*.java]
-indent_size = 4
+indent_size = 2
 
 [*.yaml]
 indent_size = 2

diff --git a/codec/pom.xml b/codec/pom.xml
@@ -17,7 +17,7 @@
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <hadoop.version>2.3.0</hadoop.version>
   </properties>
-  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.12</version>
+      <version>1.7.29</version>
     </dependency>
 
   </dependencies>
@@ -96,7 +96,7 @@
         </plugins>
       </build>
     </profile>
-    
+
     <profile>
       <id>rpm</id>
       <build>

diff --git a/codec/src/main/java/nl/basjes/hadoop/io/compress/SplittableGzipCodec.java b/codec/src/main/java/nl/basjes/hadoop/io/compress/SplittableGzipCodec.java
@@ -1,6 +1,6 @@
-/**
+/*
  * Making GZip Splittable for Apache Hadoop
- * Copyright (C) 2011-2014 Niels Basjes
+ * Copyright (C) 2011-2019 Niels Basjes
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package nl.basjes.hadoop.io.compress;
 
 import java.io.EOFException;

diff --git a/codec/src/main/java/nl/basjes/hadoop/io/compress/ThrottleableDecompressorStream.java b/codec/src/main/java/nl/basjes/hadoop/io/compress/ThrottleableDecompressorStream.java
@@ -1,6 +1,6 @@
-/**
+/*
  * Making GZip Splittable for Apache Hadoop
- * Copyright (C) 2011-2014 Niels Basjes
+ * Copyright (C) 2011-2019 Niels Basjes
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/codec/src/main/resources/mapred-site.xml.example b/codec/src/main/resources/mapred-site.xml.example
@@ -7,9 +7,8 @@
   <property>
     <name>io.compression.codecs</name>
     <value>org.apache.hadoop.io.compress.DefaultCodec,nl.basjes.hadoop.io.compress.SplittableGzipCodec,org.apache.hadoop.io.compress.BZip2Codec,org.apache.hadoop.io.compress.DeflateCodec,org.apache.hadoop.io.compress.SnappyCodec,org.apache.hadoop.io.compress.Lz4Codec</value>
-    <description>A list of the compression codec classes that can be used 
-               for compression/decompression.</description>
-</property>
+    <description>A list of the compression codec classes that can be used for compression/decompression.</description>
+  </property>
 
   <!-- How big must the split be? -->
   <property>

diff --git a/codec/src/test/java/nl/basjes/hadoop/io/compress/TestSplittableCodecSeams.java b/codec/src/test/java/nl/basjes/hadoop/io/compress/TestSplittableCodecSeams.java
@@ -1,6 +1,6 @@
 /**
  * Making GZip Splittable for Apache Hadoop
- * Copyright (C) 2011-2014 Niels Basjes
+ * Copyright (C) 2011-2019 Niels Basjes
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -381,7 +381,7 @@ private static Path writeSplitTestFile(final Configuration conf,
       final int trailingSizeJitter,
       final int randomizeEveryNChars) throws IOException {
 
-    RAND.setSeed(1); // Make the tests better reproducable
+    RAND.setSeed(1); // Make the tests better reproducible
 
     final FileSystem fs = FileSystem.getLocal(conf);
     final SplittableCompressionCodec codec = ReflectionUtils.newInstance(