Author: wang
Date: Mon Jun 16 23:27:03 2014
New Revision: 1603026
URL: http://svn.apache.org/r1603026
Log:
HADOOP-10666. Remove Copyright /d/d/d/d Apache Software Foundation from the
source files license header. Contributed by Henry Saputra.
Modified:
hadoop/common/branches/branch-2/ (props changed)
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
Propchange: hadoop/common/branches/branch-2/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1603025
Modified:
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java?rev=1603026&r1=1603025&r2=1603026&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
Mon Jun 16 23:27:03 2014
@@ -1,6 +1,4 @@
/*
- * Copyright 2012 The Apache Software Foundation.
- *
* 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
Modified:
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java?rev=1603026&r1=1603025&r2=1603026&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
Mon Jun 16 23:27:03 2014
@@ -1,6 +1,4 @@
/*
- * Copyright 2012 The Apache Software Foundation.
- *
* 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
Modified:
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java?rev=1603026&r1=1603025&r2=1603026&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
Mon Jun 16 23:27:03 2014
@@ -1,6 +1,4 @@
/*
- * Copyright 2012 The Apache Software Foundation.
- *
* 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
Modified:
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java?rev=1603026&r1=1603025&r2=1603026&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
Mon Jun 16 23:27:03 2014
@@ -1,6 +1,4 @@
/*
- * Copyright 2012 The Apache Software Foundation.
- *
* 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
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml?rev=1603026&r1=1603025&r2=1603026&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
Mon Jun 16 23:27:03 2014
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
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
Modified:
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml?rev=1603026&r1=1603025&r2=1603026&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
(original)
+++
hadoop/common/branches/branch-2/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
Mon Jun 16 23:27:03 2014
@@ -1,8 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
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
