This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git


The following commit(s) were added to refs/heads/main by this push:
     new 230971d89 ORC-2076: Use `license-check` to check `java` directory
230971d89 is described below

commit 230971d896fcbf1982348198f7609c9300c9d412
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Fri Feb 6 07:47:34 2026 -0800

    ORC-2076: Use `license-check` to check `java` directory
    
    ### What changes were proposed in this pull request?
    
    This PR aims to use `license-check` GitHub Action job to check `java` 
directory.
    
    ### Why are the changes needed?
    
    Previously, Java directory was ignored.
    - https://github.com/apache/orc/pull/1442
    
    ### How was this patch tested?
    
    Pass the CIs.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    Generated-by: `Opus 4.5` on `Claude Code`
    
    Closes #2512 from dongjoon-hyun/ORC-2076.
    
    Authored-by: Dongjoon Hyun <[email protected]>
    Signed-off-by: Dongjoon Hyun <[email protected]>
---
 .github/.licenserc.yaml                            |  6 ++++-
 java/bench/core/pom.xml                            | 27 +++++++++++--------
 java/bench/core/src/assembly/uber.xml              | 27 +++++++++++--------
 .../apache/hadoop/fs/TrackingLocalFileSystem.java  |  1 +
 .../src/java/org/apache/orc/bench/core/Driver.java |  6 ++---
 .../java/org/apache/orc/bench/core/IOCounters.java |  6 ++---
 .../org/apache/orc/bench/core/RecordCounters.java  |  6 ++---
 .../apache/orc/bench/core/convert/BatchReader.java |  6 ++---
 .../apache/orc/bench/core/convert/BatchWriter.java |  6 ++---
 .../orc/bench/core/convert/GenerateVariants.java   |  6 ++---
 .../orc/bench/core/convert/ScanVariants.java       |  6 ++---
 .../bench/core/convert/avro/AvroSchemaUtils.java   |  3 ++-
 .../orc/bench/core/convert/csv/CsvReader.java      |  1 +
 .../orc/bench/core/convert/json/JsonReader.java    |  1 +
 java/bench/hive/pom.xml                            | 27 +++++++++++--------
 java/bench/hive/src/assembly/uber.xml              | 27 +++++++++++--------
 .../hive/ql/io/orc/OrcBenchmarkUtilities.java      |  1 +
 .../bench/hive/RowFilterProjectionBenchmark.java   |  1 +
 .../hive/rowfilter/BooleanRowFilterBenchmark.java  |  1 +
 .../hive/rowfilter/DecimalRowFilterBenchmark.java  |  1 +
 .../hive/rowfilter/DoubleRowFilterBenchmark.java   |  1 +
 .../bench/hive/rowfilter/RowFilterInputState.java  |  1 +
 .../hive/rowfilter/StringRowFilterBenchmark.java   |  1 +
 .../rowfilter/TimestampRowFilterBenchmark.java     |  1 +
 java/bench/pom.xml                                 | 27 +++++++++++--------
 java/bench/spark/pom.xml                           | 27 +++++++++++--------
 java/checkstyle.xml                                | 27 +++++++++++--------
 java/core/pom.xml                                  | 27 +++++++++++--------
 .../org/apache/orc/BinaryColumnStatistics.java     |  1 +
 .../org/apache/orc/BooleanColumnStatistics.java    |  1 +
 .../org/apache/orc/CollectionColumnStatistics.java |  1 +
 .../src/java/org/apache/orc/ColumnStatistics.java  |  1 +
 .../src/java/org/apache/orc/CompressionCodec.java  |  1 +
 java/core/src/java/org/apache/orc/DataMask.java    |  1 +
 .../java/org/apache/orc/DateColumnStatistics.java  |  1 +
 .../org/apache/orc/DecimalColumnStatistics.java    |  1 +
 .../org/apache/orc/DoubleColumnStatistics.java     |  1 +
 .../java/org/apache/orc/FileFormatException.java   |  7 ++---
 .../src/java/org/apache/orc/InMemoryKeystore.java  |  7 ++---
 .../org/apache/orc/IntegerColumnStatistics.java    |  1 +
 java/core/src/java/org/apache/orc/OrcUtils.java    |  1 +
 .../core/src/java/org/apache/orc/RecordReader.java |  1 +
 .../org/apache/orc/StringColumnStatistics.java     |  1 +
 .../src/java/org/apache/orc/StripeInformation.java |  1 +
 .../src/java/org/apache/orc/impl/AcidStats.java    |  6 ++---
 .../java/org/apache/orc/impl/BitFieldReader.java   |  1 +
 .../java/org/apache/orc/impl/BitFieldWriter.java   |  1 +
 .../java/org/apache/orc/impl/BufferChunkList.java  |  6 ++---
 .../org/apache/orc/impl/ColumnStatisticsImpl.java  |  1 +
 .../apache/orc/impl/ConvertTreeReaderFactory.java  |  1 +
 .../src/java/org/apache/orc/impl/CryptoUtils.java  |  6 ++---
 .../org/apache/orc/impl/DataReaderProperties.java  |  1 +
 .../src/java/org/apache/orc/impl/DateUtils.java    |  1 +
 .../java/org/apache/orc/impl/DictionaryUtils.java  |  1 +
 .../apache/orc/impl/DirectDecompressionCodec.java  |  1 +
 .../java/org/apache/orc/impl/DynamicByteArray.java |  1 +
 .../java/org/apache/orc/impl/DynamicIntArray.java  |  1 +
 .../src/java/org/apache/orc/impl/InStream.java     |  1 +
 .../src/java/org/apache/orc/impl/OrcAcidUtils.java |  6 ++---
 .../src/java/org/apache/orc/impl/OrcCodecPool.java |  1 +
 .../core/src/java/org/apache/orc/impl/OrcTail.java |  4 ++-
 .../src/java/org/apache/orc/impl/OutStream.java    |  1 +
 .../java/org/apache/orc/impl/PositionRecorder.java |  1 +
 .../apache/orc/impl/PositionedOutputStream.java    |  1 +
 .../java/org/apache/orc/impl/RecordReaderImpl.java |  1 +
 .../org/apache/orc/impl/RecordReaderUtils.java     |  1 +
 .../org/apache/orc/impl/RunLengthByteReader.java   |  1 +
 .../org/apache/orc/impl/RunLengthByteWriter.java   |  1 +
 .../apache/orc/impl/RunLengthIntegerReader.java    |  1 +
 .../apache/orc/impl/RunLengthIntegerReaderV2.java  |  1 +
 .../apache/orc/impl/RunLengthIntegerWriter.java    |  1 +
 .../apache/orc/impl/RunLengthIntegerWriterV2.java  |  1 +
 .../org/apache/orc/impl/StringRedBlackTree.java    |  1 +
 .../org/apache/orc/impl/TreeReaderFactory.java     |  1 +
 .../src/java/org/apache/orc/impl/ZlibCodec.java    |  1 +
 .../src/java/org/apache/orc/impl/ZstdCodec.java    |  1 +
 .../org/apache/orc/impl/mask/ListIdentity.java     |  1 +
 .../java/org/apache/orc/impl/mask/MapIdentity.java |  1 +
 .../java/org/apache/orc/impl/mask/MaskFactory.java |  1 +
 .../org/apache/orc/impl/mask/MaskProvider.java     |  1 +
 .../java/org/apache/orc/impl/mask/NullifyMask.java |  1 +
 .../apache/orc/impl/mask/RedactMaskFactory.java    |  1 +
 .../apache/orc/impl/mask/SHA256MaskFactory.java    |  1 +
 .../org/apache/orc/impl/mask/StructIdentity.java   |  1 +
 .../org/apache/orc/impl/mask/UnionIdentity.java    |  1 +
 .../apache/orc/impl/reader/ReaderEncryption.java   |  6 ++---
 .../orc/impl/reader/ReaderEncryptionKey.java       |  6 ++---
 .../orc/impl/reader/ReaderEncryptionVariant.java   |  6 ++---
 .../org/apache/orc/impl/reader/StripePlanner.java  |  6 ++---
 .../apache/orc/impl/reader/tree/BatchReader.java   |  1 +
 .../orc/impl/reader/tree/PrimitiveBatchReader.java |  1 +
 .../org/apache/orc/impl/writer/MapTreeWriter.java  |  1 +
 .../org/apache/orc/impl/writer/StreamOptions.java  |  1 +
 .../threeten/extra/chrono/HybridChronology.java    |  1 +
 .../java/org/threeten/extra/chrono/HybridDate.java |  1 +
 .../org/apache/orc/StringDictTestingUtils.java     |  1 +
 java/core/src/test/org/apache/orc/TestConf.java    |  1 +
 .../src/test/org/apache/orc/TestCorruptTypes.java  |  1 +
 .../test/org/apache/orc/TestInMemoryKeystore.java  |  7 ++---
 .../org/apache/orc/TestNewIntegerEncoding.java     |  1 +
 java/core/src/test/org/apache/orc/TestOrcConf.java |  1 +
 .../test/org/apache/orc/TestOrcDSTNoTimezone.java  |  1 +
 .../src/test/org/apache/orc/TestOrcNoTimezone.java |  1 +
 .../org/apache/orc/TestOrcNullOptimization.java    |  1 +
 .../test/org/apache/orc/TestOrcTimestampPPD.java   |  1 +
 .../src/test/org/apache/orc/TestOrcTimezone1.java  |  1 +
 .../src/test/org/apache/orc/TestOrcTimezone2.java  |  1 +
 .../src/test/org/apache/orc/TestOrcTimezone3.java  |  1 +
 .../src/test/org/apache/orc/TestOrcTimezone4.java  |  1 +
 .../test/org/apache/orc/TestOrcTimezonePPD.java    |  5 +++-
 .../orc/TestOrcWithLargeStripeStatistics.java      | 16 ++++++-----
 .../org/apache/orc/TestProlepticConversions.java   |  1 +
 java/core/src/test/org/apache/orc/TestReader.java  |  1 +
 .../apache/orc/TestRowFilteringComplexTypes.java   |  1 +
 .../org/apache/orc/TestRowFilteringNoSkip.java     |  1 +
 .../test/org/apache/orc/TestRowFilteringSkip.java  |  1 +
 .../test/org/apache/orc/TestStringDictionary.java  |  1 +
 .../test/org/apache/orc/TestTypeDescription.java   |  1 +
 java/core/src/test/org/apache/orc/TestUnicode.java |  1 +
 .../org/apache/orc/impl/TestBitFieldReader.java    |  1 +
 .../src/test/org/apache/orc/impl/TestBitPack.java  |  1 +
 .../orc/impl/TestConvertTreeReaderFactory.java     |  1 +
 .../apache/orc/impl/TestDataReaderProperties.java  |  1 +
 .../test/org/apache/orc/impl/TestDynamicArray.java |  1 +
 .../test/org/apache/orc/impl/TestEncryption.java   |  1 +
 .../orc/impl/TestIntegerCompressionReader.java     |  1 +
 .../org/apache/orc/impl/TestMemoryManager.java     |  1 +
 .../org/apache/orc/impl/TestOrcLargeStripe.java    | 15 ++++++-----
 .../orc/impl/TestPredicatePushDownBounds.java      |  1 +
 .../test/org/apache/orc/impl/TestReaderImpl.java   | 15 ++++++-----
 .../apache/orc/impl/TestRunLengthByteReader.java   |  1 +
 .../orc/impl/TestRunLengthIntegerReader.java       |  1 +
 .../org/apache/orc/impl/TestSchemaEvolution.java   |  1 +
 .../apache/orc/impl/TestSerializationUtils.java    |  1 +
 .../org/apache/orc/impl/mask/TestDataMask.java     |  1 +
 .../org/apache/orc/impl/mask/TestRedactMask.java   |  1 +
 .../org/apache/orc/impl/mask/TestSHA256Mask.java   | 28 ++++++++++---------
 .../org/apache/orc/impl/mask/TestUnmaskRange.java  | 31 +++++++++++-----------
 java/examples/pom.xml                              | 27 +++++++++++--------
 java/examples/src/assembly/uber.xml                | 27 +++++++++++--------
 .../org/apache/orc/examples/AdvancedReader.java    |  1 +
 .../org/apache/orc/examples/CompressionWriter.java |  6 ++---
 .../src/java/org/apache/orc/examples/Driver.java   |  6 ++---
 .../orc/examples/InMemoryEncryptionReader.java     |  6 ++---
 .../orc/examples/InMemoryEncryptionWriter.java     |  6 ++---
 java/mapreduce/pom.xml                             | 27 +++++++++++--------
 .../src/java/org/apache/orc/mapred/OrcKey.java     |  1 +
 .../src/java/org/apache/orc/mapred/OrcList.java    |  1 +
 .../src/java/org/apache/orc/mapred/OrcMap.java     |  1 +
 .../apache/orc/mapred/OrcMapredRecordReader.java   |  1 +
 .../src/java/org/apache/orc/mapred/OrcStruct.java  |  1 +
 .../java/org/apache/orc/mapred/OrcTimestamp.java   |  1 +
 .../src/java/org/apache/orc/mapred/OrcUnion.java   |  1 +
 .../src/java/org/apache/orc/mapred/OrcValue.java   |  1 +
 .../orc/mapreduce/OrcMapreduceRecordReader.java    |  1 +
 .../apache/orc/mapred/TestOrcFileEvolution.java    |  6 ++---
 java/pom.xml                                       | 27 +++++++++++--------
 java/shims/pom.xml                                 | 27 +++++++++++--------
 .../java/org/apache/orc/impl/ZeroCopyShims.java    |  1 +
 java/tools/pom.xml                                 | 27 +++++++++++--------
 java/tools/src/assembly/uber.xml                   | 19 +++++++++++++
 .../src/java/org/apache/orc/tools/CheckTool.java   |  6 ++---
 .../src/java/org/apache/orc/tools/Driver.java      |  6 ++---
 .../src/java/org/apache/orc/tools/FileDump.java    |  7 ++---
 .../java/org/apache/orc/tools/JsonFileDump.java    |  7 ++---
 .../src/java/org/apache/orc/tools/KeyTool.java     |  7 ++---
 .../src/java/org/apache/orc/tools/MergeFiles.java  |  6 ++---
 .../src/java/org/apache/orc/tools/PrintData.java   |  7 ++---
 .../java/org/apache/orc/tools/PrintVersion.java    |  7 ++---
 .../src/java/org/apache/orc/tools/ScanData.java    |  7 ++---
 .../org/apache/orc/tools/convert/ConvertTool.java  |  1 +
 .../org/apache/orc/tools/convert/CsvReader.java    |  1 +
 .../org/apache/orc/tools/convert/JsonReader.java   |  1 +
 .../apache/orc/tools/json/JsonSchemaFinder.java    |  1 +
 .../org/apache/orc/tools/json/JsonShredder.java    |  1 +
 .../org/apache/orc/impl/TestHadoopKeyProvider.java |  1 +
 .../src/test/org/apache/orc/impl/TestRLEv2.java    |  1 +
 .../test/org/apache/orc/tools/TestCheckTool.java   |  6 ++---
 178 files changed, 544 insertions(+), 304 deletions(-)

