This is an automated email from the ASF dual-hosted git repository.
okumin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 4a5b5e66f07 HIVE-29245: Normalize Java license headers, part 1 -
illegal Javadoc (#6125)
4a5b5e66f07 is described below
commit 4a5b5e66f072a44eeb926d229fafb71b495ae02b
Author: Shohei Okumiya <[email protected]>
AuthorDate: Fri Nov 7 17:04:24 2025 +0900
HIVE-29245: Normalize Java license headers, part 1 - illegal Javadoc (#6125)
* Add RegexpHeader
* Don't run RAT for checkstyle
* HIVE-29245: Normalize Java license headers, part 1 - illegal Javadoc
* Fix checkstyle.xml
* Revert avro-generated files
* Raise the severity of RegexpHeader
---
checkstyle/asf.header.incremental | 3 ++
checkstyle/checkstyle.xml | 7 +++++
checkstyle/suppressions.xml | 6 ++++
.../apache/hadoop/hive/common/GcTimeMonitor.java | 2 +-
.../org/apache/hadoop/hive/common/type/Date.java | 2 +-
.../apache/hadoop/hive/common/type/Timestamp.java | 2 +-
.../org/apache/hive/common/util/CleanerUtil.java | 2 +-
.../benchmark/vectorization/BlackholeOperator.java | 2 +-
.../operators/AbstractOperatorBench.java | 2 +-
.../operators/VectorGroupByOperatorBench.java | 2 +-
.../operators/VectorSelectOperatorBench.java | 2 +-
.../repository/TestIcebergRepository.java | 2 +-
.../schema/QueryHistorySchemaTestUtils.java | 2 +-
.../llap/io/encoded/LlapRecordReaderUtils.java | 2 +-
.../hive/llap/shufflehandler/TestIndexCache.java | 2 +-
pom.xml | 1 +
.../org/apache/hadoop/hive/ql/exec/ExportTask.java | 30 +++++++++----------
.../hive/ql/exec/repl/ClearDanglingTxnTask.java | 1 -
.../ql/exec/repl/bootstrap/events/TableEvent.java | 30 +++++++++----------
.../hadoop/hive/ql/exec/tez/TezRuntimeContext.java | 2 +-
.../ql/exec/tez/WorkloadManagerFederation.java | 3 +-
.../hive/ql/exec/tez/monitoring/TezJobMonitor.java | 30 +++++++++----------
.../FilterStringColLikeStringScalar.java | 2 +-
.../exec/vector/expressions/ScalarNullAndCol.java | 3 +-
.../exec/vector/expressions/ScalarNullOrCol.java | 3 +-
.../fast/VectorMapJoinFastBytesHashKeyRef.java | 2 +-
.../hadoop/hive/ql/hooks/HiveProtoLoggingHook.java | 2 +-
.../hadoop/hive/ql/hooks/QueryLifeTimeHook.java | 2 +-
.../hive/ql/hooks/QueryLifeTimeHookContext.java | 2 +-
.../ql/hooks/QueryLifeTimeHookContextImpl.java | 2 +-
.../hive/ql/io/orc/encoded/LlapDataReader.java | 2 +-
.../hive/ql/io/orc/encoded/StoppableAllocator.java | 2 +-
.../hadoop/hive/ql/lockmgr/DbTxnManager.java | 30 +++++++++----------
.../ql/log/HushableRandomAccessFileAppender.java | 3 +-
...AggregatePartitionIncrementalRewritingRule.java | 2 +-
.../repl/load/message/CreateDatabaseHandler.java | 1 -
.../repl/load/message/CreateFunctionHandler.java | 1 -
.../apache/hadoop/hive/ql/plan/TopNKeyDesc.java | 2 +-
.../hadoop/hive/ql/plan/VectorTopNKeyDesc.java | 2 +-
.../hive/ql/queryhistory/RecordEnricher.java | 2 +-
.../queryhistory/repository/IcebergRepository.java | 2 +-
.../repository/QueryHistoryRepository.java | 2 +-
.../hadoop/hive/ql/queryhistory/schema/Record.java | 2 +-
.../hadoop/hive/ql/queryhistory/schema/Schema.java | 2 +-
.../filtercontext/TableFilterContext.java | 1 -
.../hadoop/hive/ql/session/ISessionAuthState.java | 2 +-
.../apache/hadoop/hive/ql/stats/BasicStats.java | 2 +-
.../hive/ql/udf/generic/GenericUDFToString.java | 2 +-
.../apache/hadoop/hive/ql/util/UpgradeTool.java | 1 -
.../vectorization/ColumnVectorGenUtil.java | 2 +-
.../hadoop/hive/ql/exec/repl/TestReplDumpTask.java | 2 +-
.../ql/exec/tez/TestTezTotalOrderPartitioner.java | 2 +-
.../hive/ql/hooks/TestHiveProtoLoggingHook.java | 2 +-
.../TestGenMapRedUtilsCreateConditionalTask.java | 30 +++++++++----------
.../hadoop/hive/ql/stats/TestBasicStats.java | 2 +-
.../apache/hadoop/hive/ql/udf/TestBlockedUdf.java | 3 +-
.../ql/udf/generic/TestGenericUDAFEvaluator.java | 2 +-
.../ql/udf/generic/TestGenericUDFFromUnixTime.java | 2 +-
.../hadoop/hive/serde2/json/HiveJsonWriter.java | 2 +-
.../service/server/HiveServer2HAInstanceSet.java | 2 +-
.../checkstyle/asf.header.incremental | 3 ++
standalone-metastore/checkstyle/checkstyle.xml | 7 +++++
.../metastore/DefaultPartitionExpressionProxy.java | 2 +-
.../metastore/MsckPartitionExpressionProxy.java | 2 +-
.../hadoop/hive/metastore/PropertyServlet.java | 3 +-
.../hadoop/hive/metastore/ServletSecurity.java | 3 +-
.../apache/hadoop/hive/metastore/TableFields.java | 2 +-
.../hive/metastore/events/AlterTableEvent.java | 1 -
.../hive/metastore/events/PreAlterTableEvent.java | 1 -
.../hive/metastore/messaging/AbortTxnMessage.java | 3 +-
.../hive/metastore/messaging/AcidWriteMessage.java | 3 +-
.../messaging/CommitCompactionMessage.java | 3 +-
.../hive/metastore/messaging/CommitTxnMessage.java | 3 +-
.../DeletePartitionColumnStatMessage.java | 3 +-
.../messaging/DeleteTableColumnStatMessage.java | 3 +-
.../UpdatePartitionColumnStatMessage.java | 3 +-
.../messaging/UpdateTableColumnStatMessage.java | 3 +-
.../apache/hadoop/hive/metastore/model/MTable.java | 1 -
.../hadoop/hive/metastore/client/TestCatalogs.java | 34 +++++++++++-----------
.../hive/metastore/client/TestRuntimeStats.java | 2 +-
.../events/TestAbortTxnEventDbsUpdated.java | 2 +-
.../metastore/properties/HMSHttpClientSslTest.java | 3 +-
.../metastore/properties/HMSHttpClientTest.java | 3 +-
.../metastore/properties/HMSJsonClientSslTest.java | 3 +-
.../metastore/properties/HMSJsonClientTest.java | 3 +-
standalone-metastore/pom.xml | 1 +
storage-api/checkstyle/asf.header.incremental | 3 ++
storage-api/checkstyle/checkstyle.xml | 7 +++++
storage-api/pom.xml | 5 ++++
89 files changed, 217 insertions(+), 167 deletions(-)
diff --git a/checkstyle/asf.header.incremental
b/checkstyle/asf.header.incremental
new file mode 100644
index 00000000000..737300ec66d
--- /dev/null
+++ b/checkstyle/asf.header.incremental
@@ -0,0 +1,3 @@
+^\/\*$
+^( \*| \* +.*)$
+^ \*\/$
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
index 306f8845a5f..96d68686a3f 100644
--- a/checkstyle/checkstyle.xml
+++ b/checkstyle/checkstyle.xml
@@ -64,6 +64,13 @@
<module name="Header">
<property name="headerFile" value="${config_loc}/asf.header"/>
</module>
+ <!-- HIVE-29245: An incremental process to normalize headers. We will
finally remove the following one -->
+ <module name="RegexpHeader">
+ <property name="severity" value="error"/>
+ <property name="headerFile" value="${config_loc}/asf.header.incremental"/>
+ <property name="fileExtensions" value="java"/>
+ <property name="multiLines" value="2"/>
+ </module>
<!-- Maximum file line length -->
<module name="FileLength">
diff --git a/checkstyle/suppressions.xml b/checkstyle/suppressions.xml
index 3ac7731dd09..ffb9cb6596e 100644
--- a/checkstyle/suppressions.xml
+++ b/checkstyle/suppressions.xml
@@ -25,4 +25,10 @@
<suppress checks=".*" files="gen\-java"/>
<!-- Ignore JDBM code -->
<suppress checks=".*" files="ql\/util\/jdbm"/>
+ <!-- Copies of an external libraries -->
+ <suppress checks="RegexpHeader"
files="serde\/src\/java\/org\/apache\/hadoop\/hive\/serde2\/lazy\/fast\/StringToDouble\.java"/>
+ <suppress checks="RegexpHeader"
files="llap-server\/src\/java\/org\/apache\/hadoop\/hive\/llap\/daemon\/impl\/PriorityBlockingDeque\.java"/>
+ <!-- Generated by Avro -->
+ <suppress checks="RegexpHeader"
files="hbase-handler\/src\/test\/org\/apache\/hadoop\/hive\/hbase\/avro\/.*\.java"/>
+ <suppress checks="RegexpHeader"
files="kafka-handler\/src\/test\/gen\/org\/apache\/hadoop\/hive\/kafka\/SimpleRecord\.java"/>
</suppressions>
diff --git a/common/src/java/org/apache/hadoop/hive/common/GcTimeMonitor.java
b/common/src/java/org/apache/hadoop/hive/common/GcTimeMonitor.java
index edba6f9ad65..51b0538836f 100644
--- a/common/src/java/org/apache/hadoop/hive/common/GcTimeMonitor.java
+++ b/common/src/java/org/apache/hadoop/hive/common/GcTimeMonitor.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/common/src/java/org/apache/hadoop/hive/common/type/Date.java
b/common/src/java/org/apache/hadoop/hive/common/type/Date.java
index 2a81c4ae723..cbf27ae28fa 100644
--- a/common/src/java/org/apache/hadoop/hive/common/type/Date.java
+++ b/common/src/java/org/apache/hadoop/hive/common/type/Date.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/common/src/java/org/apache/hadoop/hive/common/type/Timestamp.java
b/common/src/java/org/apache/hadoop/hive/common/type/Timestamp.java
index 238d7bd984d..ee36da60b96 100644
--- a/common/src/java/org/apache/hadoop/hive/common/type/Timestamp.java
+++ b/common/src/java/org/apache/hadoop/hive/common/type/Timestamp.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/common/src/java/org/apache/hive/common/util/CleanerUtil.java
b/common/src/java/org/apache/hive/common/util/CleanerUtil.java
index e4a0ca1c65d..96d95de7946 100644
--- a/common/src/java/org/apache/hive/common/util/CleanerUtil.java
+++ b/common/src/java/org/apache/hive/common/util/CleanerUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/BlackholeOperator.java
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/BlackholeOperator.java
index d86042ad1c8..6f8e13aa10a 100644
---
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/BlackholeOperator.java
+++
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/BlackholeOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/AbstractOperatorBench.java
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/AbstractOperatorBench.java
index f17eb3eb965..c1d941013b6 100644
---
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/AbstractOperatorBench.java
+++
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/AbstractOperatorBench.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorGroupByOperatorBench.java
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorGroupByOperatorBench.java
index 64c30e6527f..a56f1a0117e 100644
---
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorGroupByOperatorBench.java
+++
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorGroupByOperatorBench.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorSelectOperatorBench.java
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorSelectOperatorBench.java
index 54b200b189b..4b431a9bb78 100644
---
a/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorSelectOperatorBench.java
+++
b/itests/hive-jmh/src/main/java/org/apache/hive/benchmark/vectorization/operators/VectorSelectOperatorBench.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/repository/TestIcebergRepository.java
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/repository/TestIcebergRepository.java
index f9ac04502db..e982b25988b 100644
---
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/repository/TestIcebergRepository.java
+++
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/repository/TestIcebergRepository.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/schema/QueryHistorySchemaTestUtils.java
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/schema/QueryHistorySchemaTestUtils.java
index 30e9a0beb72..e5a968567fc 100644
---
a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/schema/QueryHistorySchemaTestUtils.java
+++
b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/queryhistory/schema/QueryHistorySchemaTestUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/LlapRecordReaderUtils.java
b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/LlapRecordReaderUtils.java
index 2ef8a768cd2..b9e64fd5ee3 100644
---
a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/LlapRecordReaderUtils.java
+++
b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/LlapRecordReaderUtils.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/llap-server/src/test/org/apache/hadoop/hive/llap/shufflehandler/TestIndexCache.java
b/llap-server/src/test/org/apache/hadoop/hive/llap/shufflehandler/TestIndexCache.java
index 851e9c0b69d..a10b809ff29 100644
---
a/llap-server/src/test/org/apache/hadoop/hive/llap/shufflehandler/TestIndexCache.java
+++
b/llap-server/src/test/org/apache/hadoop/hive/llap/shufflehandler/TestIndexCache.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/pom.xml b/pom.xml
index 01f4f312d8a..4e71a3d5f5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1691,6 +1691,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>${checkstyle.conf.dir}/checkstyle.xml</configLocation>
+
<suppressionsLocation>${checkstyle.conf.dir}/suppressions.xml</suppressionsLocation>
<propertyExpansion>config_loc=${checkstyle.conf.dir}</propertyExpansion>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
</configuration>
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExportTask.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExportTask.java
index cc6f8d78410..420158567b8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExportTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExportTask.java
@@ -1,19 +1,19 @@
/*
- 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 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.
*/
package org.apache.hadoop.hive.ql.exec;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ClearDanglingTxnTask.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ClearDanglingTxnTask.java
index 5ac78d590b6..14549c68705 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ClearDanglingTxnTask.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/ClearDanglingTxnTask.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/TableEvent.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/TableEvent.java
index 05ef274449f..af5d013c4f4 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/TableEvent.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/repl/bootstrap/events/TableEvent.java
@@ -1,19 +1,19 @@
/*
- 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 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.
*/
package org.apache.hadoop.hive.ql.exec.repl.bootstrap.events;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezRuntimeContext.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezRuntimeContext.java
index fe5c88a0a9a..f716c5c1eb2 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezRuntimeContext.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/TezRuntimeContext.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManagerFederation.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManagerFederation.java
index 4b5022a1011..adde440bc79 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManagerFederation.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/WorkloadManagerFederation.java
@@ -14,7 +14,8 @@
* 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.hadoop.hive.ql.exec.tez;
+ */
+package org.apache.hadoop.hive.ql.exec.tez;
import java.util.HashSet;
import java.util.Set;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/monitoring/TezJobMonitor.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/monitoring/TezJobMonitor.java
index 0b99b0142d7..81ef890dcb0 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/monitoring/TezJobMonitor.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/tez/monitoring/TezJobMonitor.java
@@ -1,19 +1,19 @@
/*
- 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>
- 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.hive.ql.exec.tez.monitoring;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java
index 88f12a2a9fa..29a7c4539a8 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/FilterStringColLikeStringScalar.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullAndCol.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullAndCol.java
index e9e8942ca17..e7bc956591b 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullAndCol.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullAndCol.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullOrCol.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullOrCol.java
index 1259715fc53..d5d5c1dfd12 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullOrCol.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/ScalarNullOrCol.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashKeyRef.java
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashKeyRef.java
index c7618022f25..8d8a0fa4f22 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashKeyRef.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashKeyRef.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/hooks/HiveProtoLoggingHook.java
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/HiveProtoLoggingHook.java
index 38c0a1419de..b426d3011b0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/HiveProtoLoggingHook.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/HiveProtoLoggingHook.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHook.java
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHook.java
index 7e6e9ad662f..bcb3b732954 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHook.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHook.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.hooks;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContext.java
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContext.java
index 6e19c7f4aed..811e7a1f958 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContext.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContext.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.hooks;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContextImpl.java
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContextImpl.java
index dad0dfbbf4d..2483b389070 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContextImpl.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/hooks/QueryLifeTimeHookContextImpl.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.hooks;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/LlapDataReader.java
b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/LlapDataReader.java
index 95ceea53f3a..f46abf95a09 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/LlapDataReader.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/LlapDataReader.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/StoppableAllocator.java
b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/StoppableAllocator.java
index 0806d787595..92d9d622ac6 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/StoppableAllocator.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/StoppableAllocator.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java
b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java
index f16107a287e..04d498815f0 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/lockmgr/DbTxnManager.java
@@ -1,19 +1,19 @@
/*
- 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 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.
*/
package org.apache.hadoop.hive.ql.lockmgr;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/log/HushableRandomAccessFileAppender.java
b/ql/src/java/org/apache/hadoop/hive/ql/log/HushableRandomAccessFileAppender.java
index 0ff66df4413..5a2e26cd944 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/log/HushableRandomAccessFileAppender.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/log/HushableRandomAccessFileAppender.java
@@ -1,5 +1,3 @@
-package org.apache.hadoop.hive.ql.log;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,7 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
+package org.apache.hadoop.hive.ql.log;
import java.io.Serializable;
import java.util.HashMap;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregatePartitionIncrementalRewritingRule.java
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregatePartitionIncrementalRewritingRule.java
index 7e582ed29bf..b169bebc7a1 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregatePartitionIncrementalRewritingRule.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/calcite/rules/views/HiveAggregatePartitionIncrementalRewritingRule.java
@@ -1,4 +1,3 @@
-package org.apache.hadoop.hive.ql.optimizer.calcite.rules.views;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.hadoop.hive.ql.optimizer.calcite.rules.views;
import org.apache.calcite.plan.RelOptRule;
import org.apache.calcite.plan.RelOptRuleCall;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateDatabaseHandler.java
b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateDatabaseHandler.java
index cf7879875a7..32b85b6ac87 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateDatabaseHandler.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateDatabaseHandler.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateFunctionHandler.java
b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateFunctionHandler.java
index 338c1fea2ef..22f11d99794 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateFunctionHandler.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/parse/repl/load/message/CreateFunctionHandler.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java
b/ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java
index 675da1fee20..1fad55cfe6a 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/TopNKeyDesc.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTopNKeyDesc.java
b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTopNKeyDesc.java
index ee5229368e3..2a8e8146810 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTopNKeyDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/VectorTopNKeyDesc.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/RecordEnricher.java
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/RecordEnricher.java
index bc2db70b1a2..0735112afb7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/RecordEnricher.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/RecordEnricher.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/IcebergRepository.java
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/IcebergRepository.java
index 21cc6643bb5..40ee8c171c2 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/IcebergRepository.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/IcebergRepository.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.queryhistory.repository;
import com.google.common.annotations.VisibleForTesting;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/QueryHistoryRepository.java
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/QueryHistoryRepository.java
index 18ca88a0893..00aa9207482 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/QueryHistoryRepository.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/repository/QueryHistoryRepository.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.queryhistory.repository;
import org.apache.hadoop.hive.conf.HiveConf;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Record.java
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Record.java
index 322fdc9a400..e4a05cb4f84 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Record.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Record.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.queryhistory.schema;
import com.google.common.base.Joiner;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Schema.java
b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Schema.java
index 82332478703..10789be19fa 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Schema.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/queryhistory/schema/Schema.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.ql.queryhistory.schema;
import com.google.common.annotations.VisibleForTesting;
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/metastore/filtercontext/TableFilterContext.java
b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/metastore/filtercontext/TableFilterContext.java
index 50654917f9c..a8c83cfe252 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/metastore/filtercontext/TableFilterContext.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/metastore/filtercontext/TableFilterContext.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/session/ISessionAuthState.java
b/ql/src/java/org/apache/hadoop/hive/ql/session/ISessionAuthState.java
index 83438fafba6..cd4f5c25ea8 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/session/ISessionAuthState.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/session/ISessionAuthState.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
b/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
index 4e43dad5a35..507d5607aa7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/stats/BasicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToString.java
b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToString.java
index 29224177310..df4c05429d7 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToString.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFToString.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/util/UpgradeTool.java
b/ql/src/java/org/apache/hadoop/hive/ql/util/UpgradeTool.java
index c48a90ce459..f412c8b4066 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/util/UpgradeTool.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/util/UpgradeTool.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git
a/ql/src/java/org/apache/hive/benchmark/vectorization/ColumnVectorGenUtil.java
b/ql/src/java/org/apache/hive/benchmark/vectorization/ColumnVectorGenUtil.java
index 2ed5e5e9281..0e64507c760 100644
---
a/ql/src/java/org/apache/hive/benchmark/vectorization/ColumnVectorGenUtil.java
+++
b/ql/src/java/org/apache/hive/benchmark/vectorization/ColumnVectorGenUtil.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java
b/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java
index 7b76f2030ee..c6abfa8ea15 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/repl/TestReplDumpTask.java
@@ -1,4 +1,4 @@
- /*
+/*
* 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
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTotalOrderPartitioner.java
b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTotalOrderPartitioner.java
index cc16fd40a48..b738935784f 100644
---
a/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTotalOrderPartitioner.java
+++
b/ql/src/test/org/apache/hadoop/hive/ql/exec/tez/TestTezTotalOrderPartitioner.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHiveProtoLoggingHook.java
b/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHiveProtoLoggingHook.java
index bff605967cf..5c6c4503dbd 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHiveProtoLoggingHook.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/hooks/TestHiveProtoLoggingHook.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/TestGenMapRedUtilsCreateConditionalTask.java
b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/TestGenMapRedUtilsCreateConditionalTask.java
index 60e3c47413d..283e4ffaf63 100644
---
a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/TestGenMapRedUtilsCreateConditionalTask.java
+++
b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/TestGenMapRedUtilsCreateConditionalTask.java
@@ -1,19 +1,19 @@
/*
- 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 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.
*/
package org.apache.hadoop.hive.ql.optimizer;
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/stats/TestBasicStats.java
b/ql/src/test/org/apache/hadoop/hive/ql/stats/TestBasicStats.java
index eb362f70e23..cb98259dbce 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/stats/TestBasicStats.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/stats/TestBasicStats.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/udf/TestBlockedUdf.java
b/ql/src/test/org/apache/hadoop/hive/ql/udf/TestBlockedUdf.java
index 9a29c4008a3..de7df9ddcc8 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/udf/TestBlockedUdf.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/TestBlockedUdf.java
@@ -10,8 +10,7 @@
* 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 "import
org.apache.hadoop.hive.ql.exec.FunctionInfo;
-AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java
b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java
index 0bc1975fd02..392f95a53ac 100644
---
a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java
+++
b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDAFEvaluator.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFFromUnixTime.java
b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFFromUnixTime.java
index 6032b7454a4..47cc416780b 100644
---
a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFFromUnixTime.java
+++
b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFFromUnixTime.java
@@ -1,4 +1,4 @@
-/*
+/*
* 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
diff --git
a/serde/src/java/org/apache/hadoop/hive/serde2/json/HiveJsonWriter.java
b/serde/src/java/org/apache/hadoop/hive/serde2/json/HiveJsonWriter.java
index cf5c56b8c3a..3d280aad313 100644
--- a/serde/src/java/org/apache/hadoop/hive/serde2/json/HiveJsonWriter.java
+++ b/serde/src/java/org/apache/hadoop/hive/serde2/json/HiveJsonWriter.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/service/src/java/org/apache/hive/service/server/HiveServer2HAInstanceSet.java
b/service/src/java/org/apache/hive/service/server/HiveServer2HAInstanceSet.java
index b31d63cbd35..168484a1e1a 100644
---
a/service/src/java/org/apache/hive/service/server/HiveServer2HAInstanceSet.java
+++
b/service/src/java/org/apache/hive/service/server/HiveServer2HAInstanceSet.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git a/standalone-metastore/checkstyle/asf.header.incremental
b/standalone-metastore/checkstyle/asf.header.incremental
new file mode 100644
index 00000000000..737300ec66d
--- /dev/null
+++ b/standalone-metastore/checkstyle/asf.header.incremental
@@ -0,0 +1,3 @@
+^\/\*$
+^( \*| \* +.*)$
+^ \*\/$
diff --git a/standalone-metastore/checkstyle/checkstyle.xml
b/standalone-metastore/checkstyle/checkstyle.xml
index f21bb3a0681..136918ca4dd 100644
--- a/standalone-metastore/checkstyle/checkstyle.xml
+++ b/standalone-metastore/checkstyle/checkstyle.xml
@@ -64,6 +64,13 @@
<module name="Header">
<property name="headerFile" value="${config_loc}/asf.header"/>
</module>
+ <!-- HIVE-29245: An incremental process to normalize headers. We will
finally remove the following one -->
+ <module name="RegexpHeader">
+ <property name="severity" value="error"/>
+ <property name="headerFile" value="${config_loc}/asf.header.incremental"/>
+ <property name="fileExtensions" value="java"/>
+ <property name="multiLines" value="2"/>
+ </module>
<!-- Maximum file line length -->
<module name="FileLength">
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
index 829d6cd4782..10620acd618 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DefaultPartitionExpressionProxy.java
@@ -1,4 +1,3 @@
-package org.apache.hadoop.hive.metastore;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.hadoop.hive.metastore;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.FileMetadataExprType;
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MsckPartitionExpressionProxy.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MsckPartitionExpressionProxy.java
index 094a80cac1c..999fbaea0aa 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MsckPartitionExpressionProxy.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MsckPartitionExpressionProxy.java
@@ -1,4 +1,3 @@
-package org.apache.hadoop.hive.metastore;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -16,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.hadoop.hive.metastore;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PropertyServlet.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PropertyServlet.java
index 78fda7e0dc7..adea578f239 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PropertyServlet.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/PropertyServlet.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
index 031571adcf5..c5a83ef5d7f 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
index dc35f4969f9..43fc242e1f2 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/TableFields.java
@@ -1,4 +1,4 @@
- /*
+/*
* 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java
index 111cb6007ec..ff82e9d4683 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/AlterTableEvent.java
@@ -1,6 +1,5 @@
/*
* 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
index 31db0e9cb49..49a719b8096 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/events/PreAlterTableEvent.java
@@ -1,6 +1,5 @@
/*
* 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java
index 84910c1dd86..e9fdfca2e75 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AbortTxnMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java
index e2c9ccf53d6..343aade2cd3 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/AcidWriteMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitCompactionMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitCompactionMessage.java
index dabc224a3e8..fa81ac685a4 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitCompactionMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitCompactionMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java
index 9733039f06a..74753762cd9 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/CommitTxnMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeletePartitionColumnStatMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeletePartitionColumnStatMessage.java
index d8166c3ce2e..3e6256d5e72 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeletePartitionColumnStatMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeletePartitionColumnStatMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeleteTableColumnStatMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeleteTableColumnStatMessage.java
index 61893b23d80..b4867bf00b9 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeleteTableColumnStatMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/DeleteTableColumnStatMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdatePartitionColumnStatMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdatePartitionColumnStatMessage.java
index e92a0dc9a39..7f285e2c01b 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdatePartitionColumnStatMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdatePartitionColumnStatMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdateTableColumnStatMessage.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdateTableColumnStatMessage.java
index e3f049c48c0..2fce670034d 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdateTableColumnStatMessage.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/messaging/UpdateTableColumnStatMessage.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java
index 647425a1bad..8faa6471c1e 100644
---
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java
+++
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/model/MTable.java
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java
index 6854ab9315e..f6a1c34da73 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestCatalogs.java
@@ -1,3 +1,20 @@
+/*
+ * 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>
+ * 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.hadoop.hive.metastore.client;
import org.apache.hadoop.hive.metastore.IMetaStoreClient;
@@ -33,23 +50,6 @@
import static org.apache.hadoop.hive.metastore.Warehouse.DEFAULT_DATABASE_NAME;
-/**
- * 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>
- * 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.
- */
@RunWith(Parameterized.class)
@Category(MetastoreCheckinTest.class)
public class TestCatalogs extends MetaStoreClientTest {
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java
index e65314af9de..050ddd3a9ae 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestRuntimeStats.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/events/TestAbortTxnEventDbsUpdated.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/events/TestAbortTxnEventDbsUpdated.java
index 90823ecbbc0..c4f897a49b8 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/events/TestAbortTxnEventDbsUpdated.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/events/TestAbortTxnEventDbsUpdated.java
@@ -14,7 +14,7 @@
* 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.hadoop.hive.metastore.events;
import org.apache.hadoop.hive.metastore.annotation.MetastoreUnitTest;
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientSslTest.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientSslTest.java
index 3be4038bf7c..4a276ef87ba 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientSslTest.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientSslTest.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientTest.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientTest.java
index 4cef48a5b71..f249404edb3 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientTest.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSHttpClientTest.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientSslTest.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientSslTest.java
index 699cbc19df3..a8d52aa1713 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientSslTest.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientSslTest.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientTest.java
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientTest.java
index 40b833842bc..59ab3a0040c 100644
---
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientTest.java
+++
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/properties/HMSJsonClientTest.java
@@ -1,4 +1,5 @@
-/* * Licensed to the Apache Software Foundation (ASF) under one
+/*
+ * 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
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index ebc9efe7571..66222000041 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -692,6 +692,7 @@
<excludes>
<exclude>*.patch</exclude>
<exclude>DEV-README</exclude>
+ <exclude>checkstyle/**</exclude>
<exclude>**/src/main/sql/**</exclude>
<exclude>**/README.md</exclude>
<exclude>**/*.iml</exclude>
diff --git a/storage-api/checkstyle/asf.header.incremental
b/storage-api/checkstyle/asf.header.incremental
new file mode 100644
index 00000000000..737300ec66d
--- /dev/null
+++ b/storage-api/checkstyle/asf.header.incremental
@@ -0,0 +1,3 @@
+^\/\*$
+^( \*| \* +.*)$
+^ \*\/$
diff --git a/storage-api/checkstyle/checkstyle.xml
b/storage-api/checkstyle/checkstyle.xml
index a920085b9ba..3d84d1de4d6 100644
--- a/storage-api/checkstyle/checkstyle.xml
+++ b/storage-api/checkstyle/checkstyle.xml
@@ -64,6 +64,13 @@
<module name="Header">
<property name="headerFile" value="${config_loc}/asf.header"/>
</module>
+ <!-- HIVE-29245: An incremental process to normalize headers. We will
finally remove the following one -->
+ <module name="RegexpHeader">
+ <property name="severity" value="error"/>
+ <property name="headerFile" value="${config_loc}/asf.header.incremental"/>
+ <property name="fileExtensions" value="java"/>
+ <property name="multiLines" value="2"/>
+ </module>
<!-- Maximum file line length -->
<module name="FileLength">
diff --git a/storage-api/pom.xml b/storage-api/pom.xml
index 664ff63f967..625fdb4be09 100644
--- a/storage-api/pom.xml
+++ b/storage-api/pom.xml
@@ -243,6 +243,11 @@
</goals>
</execution>
</executions>
+ <configuration>
+ <excludes>
+ <exclude>checkstyle/**</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
