diff --git a/CHANGES.txt b/CHANGES.txt index 716b9aae5ef..a43f5a72053 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -492,6 +492,8 @@ Trunk (unreleased changes) HADOOP-6176. Add a couple package private methods to AccessTokenHandler for testing. (Kan Zhang via szetszwo) + + HADOOP-6182. Fix ReleaseAudit warnings (Giridharan Kesavan and Lee Tucker via gkesavan) OPTIMIZATIONS diff --git a/build.xml b/build.xml index 0fb388239d5..07a9cc447d0 100644 --- a/build.xml +++ b/build.xml @@ -1021,9 +1021,14 @@ - - + + + + + + + diff --git a/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh b/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh index a95f4fa1f33..49ce37cf02c 100644 --- a/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh +++ b/src/contrib/ec2/bin/hadoop-ec2-init-remote.sh @@ -1,5 +1,18 @@ #!/usr/bin/env bash +# 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. + + ################################################################################ # Script that is run on each EC2 instance on boot. It is passed in the EC2 user # data, so should not exceed 16K in size. diff --git a/src/contrib/ec2/bin/image/ec2-run-user-data b/src/contrib/ec2/bin/image/ec2-run-user-data index 8ca7d430c94..5f2e9050154 100644 --- a/src/contrib/ec2/bin/image/ec2-run-user-data +++ b/src/contrib/ec2/bin/image/ec2-run-user-data @@ -1,5 +1,17 @@ #!/bin/bash + +# 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. + # ec2-run-user-data - Run instance user-data if it looks like a script. # # Only retrieves and runs the user-data script once per instance. If diff --git a/src/contrib/failmon/ivy.xml b/src/contrib/failmon/ivy.xml index ccc6079aa5d..b1f1d2241c0 100644 --- a/src/contrib/failmon/ivy.xml +++ b/src/contrib/failmon/ivy.xml @@ -1,4 +1,20 @@ - + + diff --git a/src/contrib/failmon/ivy/libraries.properties b/src/contrib/failmon/ivy/libraries.properties index a470b372ad3..8a80dd81a99 100644 --- a/src/contrib/failmon/ivy/libraries.properties +++ b/src/contrib/failmon/ivy/libraries.properties @@ -1,3 +1,15 @@ +# 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. + #This properties file lists the versions of the various artifacts used by streaming. #It drives ivy and the generation of a maven POM diff --git a/src/contrib/hod/bin/verify-account b/src/contrib/hod/bin/verify-account index 65aa79ab44e..56ecde06c67 100644 --- a/src/contrib/hod/bin/verify-account +++ b/src/contrib/hod/bin/verify-account @@ -1,4 +1,16 @@ #!/bin/sh +# 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. + # This script file is a stub for systems that might want to include # checks for the account name that is passed to HOD. It will be # launched by HOD with the account name as an argument. The script diff --git a/src/contrib/hod/ivy.xml b/src/contrib/hod/ivy.xml index e775663256e..2fca52c78bc 100644 --- a/src/contrib/hod/ivy.xml +++ b/src/contrib/hod/ivy.xml @@ -1,3 +1,20 @@ + + diff --git a/src/contrib/hod/ivy/libraries.properties b/src/contrib/hod/ivy/libraries.properties index a470b372ad3..afd78e902f2 100644 --- a/src/contrib/hod/ivy/libraries.properties +++ b/src/contrib/hod/ivy/libraries.properties @@ -1,4 +1,16 @@ -#This properties file lists the versions of the various artifacts used by streaming. +# 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. + +This properties file lists the versions of the various artifacts used by streaming. #It drives ivy and the generation of a maven POM #Please list the dependencies name with version if they are different from the ones diff --git a/src/contrib/test/core-site.xml b/src/contrib/test/core-site.xml index 0ebbbeae369..36c912d52e9 100644 --- a/src/contrib/test/core-site.xml +++ b/src/contrib/test/core-site.xml @@ -1,3 +1,19 @@ + diff --git a/src/contrib/test/hadoop-site.xml b/src/contrib/test/hadoop-site.xml index 352c4ff01ec..69a3bc887bf 100644 --- a/src/contrib/test/hadoop-site.xml +++ b/src/contrib/test/hadoop-site.xml @@ -1,3 +1,19 @@ + diff --git a/src/contrib/test/hdfs-site.xml b/src/contrib/test/hdfs-site.xml index cbd6ab6eff7..f7e80a9e040 100644 --- a/src/contrib/test/hdfs-site.xml +++ b/src/contrib/test/hdfs-site.xml @@ -1,3 +1,19 @@ + diff --git a/src/contrib/test/mapred-site.xml b/src/contrib/test/mapred-site.xml index 355da3416f2..927980e9547 100644 --- a/src/contrib/test/mapred-site.xml +++ b/src/contrib/test/mapred-site.xml @@ -1,3 +1,19 @@ + diff --git a/src/java/core-default.xml b/src/java/core-default.xml index 401cccb27d6..1ccea2becc4 100644 --- a/src/java/core-default.xml +++ b/src/java/core-default.xml @@ -1,4 +1,20 @@ + diff --git a/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java b/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java index 2594717113c..143a3b2c3d2 100644 --- a/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java +++ b/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyCompressor.java @@ -1,3 +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 + * + * 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.io.compress.bzip2; import java.io.IOException; diff --git a/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java b/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java index 15308fbd038..4862f25e828 100644 --- a/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java +++ b/src/java/org/apache/hadoop/io/compress/bzip2/BZip2DummyDecompressor.java @@ -1,3 +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 + * + * 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.io.compress.bzip2; import java.io.IOException; diff --git a/src/test/bin/test-patch.sh b/src/test/bin/test-patch.sh index ccfdccc2dac..c2135bf522c 100755 --- a/src/test/bin/test-patch.sh +++ b/src/test/bin/test-patch.sh @@ -1,4 +1,16 @@ #!/usr/bin/env bash +# 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. + #set -x ulimit -n 1024 diff --git a/src/test/checkstyle-noframes-sorted.xsl b/src/test/checkstyle-noframes-sorted.xsl index 5f9e93ba276..b7826e37c12 100644 --- a/src/test/checkstyle-noframes-sorted.xsl +++ b/src/test/checkstyle-noframes-sorted.xsl @@ -1,3 +1,19 @@ + diff --git a/src/test/checkstyle.xml b/src/test/checkstyle.xml index 5e3b89466c7..24e2aa25bff 100644 --- a/src/test/checkstyle.xml +++ b/src/test/checkstyle.xml @@ -3,6 +3,22 @@ "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> + diff --git a/src/test/core/org/apache/hadoop/cli/testConf.xml b/src/test/core/org/apache/hadoop/cli/testConf.xml index 3250aa67a18..ca04afd7089 100644 --- a/src/test/core/org/apache/hadoop/cli/testConf.xml +++ b/src/test/core/org/apache/hadoop/cli/testConf.xml @@ -1,6 +1,21 @@ + diff --git a/src/test/core/org/apache/hadoop/cli/testConf.xsl b/src/test/core/org/apache/hadoop/cli/testConf.xsl index 09fb0b7a500..b7788adc07a 100644 --- a/src/test/core/org/apache/hadoop/cli/testConf.xsl +++ b/src/test/core/org/apache/hadoop/cli/testConf.xsl @@ -1,3 +1,19 @@ + diff --git a/src/test/core/org/apache/hadoop/conf/empty-configuration.xml b/src/test/core/org/apache/hadoop/conf/empty-configuration.xml index a2086fa683f..af69c44af26 100644 --- a/src/test/core/org/apache/hadoop/conf/empty-configuration.xml +++ b/src/test/core/org/apache/hadoop/conf/empty-configuration.xml @@ -1,3 +1,19 @@ + diff --git a/src/test/core/org/apache/hadoop/filecache/TestDistributedCache.java b/src/test/core/org/apache/hadoop/filecache/TestDistributedCache.java index efe065b450f..a8cf6fd7621 100644 --- a/src/test/core/org/apache/hadoop/filecache/TestDistributedCache.java +++ b/src/test/core/org/apache/hadoop/filecache/TestDistributedCache.java @@ -1,3 +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 + * + * 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.filecache; import java.io.IOException; diff --git a/src/test/ddl/buffer.jr b/src/test/ddl/buffer.jr index 797aa67bb39..a6094641e9c 100644 --- a/src/test/ddl/buffer.jr +++ b/src/test/ddl/buffer.jr @@ -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 + * + * 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. + */ module org.apache.hadoop.record { class RecBuffer { buffer data; diff --git a/src/test/ddl/int.jr b/src/test/ddl/int.jr index 61eae7f3b74..8068bf3269c 100644 --- a/src/test/ddl/int.jr +++ b/src/test/ddl/int.jr @@ -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 + * + * 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. + */ module org.apache.hadoop.record { class RecInt { int data; diff --git a/src/test/ddl/string.jr b/src/test/ddl/string.jr index cdd3e70a8a0..94abdf58540 100644 --- a/src/test/ddl/string.jr +++ b/src/test/ddl/string.jr @@ -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 + * + * 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. + */ module org.apache.hadoop.record { class RecString { ustring data; diff --git a/src/test/ddl/test.jr b/src/test/ddl/test.jr index 46c181d1c89..b7f44d8bb18 100644 --- a/src/test/ddl/test.jr +++ b/src/test/ddl/test.jr @@ -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 + * + * 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. + */ module org.apache.hadoop.record { class RecRecord0 { ustring stringVal; diff --git a/src/test/findbugsExcludeFile.xml b/src/test/findbugsExcludeFile.xml index d5852856d82..9ad4b89c18d 100644 --- a/src/test/findbugsExcludeFile.xml +++ b/src/test/findbugsExcludeFile.xml @@ -1,3 +1,19 @@ + diff --git a/src/test/hadoop-policy.xml b/src/test/hadoop-policy.xml index f57800f64d3..0f5310c76f0 100644 --- a/src/test/hadoop-policy.xml +++ b/src/test/hadoop-policy.xml @@ -1,5 +1,21 @@ + diff --git a/src/test/hadoop-site.xml b/src/test/hadoop-site.xml index 352c4ff01ec..a7c4f7c902c 100644 --- a/src/test/hadoop-site.xml +++ b/src/test/hadoop-site.xml @@ -1,5 +1,21 @@ + diff --git a/src/test/log4j.properties b/src/test/log4j.properties index 1a2122a95e5..1a6baaec65a 100644 --- a/src/test/log4j.properties +++ b/src/test/log4j.properties @@ -1,3 +1,14 @@ +# 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. # log4j configuration used during build and unit tests log4j.rootLogger=info,stdout