diff --git a/.github/.licenserc.yaml b/.github/.licenserc.yaml
index a16671e9d..73163e203 100644
--- a/.github/.licenserc.yaml
+++ b/.github/.licenserc.yaml
@@ -11,10 +11,10 @@ header:
     - '**/.gitignore'
     - '**/Doxyfile'
     - '.github/**'
+    - 'java/.mvn/jvm.config'
     - 'dev/**'
     - 'docker/**'
     - 'examples/**'
-    - 'java/**'
     - 'site/**'
     - 'c++/libs/**'
     - 'c++/test/test-orc.suppress'
@@ -23,5 +23,9 @@ header:
     - '.clang-format'
     - '.asf.yaml'
     - '.nojekyll'
+    - '**/*.json'
+    - '**/*.orc'
+    - '**/*.out'
+    - '**/*.schema'
 
   comment: on-failure
diff --git a/java/bench/core/pom.xml b/java/bench/core/pom.xml
index 75baa7b69..3917bd92c 100644
--- a/java/bench/core/pom.xml
+++ b/java/bench/core/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/bench/core/src/assembly/uber.xml 
b/java/bench/core/src/assembly/uber.xml
index 014eab951..3e6561b50 100644
--- a/java/bench/core/src/assembly/uber.xml
+++ b/java/bench/core/src/assembly/uber.xml
@@ -1,15 +1,20 @@
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <assembly>
   <id>uber</id>
diff --git 
a/java/bench/core/src/java/org/apache/hadoop/fs/TrackingLocalFileSystem.java 
b/java/bench/core/src/java/org/apache/hadoop/fs/TrackingLocalFileSystem.java
index fbaec05d7..b002ae3d8 100644
--- a/java/bench/core/src/java/org/apache/hadoop/fs/TrackingLocalFileSystem.java
+++ b/java/bench/core/src/java/org/apache/hadoop/fs/TrackingLocalFileSystem.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.hadoop.fs;
 
 import java.io.FileNotFoundException;
