YARN-6584. Correct license headers in hadoop-common, hdfs, yarn and mapreduce. Contributed by Yeliang Cang.

hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.security.authentication.util;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@ package org.apache.hadoop.security.authentication.util;
  * limitations under the License.
  */
 
+package org.apache.hadoop.security.authentication.util;
+
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

hadoop-common-project/hadoop-auth/src/test/java/org/apache/hadoop/security/authentication/util/TestKerberosName.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.security.authentication.util;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.security.authentication.util;
  * limitations under the License.
  */
 
+package org.apache.hadoop.security.authentication.util;
+
 import java.io.IOException;
 
 import org.apache.hadoop.security.authentication.KerberosTestUtils;

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java

@@ -1,4 +1,3 @@
-package org.apache.hadoop.fs;
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,6 +15,9 @@ package org.apache.hadoop.fs;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package org.apache.hadoop.fs;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/BloomFilterCommonTester.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.util.bloom;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.util.bloom;
  * limitations under the License.
  */
 
+package org.apache.hadoop.util.bloom;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/bloom/TestBloomFilters.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.util.bloom;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.util.bloom;
  * limitations under the License.
  */
 
+package org.apache.hadoop.util.bloom;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/DirectoryListing.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
@@ -14,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.hadoop.hdfs.protocol;
 
 import org.apache.hadoop.classification.InterfaceAudience;

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestTools.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.tools;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,6 +15,9 @@ package org.apache.hadoop.tools;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package org.apache.hadoop.tools;
+
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayOutputStream;

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestShuffleProvider.java

@@ -1,4 +1,3 @@
-/**
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServicesAttempts.java

@@ -1,4 +1,3 @@
-/**
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobContextImpl.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

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TaskAttemptContextImpl.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

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestMRCredentials.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.mapreduce.security;
-
 /** 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
@@ -17,6 +15,7 @@ package org.apache.hadoop.mapreduce.security;
  * limitations under the License.
  */
 
+package org.apache.hadoop.mapreduce.security;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;

hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/WordMean.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.examples;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.examples;
  * limitations under the License.
  */
 
+package org.apache.hadoop.examples;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/WordMedian.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.examples;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.examples;
  * limitations under the License.
  */
 
+package org.apache.hadoop.examples;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/WordStandardDeviation.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.examples;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.examples;
  * limitations under the License.
  */
 
+package org.apache.hadoop.examples;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;

hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/shade/resource/ServicesResourceTransformer.java

@@ -1,4 +1,3 @@
-package org.apache.hadoop.maven.plugin.shade.resource;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +17,9 @@ package org.apache.hadoop.maven.plugin.shade.resource;
  * under the License.
  *
  */
+
+package org.apache.hadoop.maven.plugin.shade.resource;
+
 import java.io.BufferedReader;
 import org.apache.maven.plugins.shade.relocation.Relocator;
 import org.apache.maven.plugins.shade.resource.ResourceTransformer;

hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCpConstants.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.tools;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.tools;
  * limitations under the License.
  */
 
+package org.apache.hadoop.tools;
+
 import org.apache.hadoop.fs.Path;
 
 /**

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/recovery/records/TimelineDelegationTokenIdentifierData.java

@@ -1,5 +1,3 @@
-package org.apache.hadoop.yarn.server.timeline.recovery.records;
-
 /**
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,8 @@ package org.apache.hadoop.yarn.server.timeline.recovery.records;
  * limitations under the License.
  */
 
+package org.apache.hadoop.yarn.server.timeline.recovery.records;
+
 import org.apache.hadoop.yarn.proto.YarnServerTimelineServerRecoveryProtos.TimelineDelegationTokenIdentifierDataProto;
 import org.apache.hadoop.yarn.security.client.TimelineDelegationTokenIdentifier;