diff --git a/java/bench/core/src/java/org/apache/orc/bench/core/Driver.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/Driver.java
index db86e291b..8a14d6136 100644
--- a/java/bench/core/src/java/org/apache/orc/bench/core/Driver.java
+++ b/java/bench/core/src/java/org/apache/orc/bench/core/Driver.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/bench/core/src/java/org/apache/orc/bench/core/IOCounters.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/IOCounters.java
index d1f6b9db8..51262e1fd 100644
--- a/java/bench/core/src/java/org/apache/orc/bench/core/IOCounters.java
+++ b/java/bench/core/src/java/org/apache/orc/bench/core/IOCounters.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/RecordCounters.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/RecordCounters.java
index 874f267f5..10b02de0d 100644
--- a/java/bench/core/src/java/org/apache/orc/bench/core/RecordCounters.java
+++ b/java/bench/core/src/java/org/apache/orc/bench/core/RecordCounters.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchReader.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchReader.java
index 72d561948..e45b882f3 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchReader.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchReader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchWriter.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchWriter.java
index 9836690c8..fceb39002 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchWriter.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/BatchWriter.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/GenerateVariants.java
 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/GenerateVariants.java
index 0f1e1965c..cd042ee4b 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/GenerateVariants.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/GenerateVariants.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/ScanVariants.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/ScanVariants.java
index 1d094a50c..5bfaab808 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/ScanVariants.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/ScanVariants.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/avro/AvroSchemaUtils.java
 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/avro/AvroSchemaUtils.java
index 65753553a..3c86bb3f0 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/avro/AvroSchemaUtils.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/avro/AvroSchemaUtils.java
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.core.convert.avro;
 
 import org.apache.avro.Schema;
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/csv/CsvReader.java 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/csv/CsvReader.java
index cea94d875..2a946bc71 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/csv/CsvReader.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/csv/CsvReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.core.convert.csv;
 
 import org.apache.commons.csv.CSVFormat;
diff --git 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/json/JsonReader.java
 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/json/JsonReader.java
index ece88f08b..dac46f1ed 100644
--- 
a/java/bench/core/src/java/org/apache/orc/bench/core/convert/json/JsonReader.java
+++ 
b/java/bench/core/src/java/org/apache/orc/bench/core/convert/json/JsonReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.core.convert.json;
 
 import com.google.gson.JsonArray;
diff --git a/java/bench/hive/pom.xml b/java/bench/hive/pom.xml
index 1ede9d05d..fc1c04b25 100644
--- a/java/bench/hive/pom.xml
+++ b/java/bench/hive/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/bench/hive/src/assembly/uber.xml 
b/java/bench/hive/src/assembly/uber.xml
index 7bd202ddf..ce2756118 100644
--- a/java/bench/hive/src/assembly/uber.xml
+++ b/java/bench/hive/src/assembly/uber.xml
@@ -1,15 +1,20 @@
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <assembly>
   <id>uber</id>
diff --git 
a/java/bench/hive/src/java/org/apache/hadoop/hive/ql/io/orc/OrcBenchmarkUtilities.java
 
b/java/bench/hive/src/java/org/apache/hadoop/hive/ql/io/orc/OrcBenchmarkUtilities.java
index f75c7f050..6fba4653d 100644
--- 
a/java/bench/hive/src/java/org/apache/hadoop/hive/ql/io/orc/OrcBenchmarkUtilities.java
+++ 
b/java/bench/hive/src/java/org/apache/hadoop/hive/ql/io/orc/OrcBenchmarkUtilities.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.hadoop.hive.ql.io.orc;
 
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/RowFilterProjectionBenchmark.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/RowFilterProjectionBenchmark.java
index a523caf7e..4c8a28cce 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/RowFilterProjectionBenchmark.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/RowFilterProjectionBenchmark.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive;
 
 import com.google.auto.service.AutoService;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
index 81c8664f6..fe3ceea10 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/BooleanRowFilterBenchmark.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive.rowfilter;
 
 import org.apache.orc.RecordReader;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
index b03794bbe..5c8252b19 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DecimalRowFilterBenchmark.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive.rowfilter;
 
 import org.apache.orc.RecordReader;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
index 02529bdb2..66f7af063 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/DoubleRowFilterBenchmark.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive.rowfilter;
 
 import org.apache.orc.RecordReader;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/RowFilterInputState.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/RowFilterInputState.java
index e63e36926..8163df5b1 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/RowFilterInputState.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/RowFilterInputState.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive.rowfilter;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
index 783f9ffbe..255e64144 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/StringRowFilterBenchmark.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive.rowfilter;
 
 import org.apache.orc.RecordReader;
diff --git 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
index a983b5f3a..97e71cbf8 100644
--- 
a/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
+++ 
b/java/bench/hive/src/java/org/apache/orc/bench/hive/rowfilter/TimestampRowFilterBenchmark.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.bench.hive.rowfilter;
 
 import org.apache.hadoop.fs.Path;
diff --git a/java/bench/pom.xml b/java/bench/pom.xml
index 5fb41e45b..c300c5ad6 100644
--- a/java/bench/pom.xml
+++ b/java/bench/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/bench/spark/pom.xml b/java/bench/spark/pom.xml
index 7849ae550..8cc74e633 100644
--- a/java/bench/spark/pom.xml
+++ b/java/bench/spark/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/checkstyle.xml b/java/checkstyle.xml
index f293a31a3..342de490b 100644
--- a/java/checkstyle.xml
+++ b/java/checkstyle.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" ?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.2//EN" 
"https://checkstyle.org/dtds/configuration_1_2.dtd";>
 
diff --git a/java/core/pom.xml b/java/core/pom.xml
index 5095c1be1..99364d09a 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/core/src/java/org/apache/orc/BinaryColumnStatistics.java 
b/java/core/src/java/org/apache/orc/BinaryColumnStatistics.java
index 77453b9c2..5de996488 100644
--- a/java/core/src/java/org/apache/orc/BinaryColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/BinaryColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/BooleanColumnStatistics.java 
b/java/core/src/java/org/apache/orc/BooleanColumnStatistics.java
index ec51db2ba..82aa9c133 100644
--- a/java/core/src/java/org/apache/orc/BooleanColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/BooleanColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/CollectionColumnStatistics.java 
b/java/core/src/java/org/apache/orc/CollectionColumnStatistics.java
index 7a18026f1..056c8caec 100644
--- a/java/core/src/java/org/apache/orc/CollectionColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/CollectionColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/ColumnStatistics.java 
b/java/core/src/java/org/apache/orc/ColumnStatistics.java
index 69c9a9d5b..8bbee4208 100644
--- a/java/core/src/java/org/apache/orc/ColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/ColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/CompressionCodec.java 
b/java/core/src/java/org/apache/orc/CompressionCodec.java
index 5ba875c2f..f13f3c487 100644
--- a/java/core/src/java/org/apache/orc/CompressionCodec.java
+++ b/java/core/src/java/org/apache/orc/CompressionCodec.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import java.io.Closeable;
diff --git a/java/core/src/java/org/apache/orc/DataMask.java 
b/java/core/src/java/org/apache/orc/DataMask.java
index 57701b4cd..7e1eb800c 100644
--- a/java/core/src/java/org/apache/orc/DataMask.java
+++ b/java/core/src/java/org/apache/orc/DataMask.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/DateColumnStatistics.java 
b/java/core/src/java/org/apache/orc/DateColumnStatistics.java
index f6d22af28..b60af5891 100644
--- a/java/core/src/java/org/apache/orc/DateColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/DateColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import java.time.chrono.ChronoLocalDate;
diff --git a/java/core/src/java/org/apache/orc/DecimalColumnStatistics.java 
b/java/core/src/java/org/apache/orc/DecimalColumnStatistics.java
index 4c65692b8..1d0b57bcf 100644
--- a/java/core/src/java/org/apache/orc/DecimalColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/DecimalColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.hive.common.type.HiveDecimal;
diff --git a/java/core/src/java/org/apache/orc/DoubleColumnStatistics.java 
b/java/core/src/java/org/apache/orc/DoubleColumnStatistics.java
index f68b2a1ba..464c6cd46 100644
--- a/java/core/src/java/org/apache/orc/DoubleColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/DoubleColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/FileFormatException.java 
b/java/core/src/java/org/apache/orc/FileFormatException.java
index 84d94d467..6853a1008 100644
--- a/java/core/src/java/org/apache/orc/FileFormatException.java
+++ b/java/core/src/java/org/apache/orc/FileFormatException.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc;
 
 import java.io.IOException;
diff --git a/java/core/src/java/org/apache/orc/InMemoryKeystore.java 
b/java/core/src/java/org/apache/orc/InMemoryKeystore.java
index 05f83645c..52bf40862 100644
--- a/java/core/src/java/org/apache/orc/InMemoryKeystore.java
+++ b/java/core/src/java/org/apache/orc/InMemoryKeystore.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc;
 
 import org.apache.orc.impl.HadoopShims;
diff --git a/java/core/src/java/org/apache/orc/IntegerColumnStatistics.java 
b/java/core/src/java/org/apache/orc/IntegerColumnStatistics.java
index 034d86b00..35a1ed300 100644
--- a/java/core/src/java/org/apache/orc/IntegerColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/IntegerColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/OrcUtils.java 
b/java/core/src/java/org/apache/orc/OrcUtils.java
index ded04b8ab..3b4b539a4 100644
--- a/java/core/src/java/org/apache/orc/OrcUtils.java
+++ b/java/core/src/java/org/apache/orc/OrcUtils.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.orc.TypeDescription.EdgeInterpolationAlgorithm;
diff --git a/java/core/src/java/org/apache/orc/RecordReader.java 
b/java/core/src/java/org/apache/orc/RecordReader.java
index f80ac8886..e40202f14 100644
--- a/java/core/src/java/org/apache/orc/RecordReader.java
+++ b/java/core/src/java/org/apache/orc/RecordReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
diff --git a/java/core/src/java/org/apache/orc/StringColumnStatistics.java 
b/java/core/src/java/org/apache/orc/StringColumnStatistics.java
index 85c5c97bb..eb15e170d 100644
--- a/java/core/src/java/org/apache/orc/StringColumnStatistics.java
+++ b/java/core/src/java/org/apache/orc/StringColumnStatistics.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/StripeInformation.java 
b/java/core/src/java/org/apache/orc/StripeInformation.java
index 0ae82a384..d02bcf33a 100644
--- a/java/core/src/java/org/apache/orc/StripeInformation.java
+++ b/java/core/src/java/org/apache/orc/StripeInformation.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/impl/AcidStats.java 
b/java/core/src/java/org/apache/orc/impl/AcidStats.java
index eb6245ebd..72b02fc7c 100644
--- a/java/core/src/java/org/apache/orc/impl/AcidStats.java
+++ b/java/core/src/java/org/apache/orc/impl/AcidStats.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/core/src/java/org/apache/orc/impl/BitFieldReader.java 
b/java/core/src/java/org/apache/orc/impl/BitFieldReader.java
index 7cf641495..effdddae5 100644
--- a/java/core/src/java/org/apache/orc/impl/BitFieldReader.java
+++ b/java/core/src/java/org/apache/orc/impl/BitFieldReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/BitFieldWriter.java 
b/java/core/src/java/org/apache/orc/impl/BitFieldWriter.java
index dd3fa08e9..9b67f0117 100644
--- a/java/core/src/java/org/apache/orc/impl/BitFieldWriter.java
+++ b/java/core/src/java/org/apache/orc/impl/BitFieldWriter.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import java.io.IOException;
diff --git a/java/core/src/java/org/apache/orc/impl/BufferChunkList.java 
b/java/core/src/java/org/apache/orc/impl/BufferChunkList.java
index 1a0aea966..1bd4e8abd 100644
--- a/java/core/src/java/org/apache/orc/impl/BufferChunkList.java
+++ b/java/core/src/java/org/apache/orc/impl/BufferChunkList.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/core/src/java/org/apache/orc/impl/ColumnStatisticsImpl.java 
b/java/core/src/java/org/apache/orc/impl/ColumnStatisticsImpl.java
index 46b87bfde..c5537e0c6 100644
--- a/java/core/src/java/org/apache/orc/impl/ColumnStatisticsImpl.java
+++ b/java/core/src/java/org/apache/orc/impl/ColumnStatisticsImpl.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.common.type.HiveDecimal;
diff --git 
a/java/core/src/java/org/apache/orc/impl/ConvertTreeReaderFactory.java 
b/java/core/src/java/org/apache/orc/impl/ConvertTreeReaderFactory.java
index 4861aa61f..90ead13d3 100644
--- a/java/core/src/java/org/apache/orc/impl/ConvertTreeReaderFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/ConvertTreeReaderFactory.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.common.type.HiveDecimal;
diff --git a/java/core/src/java/org/apache/orc/impl/CryptoUtils.java 
b/java/core/src/java/org/apache/orc/impl/CryptoUtils.java
index eb4eaced9..215d0bd92 100644
--- a/java/core/src/java/org/apache/orc/impl/CryptoUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/CryptoUtils.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/core/src/java/org/apache/orc/impl/DataReaderProperties.java 
b/java/core/src/java/org/apache/orc/impl/DataReaderProperties.java
index dfd0d64ab..51f8d05dc 100644
--- a/java/core/src/java/org/apache/orc/impl/DataReaderProperties.java
+++ b/java/core/src/java/org/apache/orc/impl/DataReaderProperties.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FSDataInputStream;
diff --git a/java/core/src/java/org/apache/orc/impl/DateUtils.java 
b/java/core/src/java/org/apache/orc/impl/DateUtils.java
index 184b00d1d..8488901a2 100644
--- a/java/core/src/java/org/apache/orc/impl/DateUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/DateUtils.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.threeten.extra.chrono.HybridChronology;
diff --git a/java/core/src/java/org/apache/orc/impl/DictionaryUtils.java 
b/java/core/src/java/org/apache/orc/impl/DictionaryUtils.java
index 144de02f1..8a3ddcbe0 100644
--- a/java/core/src/java/org/apache/orc/impl/DictionaryUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/DictionaryUtils.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.io.Text;
diff --git 
a/java/core/src/java/org/apache/orc/impl/DirectDecompressionCodec.java 
b/java/core/src/java/org/apache/orc/impl/DirectDecompressionCodec.java
index a285cec9c..b70f7cdb3 100644
--- a/java/core/src/java/org/apache/orc/impl/DirectDecompressionCodec.java
+++ b/java/core/src/java/org/apache/orc/impl/DirectDecompressionCodec.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/java/org/apache/orc/impl/DynamicByteArray.java 
b/java/core/src/java/org/apache/orc/impl/DynamicByteArray.java
index d88cbcd45..b1a503887 100644
--- a/java/core/src/java/org/apache/orc/impl/DynamicByteArray.java
+++ b/java/core/src/java/org/apache/orc/impl/DynamicByteArray.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.io.Text;
diff --git a/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java 
b/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java
index 097cba967..9b47f0e92 100644
--- a/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java
+++ b/java/core/src/java/org/apache/orc/impl/DynamicIntArray.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import java.util.Arrays;
diff --git a/java/core/src/java/org/apache/orc/impl/InStream.java 
b/java/core/src/java/org/apache/orc/impl/InStream.java
index f0d3b1c35..390c574e6 100644
--- a/java/core/src/java/org/apache/orc/impl/InStream.java
+++ b/java/core/src/java/org/apache/orc/impl/InStream.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import com.google.protobuf.CodedInputStream;
diff --git a/java/core/src/java/org/apache/orc/impl/OrcAcidUtils.java 
b/java/core/src/java/org/apache/orc/impl/OrcAcidUtils.java
index 07da1f0cb..f67f785fb 100644
--- a/java/core/src/java/org/apache/orc/impl/OrcAcidUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/OrcAcidUtils.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/core/src/java/org/apache/orc/impl/OrcCodecPool.java 
b/java/core/src/java/org/apache/orc/impl/OrcCodecPool.java
index e9ed3dbb0..e486a3ec9 100644
--- a/java/core/src/java/org/apache/orc/impl/OrcCodecPool.java
+++ b/java/core/src/java/org/apache/orc/impl/OrcCodecPool.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/java/org/apache/orc/impl/OrcTail.java 
b/java/core/src/java/org/apache/orc/impl/OrcTail.java
index be0d8ffd3..37c6a4931 100644
--- a/java/core/src/java/org/apache/orc/impl/OrcTail.java
+++ b/java/core/src/java/org/apache/orc/impl/OrcTail.java
@@ -6,7 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/core/src/java/org/apache/orc/impl/OutStream.java 
b/java/core/src/java/org/apache/orc/impl/OutStream.java
index 9dc9cb688..5724c6479 100644
--- a/java/core/src/java/org/apache/orc/impl/OutStream.java
+++ b/java/core/src/java/org/apache/orc/impl/OutStream.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.io.BytesWritable;
diff --git a/java/core/src/java/org/apache/orc/impl/PositionRecorder.java 
b/java/core/src/java/org/apache/orc/impl/PositionRecorder.java
index ed9864044..8892d3e45 100644
--- a/java/core/src/java/org/apache/orc/impl/PositionRecorder.java
+++ b/java/core/src/java/org/apache/orc/impl/PositionRecorder.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 /**
diff --git a/java/core/src/java/org/apache/orc/impl/PositionedOutputStream.java 
b/java/core/src/java/org/apache/orc/impl/PositionedOutputStream.java
index 981e8146a..9db451137 100644
--- a/java/core/src/java/org/apache/orc/impl/PositionedOutputStream.java
+++ b/java/core/src/java/org/apache/orc/impl/PositionedOutputStream.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import java.io.IOException;
diff --git a/java/core/src/java/org/apache/orc/impl/RecordReaderImpl.java 
b/java/core/src/java/org/apache/orc/impl/RecordReaderImpl.java
index b2120db86..9553febc4 100644
--- a/java/core/src/java/org/apache/orc/impl/RecordReaderImpl.java
+++ b/java/core/src/java/org/apache/orc/impl/RecordReaderImpl.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FSDataInputStream;
diff --git a/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java 
b/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java
index ec5a2494b..11f5e227b 100644
--- a/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java
+++ b/java/core/src/java/org/apache/orc/impl/RecordReaderUtils.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FSDataInputStream;
diff --git a/java/core/src/java/org/apache/orc/impl/RunLengthByteReader.java 
b/java/core/src/java/org/apache/orc/impl/RunLengthByteReader.java
index 62da3221a..7bf84b562 100644
--- a/java/core/src/java/org/apache/orc/impl/RunLengthByteReader.java
+++ b/java/core/src/java/org/apache/orc/impl/RunLengthByteReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/RunLengthByteWriter.java 
b/java/core/src/java/org/apache/orc/impl/RunLengthByteWriter.java
index 9c025fc7b..ca46959b9 100644
--- a/java/core/src/java/org/apache/orc/impl/RunLengthByteWriter.java
+++ b/java/core/src/java/org/apache/orc/impl/RunLengthByteWriter.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import java.io.IOException;
diff --git a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReader.java 
b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReader.java
index a17fb9ee9..52970cf91 100644
--- a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReader.java
+++ b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git 
a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReaderV2.java 
b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReaderV2.java
index e947bfb4d..dc625dc5f 100644
--- a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReaderV2.java
+++ b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerReaderV2.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriter.java 
b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriter.java
index d2d24e232..d8cc9bb24 100644
--- a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriter.java
+++ b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriter.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import java.io.IOException;
diff --git 
a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriterV2.java 
b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriterV2.java
index 5a6dd51ec..65bf884c3 100644
--- a/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriterV2.java
+++ b/java/core/src/java/org/apache/orc/impl/RunLengthIntegerWriterV2.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import java.io.IOException;
diff --git a/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java 
b/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java
index c78e20b5a..5655ebd32 100644
--- a/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java
+++ b/java/core/src/java/org/apache/orc/impl/StringRedBlackTree.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.io.Text;
diff --git a/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java 
b/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
index 43d3a33b2..67c36825d 100644
--- a/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/TreeReaderFactory.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.common.type.HiveDecimal;
diff --git a/java/core/src/java/org/apache/orc/impl/ZlibCodec.java 
b/java/core/src/java/org/apache/orc/impl/ZlibCodec.java
index d4275a4c2..428b3e74f 100644
--- a/java/core/src/java/org/apache/orc/impl/ZlibCodec.java
+++ b/java/core/src/java/org/apache/orc/impl/ZlibCodec.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/java/org/apache/orc/impl/ZstdCodec.java 
b/java/core/src/java/org/apache/orc/impl/ZstdCodec.java
index 186e5696f..cf16adfb2 100644
--- a/java/core/src/java/org/apache/orc/impl/ZstdCodec.java
+++ b/java/core/src/java/org/apache/orc/impl/ZstdCodec.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import com.github.luben.zstd.Zstd;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/ListIdentity.java 
b/java/core/src/java/org/apache/orc/impl/mask/ListIdentity.java
index 18e5622d8..7ba7594d0 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/ListIdentity.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/ListIdentity.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/MapIdentity.java 
b/java/core/src/java/org/apache/orc/impl/mask/MapIdentity.java
index 43a1aea3c..d7e9f4729 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/MapIdentity.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/MapIdentity.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/MaskFactory.java 
b/java/core/src/java/org/apache/orc/impl/mask/MaskFactory.java
index 77e44113a..6879af50e 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/MaskFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/MaskFactory.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.orc.DataMask;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/MaskProvider.java 
b/java/core/src/java/org/apache/orc/impl/mask/MaskProvider.java
index b5d9ca14b..9e783d1ed 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/MaskProvider.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/MaskProvider.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.orc.DataMask;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/NullifyMask.java 
b/java/core/src/java/org/apache/orc/impl/mask/NullifyMask.java
index 1ff8bc120..7228a1b00 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/NullifyMask.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/NullifyMask.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/RedactMaskFactory.java 
b/java/core/src/java/org/apache/orc/impl/mask/RedactMaskFactory.java
index 1debb9349..9851415bb 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/RedactMaskFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/RedactMaskFactory.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/SHA256MaskFactory.java 
b/java/core/src/java/org/apache/orc/impl/mask/SHA256MaskFactory.java
index 4b5740851..819f6df80 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/SHA256MaskFactory.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/SHA256MaskFactory.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/StructIdentity.java 
b/java/core/src/java/org/apache/orc/impl/mask/StructIdentity.java
index 92cfb4e84..45cd53b54 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/StructIdentity.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/StructIdentity.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/mask/UnionIdentity.java 
b/java/core/src/java/org/apache/orc/impl/mask/UnionIdentity.java
index 27ae46cc1..0f17a19a5 100644
--- a/java/core/src/java/org/apache/orc/impl/mask/UnionIdentity.java
+++ b/java/core/src/java/org/apache/orc/impl/mask/UnionIdentity.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git 
a/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryption.java 
b/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryption.java
index ad7a969b8..6262ee457 100644
--- a/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryption.java
+++ b/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryption.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionKey.java 
b/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionKey.java
index 10565d887..8fa7b643c 100644
--- a/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionKey.java
+++ b/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionKey.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionVariant.java 
b/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionVariant.java
index 19bf9e5a4..fea647aa0 100644
--- a/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionVariant.java
+++ b/java/core/src/java/org/apache/orc/impl/reader/ReaderEncryptionVariant.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java 
b/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java
index 2501e7e72..32d71c833 100644
--- a/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java
+++ b/java/core/src/java/org/apache/orc/impl/reader/StripePlanner.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/core/src/java/org/apache/orc/impl/reader/tree/BatchReader.java 
b/java/core/src/java/org/apache/orc/impl/reader/tree/BatchReader.java
index f7b0067f4..8d7d685eb 100644
--- a/java/core/src/java/org/apache/orc/impl/reader/tree/BatchReader.java
+++ b/java/core/src/java/org/apache/orc/impl/reader/tree/BatchReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.reader.tree;
 
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
diff --git 
a/java/core/src/java/org/apache/orc/impl/reader/tree/PrimitiveBatchReader.java 
b/java/core/src/java/org/apache/orc/impl/reader/tree/PrimitiveBatchReader.java
index bc2f5c1c6..fe285ab33 100644
--- 
a/java/core/src/java/org/apache/orc/impl/reader/tree/PrimitiveBatchReader.java
+++ 
b/java/core/src/java/org/apache/orc/impl/reader/tree/PrimitiveBatchReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.reader.tree;
 
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
diff --git a/java/core/src/java/org/apache/orc/impl/writer/MapTreeWriter.java 
b/java/core/src/java/org/apache/orc/impl/writer/MapTreeWriter.java
index 2d924ec63..a9dbee49b 100644
--- a/java/core/src/java/org/apache/orc/impl/writer/MapTreeWriter.java
+++ b/java/core/src/java/org/apache/orc/impl/writer/MapTreeWriter.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.writer;
 
 import org.apache.hadoop.hive.ql.exec.vector.ColumnVector;
diff --git a/java/core/src/java/org/apache/orc/impl/writer/StreamOptions.java 
b/java/core/src/java/org/apache/orc/impl/writer/StreamOptions.java
index 8c2736add..28bb7afaf 100644
--- a/java/core/src/java/org/apache/orc/impl/writer/StreamOptions.java
+++ b/java/core/src/java/org/apache/orc/impl/writer/StreamOptions.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.writer;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/java/org/threeten/extra/chrono/HybridChronology.java 
b/java/core/src/java/org/threeten/extra/chrono/HybridChronology.java
index 682c34402..c3d73dc66 100644
--- a/java/core/src/java/org/threeten/extra/chrono/HybridChronology.java
+++ b/java/core/src/java/org/threeten/extra/chrono/HybridChronology.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.threeten.extra.chrono;
 
 import java.io.Serializable;
diff --git a/java/core/src/java/org/threeten/extra/chrono/HybridDate.java 
b/java/core/src/java/org/threeten/extra/chrono/HybridDate.java
index 29d858678..6a4216b21 100644
--- a/java/core/src/java/org/threeten/extra/chrono/HybridDate.java
+++ b/java/core/src/java/org/threeten/extra/chrono/HybridDate.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.threeten.extra.chrono;
 
 import java.io.Serializable;
diff --git a/java/core/src/test/org/apache/orc/StringDictTestingUtils.java 
b/java/core/src/test/org/apache/orc/StringDictTestingUtils.java
index 8ebc3d64f..c354e5509 100644
--- a/java/core/src/test/org/apache/orc/StringDictTestingUtils.java
+++ b/java/core/src/test/org/apache/orc/StringDictTestingUtils.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.io.DataOutputBuffer;
diff --git a/java/core/src/test/org/apache/orc/TestConf.java 
b/java/core/src/test/org/apache/orc/TestConf.java
index 2b5e9dca6..4985703b8 100644
--- a/java/core/src/test/org/apache/orc/TestConf.java
+++ b/java/core/src/test/org/apache/orc/TestConf.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/java/core/src/test/org/apache/orc/TestCorruptTypes.java 
b/java/core/src/test/org/apache/orc/TestCorruptTypes.java
index e6df2b2d3..256813557 100644
--- a/java/core/src/test/org/apache/orc/TestCorruptTypes.java
+++ b/java/core/src/test/org/apache/orc/TestCorruptTypes.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.junit.jupiter.api.Test;
diff --git a/java/core/src/test/org/apache/orc/TestInMemoryKeystore.java 
b/java/core/src/test/org/apache/orc/TestInMemoryKeystore.java
index de34e3e67..61f9ee558 100644
--- a/java/core/src/test/org/apache/orc/TestInMemoryKeystore.java
+++ b/java/core/src/test/org/apache/orc/TestInMemoryKeystore.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.io.BytesWritable;
diff --git a/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java 
b/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java
index dda0ce945..7b8c59352 100644
--- a/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java
+++ b/java/core/src/test/org/apache/orc/TestNewIntegerEncoding.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import com.google.common.primitives.Longs;
diff --git a/java/core/src/test/org/apache/orc/TestOrcConf.java 
b/java/core/src/test/org/apache/orc/TestOrcConf.java
index 1dde7532b..5cef964b1 100644
--- a/java/core/src/test/org/apache/orc/TestOrcConf.java
+++ b/java/core/src/test/org/apache/orc/TestOrcConf.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java 
b/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java
index 49529add6..916f0fd6b 100644
--- a/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java
+++ b/java/core/src/test/org/apache/orc/TestOrcDSTNoTimezone.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java 
b/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java
index 5a5373862..cc0c1c8d7 100644
--- a/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java
+++ b/java/core/src/test/org/apache/orc/TestOrcNoTimezone.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java 
b/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java
index b99edd613..3eea31438 100644
--- a/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java
+++ b/java/core/src/test/org/apache/orc/TestOrcNullOptimization.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java 
b/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java
index 8c36f5377..d57de6d5b 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimestampPPD.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone1.java 
b/java/core/src/test/org/apache/orc/TestOrcTimezone1.java
index 6e9cd844e..c3b9c7bff 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone1.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone1.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone2.java 
b/java/core/src/test/org/apache/orc/TestOrcTimezone2.java
index d1a509168..c7263dcfb 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone2.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone2.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone3.java 
b/java/core/src/test/org/apache/orc/TestOrcTimezone3.java
index 9c7692f4c..c38b26c8a 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone3.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone3.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezone4.java 
b/java/core/src/test/org/apache/orc/TestOrcTimezone4.java
index 2a9a50298..f9702b10c 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezone4.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezone4.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java 
b/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java
index f0e5fbbe2..a193d3ff1 100644
--- a/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java
+++ b/java/core/src/test/org/apache/orc/TestOrcTimezonePPD.java
@@ -6,13 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git 
a/java/core/src/test/org/apache/orc/TestOrcWithLargeStripeStatistics.java 
b/java/core/src/test/org/apache/orc/TestOrcWithLargeStripeStatistics.java
index 9f86f017e..48266336e 100644
--- a/java/core/src/test/org/apache/orc/TestOrcWithLargeStripeStatistics.java
+++ b/java/core/src/test/org/apache/orc/TestOrcWithLargeStripeStatistics.java
@@ -1,12 +1,13 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.Path;
diff --git a/java/core/src/test/org/apache/orc/TestProlepticConversions.java 
b/java/core/src/test/org/apache/orc/TestProlepticConversions.java
index ae8201c60..27136a679 100644
--- a/java/core/src/test/org/apache/orc/TestProlepticConversions.java
+++ b/java/core/src/test/org/apache/orc/TestProlepticConversions.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestReader.java 
b/java/core/src/test/org/apache/orc/TestReader.java
index f3c11d54a..cd8809e15 100644
--- a/java/core/src/test/org/apache/orc/TestReader.java
+++ b/java/core/src/test/org/apache/orc/TestReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FSDataOutputStream;
diff --git 
a/java/core/src/test/org/apache/orc/TestRowFilteringComplexTypes.java 
b/java/core/src/test/org/apache/orc/TestRowFilteringComplexTypes.java
index 0f6b76e62..39a46b662 100644
--- a/java/core/src/test/org/apache/orc/TestRowFilteringComplexTypes.java
+++ b/java/core/src/test/org/apache/orc/TestRowFilteringComplexTypes.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestRowFilteringNoSkip.java 
b/java/core/src/test/org/apache/orc/TestRowFilteringNoSkip.java
index b4a677d86..5623e494d 100644
--- a/java/core/src/test/org/apache/orc/TestRowFilteringNoSkip.java
+++ b/java/core/src/test/org/apache/orc/TestRowFilteringNoSkip.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestRowFilteringSkip.java 
b/java/core/src/test/org/apache/orc/TestRowFilteringSkip.java
index ea4bc583c..409726fc2 100644
--- a/java/core/src/test/org/apache/orc/TestRowFilteringSkip.java
+++ b/java/core/src/test/org/apache/orc/TestRowFilteringSkip.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/TestStringDictionary.java 
b/java/core/src/test/org/apache/orc/TestStringDictionary.java
index 9f3d4eb11..597531785 100644
--- a/java/core/src/test/org/apache/orc/TestStringDictionary.java
+++ b/java/core/src/test/org/apache/orc/TestStringDictionary.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/java/core/src/test/org/apache/orc/TestTypeDescription.java 
b/java/core/src/test/org/apache/orc/TestTypeDescription.java
index 3f811803f..55ba2e880 100644
--- a/java/core/src/test/org/apache/orc/TestTypeDescription.java
+++ b/java/core/src/test/org/apache/orc/TestTypeDescription.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.hadoop.fs.Path;
diff --git a/java/core/src/test/org/apache/orc/TestUnicode.java 
b/java/core/src/test/org/apache/orc/TestUnicode.java
index c901ec72f..42660d9cd 100644
--- a/java/core/src/test/org/apache/orc/TestUnicode.java
+++ b/java/core/src/test/org/apache/orc/TestUnicode.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc;
 
 import org.apache.commons.lang3.StringUtils;
diff --git a/java/core/src/test/org/apache/orc/impl/TestBitFieldReader.java 
b/java/core/src/test/org/apache/orc/impl/TestBitFieldReader.java
index 51627581e..b279721ca 100644
--- a/java/core/src/test/org/apache/orc/impl/TestBitFieldReader.java
+++ b/java/core/src/test/org/apache/orc/impl/TestBitFieldReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/test/org/apache/orc/impl/TestBitPack.java 
b/java/core/src/test/org/apache/orc/impl/TestBitPack.java
index e2e1a67c8..effb720bd 100644
--- a/java/core/src/test/org/apache/orc/impl/TestBitPack.java
+++ b/java/core/src/test/org/apache/orc/impl/TestBitPack.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import com.google.common.primitives.Longs;
diff --git 
a/java/core/src/test/org/apache/orc/impl/TestConvertTreeReaderFactory.java 
b/java/core/src/test/org/apache/orc/impl/TestConvertTreeReaderFactory.java
index 53f94cbf7..bbec4516d 100644
--- a/java/core/src/test/org/apache/orc/impl/TestConvertTreeReaderFactory.java
+++ b/java/core/src/test/org/apache/orc/impl/TestConvertTreeReaderFactory.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.conf.Configuration;
diff --git 
a/java/core/src/test/org/apache/orc/impl/TestDataReaderProperties.java 
b/java/core/src/test/org/apache/orc/impl/TestDataReaderProperties.java
index 3acbcabcb..734513445 100644
--- a/java/core/src/test/org/apache/orc/impl/TestDataReaderProperties.java
+++ b/java/core/src/test/org/apache/orc/impl/TestDataReaderProperties.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/core/src/test/org/apache/orc/impl/TestDynamicArray.java 
b/java/core/src/test/org/apache/orc/impl/TestDynamicArray.java
index 9acd8e6be..285507491 100644
--- a/java/core/src/test/org/apache/orc/impl/TestDynamicArray.java
+++ b/java/core/src/test/org/apache/orc/impl/TestDynamicArray.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.junit.jupiter.api.Test;
diff --git a/java/core/src/test/org/apache/orc/impl/TestEncryption.java 
b/java/core/src/test/org/apache/orc/impl/TestEncryption.java
index 3ab2bb8b7..8df932911 100644
--- a/java/core/src/test/org/apache/orc/impl/TestEncryption.java
+++ b/java/core/src/test/org/apache/orc/impl/TestEncryption.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git 
a/java/core/src/test/org/apache/orc/impl/TestIntegerCompressionReader.java 
b/java/core/src/test/org/apache/orc/impl/TestIntegerCompressionReader.java
index 6f47d03e5..32e01cba6 100644
--- a/java/core/src/test/org/apache/orc/impl/TestIntegerCompressionReader.java
+++ b/java/core/src/test/org/apache/orc/impl/TestIntegerCompressionReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java 
b/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java
index 7f1f8359d..d3c9927fb 100644
--- a/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java
+++ b/java/core/src/test/org/apache/orc/impl/TestMemoryManager.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.Path;
diff --git a/java/core/src/test/org/apache/orc/impl/TestOrcLargeStripe.java 
b/java/core/src/test/org/apache/orc/impl/TestOrcLargeStripe.java
index 22ae8226f..6f8dfb478 100644
--- a/java/core/src/test/org/apache/orc/impl/TestOrcLargeStripe.java
+++ b/java/core/src/test/org/apache/orc/impl/TestOrcLargeStripe.java
@@ -1,11 +1,13 @@
 /*
- * Copyright 2015 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FSDataInputStream;
diff --git 
a/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java 
b/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java
index aec865201..14732c011 100644
--- a/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java
+++ b/java/core/src/test/org/apache/orc/impl/TestPredicatePushDownBounds.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.hive.ql.io.sarg.PredicateLeaf;
diff --git a/java/core/src/test/org/apache/orc/impl/TestReaderImpl.java 
b/java/core/src/test/org/apache/orc/impl/TestReaderImpl.java
index 003ae22a7..0213b6061 100644
--- a/java/core/src/test/org/apache/orc/impl/TestReaderImpl.java
+++ b/java/core/src/test/org/apache/orc/impl/TestReaderImpl.java
@@ -1,11 +1,13 @@
 /*
- * Copyright 2016 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.conf.Configuration;
diff --git 
a/java/core/src/test/org/apache/orc/impl/TestRunLengthByteReader.java 
b/java/core/src/test/org/apache/orc/impl/TestRunLengthByteReader.java
index 03f5b8500..8e11f5ee3 100644
--- a/java/core/src/test/org/apache/orc/impl/TestRunLengthByteReader.java
+++ b/java/core/src/test/org/apache/orc/impl/TestRunLengthByteReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git 
a/java/core/src/test/org/apache/orc/impl/TestRunLengthIntegerReader.java 
b/java/core/src/test/org/apache/orc/impl/TestRunLengthIntegerReader.java
index 24742d0dc..0afb1909a 100644
--- a/java/core/src/test/org/apache/orc/impl/TestRunLengthIntegerReader.java
+++ b/java/core/src/test/org/apache/orc/impl/TestRunLengthIntegerReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.orc.CompressionCodec;
diff --git a/java/core/src/test/org/apache/orc/impl/TestSchemaEvolution.java 
b/java/core/src/test/org/apache/orc/impl/TestSchemaEvolution.java
index fde63021f..92f958970 100644
--- a/java/core/src/test/org/apache/orc/impl/TestSchemaEvolution.java
+++ b/java/core/src/test/org/apache/orc/impl/TestSchemaEvolution.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java 
b/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
index cda818893..6e5dec02e 100644
--- a/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
+++ b/java/core/src/test/org/apache/orc/impl/TestSerializationUtils.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import com.google.common.math.LongMath;
diff --git a/java/core/src/test/org/apache/orc/impl/mask/TestDataMask.java 
b/java/core/src/test/org/apache/orc/impl/mask/TestDataMask.java
index 129d70e56..6ef9302ff 100644
--- a/java/core/src/test/org/apache/orc/impl/mask/TestDataMask.java
+++ b/java/core/src/test/org/apache/orc/impl/mask/TestDataMask.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
diff --git a/java/core/src/test/org/apache/orc/impl/mask/TestRedactMask.java 
b/java/core/src/test/org/apache/orc/impl/mask/TestRedactMask.java
index 35065121f..2c0d2428b 100644
--- a/java/core/src/test/org/apache/orc/impl/mask/TestRedactMask.java
+++ b/java/core/src/test/org/apache/orc/impl/mask/TestRedactMask.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
diff --git a/java/core/src/test/org/apache/orc/impl/mask/TestSHA256Mask.java 
b/java/core/src/test/org/apache/orc/impl/mask/TestSHA256Mask.java
index 4063f19fa..f3412680d 100644
--- a/java/core/src/test/org/apache/orc/impl/mask/TestSHA256Mask.java
+++ b/java/core/src/test/org/apache/orc/impl/mask/TestSHA256Mask.java
@@ -1,19 +1,21 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership.  The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
+ * 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.
  */
+
 package org.apache.orc.impl.mask;
 
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
diff --git a/java/core/src/test/org/apache/orc/impl/mask/TestUnmaskRange.java 
b/java/core/src/test/org/apache/orc/impl/mask/TestUnmaskRange.java
index e1be3f631..914923ec7 100644
--- a/java/core/src/test/org/apache/orc/impl/mask/TestUnmaskRange.java
+++ b/java/core/src/test/org/apache/orc/impl/mask/TestUnmaskRange.java
@@ -1,22 +1,23 @@
-package org.apache.orc.impl.mask;
-
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership.  The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
+ * 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.
  */
 
+package org.apache.orc.impl.mask;
+
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
 import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable;
 import org.junit.jupiter.api.Test;
diff --git a/java/examples/pom.xml b/java/examples/pom.xml
index a36cd7a40..662b9a42f 100644
--- a/java/examples/pom.xml
+++ b/java/examples/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/examples/src/assembly/uber.xml 
b/java/examples/src/assembly/uber.xml
index 014eab951..3e6561b50 100644
--- a/java/examples/src/assembly/uber.xml
+++ b/java/examples/src/assembly/uber.xml
@@ -1,15 +1,20 @@
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <assembly>
   <id>uber</id>
diff --git a/java/examples/src/java/org/apache/orc/examples/AdvancedReader.java 
b/java/examples/src/java/org/apache/orc/examples/AdvancedReader.java
index 0bdfcff24..57330220a 100644
--- a/java/examples/src/java/org/apache/orc/examples/AdvancedReader.java
+++ b/java/examples/src/java/org/apache/orc/examples/AdvancedReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.examples;
 
 import org.apache.hadoop.conf.Configuration;
diff --git 
a/java/examples/src/java/org/apache/orc/examples/CompressionWriter.java 
b/java/examples/src/java/org/apache/orc/examples/CompressionWriter.java
index 3f6ce3557..1c0d571c8 100644
--- a/java/examples/src/java/org/apache/orc/examples/CompressionWriter.java
+++ b/java/examples/src/java/org/apache/orc/examples/CompressionWriter.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/examples/src/java/org/apache/orc/examples/Driver.java 
b/java/examples/src/java/org/apache/orc/examples/Driver.java
index 11415e2db..5ee681e7e 100644
--- a/java/examples/src/java/org/apache/orc/examples/Driver.java
+++ b/java/examples/src/java/org/apache/orc/examples/Driver.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionReader.java 
b/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionReader.java
index dec37ca11..e8d3f69a9 100644
--- 
a/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionReader.java
+++ 
b/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionReader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git 
a/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionWriter.java 
b/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionWriter.java
index f8edfd171..97100081d 100644
--- 
a/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionWriter.java
+++ 
b/java/examples/src/java/org/apache/orc/examples/InMemoryEncryptionWriter.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/mapreduce/pom.xml b/java/mapreduce/pom.xml
index 2d803351a..e039054a8 100644
--- a/java/mapreduce/pom.xml
+++ b/java/mapreduce/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcKey.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcKey.java
index 880dec769..6e8344848 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcKey.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcKey.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.io.WritableComparable;
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcList.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcList.java
index 0ed12664f..568996725 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcList.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcList.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.io.WritableComparable;
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcMap.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcMap.java
index cf5283ae1..a88c783d8 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcMap.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcMap.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.io.WritableComparable;
diff --git 
a/java/mapreduce/src/java/org/apache/orc/mapred/OrcMapredRecordReader.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcMapredRecordReader.java
index 4230b8f95..1cfd3f4a1 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcMapredRecordReader.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcMapredRecordReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.hive.ql.exec.vector.BytesColumnVector;
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcStruct.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcStruct.java
index 6ed063d27..71ff1d80e 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcStruct.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcStruct.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.hive.serde2.io.DateWritable;
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcTimestamp.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcTimestamp.java
index eccb48c67..11dcac54b 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcTimestamp.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcTimestamp.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.io.WritableComparable;
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcUnion.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcUnion.java
index f70c420f7..ac2371206 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcUnion.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcUnion.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.io.Writable;
diff --git a/java/mapreduce/src/java/org/apache/orc/mapred/OrcValue.java 
b/java/mapreduce/src/java/org/apache/orc/mapred/OrcValue.java
index 3129d3ff4..7ab7c4b64 100644
--- a/java/mapreduce/src/java/org/apache/orc/mapred/OrcValue.java
+++ b/java/mapreduce/src/java/org/apache/orc/mapred/OrcValue.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapred;
 
 import org.apache.hadoop.io.Writable;
diff --git 
a/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcMapreduceRecordReader.java
 
b/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcMapreduceRecordReader.java
index b4f37f5a9..ab934f67b 100644
--- 
a/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcMapreduceRecordReader.java
+++ 
b/java/mapreduce/src/java/org/apache/orc/mapreduce/OrcMapreduceRecordReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.mapreduce;
 
 import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch;
diff --git 
a/java/mapreduce/src/test/org/apache/orc/mapred/TestOrcFileEvolution.java 
b/java/mapreduce/src/test/org/apache/orc/mapred/TestOrcFileEvolution.java
index 5349d4ead..098da4b2b 100644
--- a/java/mapreduce/src/test/org/apache/orc/mapred/TestOrcFileEvolution.java
+++ b/java/mapreduce/src/test/org/apache/orc/mapred/TestOrcFileEvolution.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/pom.xml b/java/pom.xml
index 012a8d346..220725cb8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/shims/pom.xml b/java/shims/pom.xml
index 1412164f1..ce5d63014 100644
--- a/java/shims/pom.xml
+++ b/java/shims/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java 
b/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java
index c1a86cd2e..1147d2a25 100644
--- a/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java
+++ b/java/shims/src/java/org/apache/orc/impl/ZeroCopyShims.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FSDataInputStream;
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index e22f3eb37..952163559 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  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.
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   <modelVersion>4.0.0</modelVersion>
diff --git a/java/tools/src/assembly/uber.xml b/java/tools/src/assembly/uber.xml
index 014eab951..e1fb20859 100644
--- a/java/tools/src/assembly/uber.xml
+++ b/java/tools/src/assembly/uber.xml
@@ -1,3 +1,22 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ 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.
+-->
+
 <!--
   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/java/tools/src/java/org/apache/orc/tools/CheckTool.java 
b/java/tools/src/java/org/apache/orc/tools/CheckTool.java
index 2d90241bd..4fe4f591d 100644
--- a/java/tools/src/java/org/apache/orc/tools/CheckTool.java
+++ b/java/tools/src/java/org/apache/orc/tools/CheckTool.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/tools/src/java/org/apache/orc/tools/Driver.java 
b/java/tools/src/java/org/apache/orc/tools/Driver.java
index cdf594fe2..b134a1bb8 100644
--- a/java/tools/src/java/org/apache/orc/tools/Driver.java
+++ b/java/tools/src/java/org/apache/orc/tools/Driver.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/tools/src/java/org/apache/orc/tools/FileDump.java 
b/java/tools/src/java/org/apache/orc/tools/FileDump.java
index 7e952effb..9998fe069 100644
--- a/java/tools/src/java/org/apache/orc/tools/FileDump.java
+++ b/java/tools/src/java/org/apache/orc/tools/FileDump.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc.tools;
 
 import org.apache.commons.cli.CommandLine;
diff --git a/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java 
b/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java
index 7d893a54c..46e5abb13 100644
--- a/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java
+++ b/java/tools/src/java/org/apache/orc/tools/JsonFileDump.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc.tools;
 
 import com.google.gson.stream.JsonWriter;
diff --git a/java/tools/src/java/org/apache/orc/tools/KeyTool.java 
b/java/tools/src/java/org/apache/orc/tools/KeyTool.java
index 03c649efa..a9ac9b2b9 100644
--- a/java/tools/src/java/org/apache/orc/tools/KeyTool.java
+++ b/java/tools/src/java/org/apache/orc/tools/KeyTool.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc.tools;
 
 import com.google.gson.stream.JsonWriter;
diff --git a/java/tools/src/java/org/apache/orc/tools/MergeFiles.java 
b/java/tools/src/java/org/apache/orc/tools/MergeFiles.java
index 8de15aaf4..39130f82d 100644
--- a/java/tools/src/java/org/apache/orc/tools/MergeFiles.java
+++ b/java/tools/src/java/org/apache/orc/tools/MergeFiles.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
diff --git a/java/tools/src/java/org/apache/orc/tools/PrintData.java 
b/java/tools/src/java/org/apache/orc/tools/PrintData.java
index 6c7c18ba1..f2f69d501 100644
--- a/java/tools/src/java/org/apache/orc/tools/PrintData.java
+++ b/java/tools/src/java/org/apache/orc/tools/PrintData.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc.tools;
 
 import com.google.gson.stream.JsonWriter;
diff --git a/java/tools/src/java/org/apache/orc/tools/PrintVersion.java 
b/java/tools/src/java/org/apache/orc/tools/PrintVersion.java
index c738c8414..f7d5d7ab7 100644
--- a/java/tools/src/java/org/apache/orc/tools/PrintVersion.java
+++ b/java/tools/src/java/org/apache/orc/tools/PrintVersion.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc.tools;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/java/tools/src/java/org/apache/orc/tools/ScanData.java 
b/java/tools/src/java/org/apache/orc/tools/ScanData.java
index eefe7af6a..87d44c2ad 100644
--- a/java/tools/src/java/org/apache/orc/tools/ScanData.java
+++ b/java/tools/src/java/org/apache/orc/tools/ScanData.java
@@ -6,15 +6,16 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.
  */
+
 package org.apache.orc.tools;
 
 import org.apache.commons.cli.CommandLine;
diff --git a/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java 
b/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
index f7e9bb105..f368e5247 100644
--- a/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
+++ b/java/tools/src/java/org/apache/orc/tools/convert/ConvertTool.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.tools.convert;
 
 import org.apache.commons.cli.CommandLine;
diff --git a/java/tools/src/java/org/apache/orc/tools/convert/CsvReader.java 
b/java/tools/src/java/org/apache/orc/tools/convert/CsvReader.java
index 236adf38c..255d6b315 100644
--- a/java/tools/src/java/org/apache/orc/tools/convert/CsvReader.java
+++ b/java/tools/src/java/org/apache/orc/tools/convert/CsvReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.tools.convert;
 
 import com.opencsv.CSVParser;
diff --git a/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java 
b/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java
index 37e834e4e..1a197ba62 100644
--- a/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java
+++ b/java/tools/src/java/org/apache/orc/tools/convert/JsonReader.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.tools.convert;
 
 import com.google.gson.JsonArray;
diff --git 
a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java 
b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
index 7a0765049..829bcf814 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/JsonSchemaFinder.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.tools.json;
 
 import com.google.gson.JsonArray;
diff --git a/java/tools/src/java/org/apache/orc/tools/json/JsonShredder.java 
b/java/tools/src/java/org/apache/orc/tools/json/JsonShredder.java
index a105eb4da..0940d4204 100644
--- a/java/tools/src/java/org/apache/orc/tools/json/JsonShredder.java
+++ b/java/tools/src/java/org/apache/orc/tools/json/JsonShredder.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.tools.json;
 
 import com.google.gson.JsonArray;
diff --git a/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java 
b/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java
index e6082f0bf..5df6cbf10 100644
--- a/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java
+++ b/java/tools/src/test/org/apache/orc/impl/TestHadoopKeyProvider.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.conf.Configuration;
diff --git a/java/tools/src/test/org/apache/orc/impl/TestRLEv2.java 
b/java/tools/src/test/org/apache/orc/impl/TestRLEv2.java
index 69a6656e6..06fd2a12b 100644
--- a/java/tools/src/test/org/apache/orc/impl/TestRLEv2.java
+++ b/java/tools/src/test/org/apache/orc/impl/TestRLEv2.java
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.orc.impl;
 
 import org.apache.hadoop.fs.FileSystem;
diff --git a/java/tools/src/test/org/apache/orc/tools/TestCheckTool.java 
b/java/tools/src/test/org/apache/orc/tools/TestCheckTool.java
index 978786706..1198add4b 100644
--- a/java/tools/src/test/org/apache/orc/tools/TestCheckTool.java
+++ b/java/tools/src/test/org/apache/orc/tools/TestCheckTool.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * 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.


Reply via email to