hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1437843 - in /hadoop/common/branches/HDFS-2802: ./ dev-support/ hadoop-dist/ hadoop-maven-plugins/ hadoop-maven-plugins/src/ hadoop-maven-plugins/src/main/ hadoop-maven-plugins/src/main/java/ hadoop-maven-plugins/src/main/java/org/ hadoop-...
Date Thu, 24 Jan 2013 02:45:50 GMT
Author: szetszwo
Date: Thu Jan 24 02:45:45 2013
New Revision: 1437843

URL: http://svn.apache.org/viewvc?rev=1437843&view=rev
Log:
Merge r1432789 through r1437840 from trunk.

Added:
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/pom.xml
      - copied unchanged from r1437840, hadoop/common/trunk/hadoop-maven-plugins/pom.xml
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
      - copied unchanged from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
      - copied unchanged from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/FileSetUtils.java
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/
      - copied from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/
    hadoop/common/branches/HDFS-2802/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
      - copied unchanged from r1437840, hadoop/common/trunk/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/versioninfo/VersionInfoMojo.java
Modified:
    hadoop/common/branches/HDFS-2802/   (props changed)
    hadoop/common/branches/HDFS-2802/dev-support/test-patch.sh
    hadoop/common/branches/HDFS-2802/hadoop-dist/pom.xml
    hadoop/common/branches/HDFS-2802/hadoop-project/pom.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/pom.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
    hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-tools-dist/pom.xml
    hadoop/common/branches/HDFS-2802/hadoop-tools/pom.xml
    hadoop/common/branches/HDFS-2802/pom.xml

Propchange: hadoop/common/branches/HDFS-2802/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1432789-1437840

Modified: hadoop/common/branches/HDFS-2802/dev-support/test-patch.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/dev-support/test-patch.sh?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-2802/dev-support/test-patch.sh Thu Jan 24 02:45:45 2013
@@ -980,12 +980,12 @@ fi
 (( RESULT = RESULT + $JAVAC_RET ))
 checkJavadocWarnings
 (( RESULT = RESULT + $? ))
-checkEclipseGeneration
-(( RESULT = RESULT + $? ))
 ### Checkstyle not implemented yet
 #checkStyle
 #(( RESULT = RESULT + $? ))
 buildAndInstall
+checkEclipseGeneration
+(( RESULT = RESULT + $? ))
 checkFindbugsWarnings
 (( RESULT = RESULT + $? ))
 checkReleaseAuditWarnings

Modified: hadoop/common/branches/HDFS-2802/hadoop-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-dist/pom.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-dist/pom.xml Thu Jan 24 02:45:45 2013
@@ -66,9 +66,6 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
-          <includes>
-            <include>pom.xml</include>
-          </includes>
         </configuration>
       </plugin>
     </plugins>

Modified: hadoop/common/branches/HDFS-2802/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-project/pom.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-project/pom.xml Thu Jan 24 02:45:45 2013
@@ -769,6 +769,11 @@
           <artifactId>maven-pdf-plugin</artifactId>
           <version>1.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-maven-plugins</artifactId>
+          <version>${project.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml
Thu Jan 24 02:45:45 2013
@@ -1,5 +1,20 @@
 <?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
+
+      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.
+-->
 
 <!-- Do not modify this file directly. Anything that need to be overwritten,
      need to be done so, through -D switches or customized conf -->

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/appendix.xml
Thu Jan 24 02:45:45 2013
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      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.
+-->
 <document xmlns="http://maven.apache.org/XDOC/2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/architecture.xml
Thu Jan 24 02:45:45 2013
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      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.
+-->
 <document xmlns="http://maven.apache.org/XDOC/2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/cli.xml Thu
Jan 24 02:45:45 2013
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      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.
+-->
 <document xmlns="http://maven.apache.org/XDOC/2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/index.xml Thu
Jan 24 02:45:45 2013
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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
+
+      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.
+-->
 <document xmlns="http://maven.apache.org/XDOC/2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/site/xdoc/usage.xml Thu
Jan 24 02:45:45 2013
@@ -1,3 +1,18 @@
+<!--
+  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
+
+      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.
+-->
 <document xmlns="http://maven.apache.org/XDOC/2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-distcp/src/test/resources/sslConfig.xml
Thu Jan 24 02:45:45 2013
@@ -1,5 +1,20 @@
 <?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
+
+      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.
+-->
 
 <configuration>
 

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/pom.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/pom.xml Thu Jan 24 02:45:45
2013
@@ -57,6 +57,9 @@
                     <exec executable="make" dir="${project.build.directory}/native" failonerror="true">
                       <arg line="VERBOSE=1"/>
                     </exec>
+                    <!-- The second make is a workaround for HADOOP-9215.  It can
+                         be removed when version 2.6 of cmake is no longer supported . -->
+                    <exec executable="make" dir="${project.build.directory}/native" failonerror="true"></exec>
                   </target>
                 </configuration>
               </execution>

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
Thu Jan 24 02:45:45 2013
@@ -1,4 +1,21 @@
 <?xml version="1.0"?>
+<!--
+   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.
+-->
+
 <configuration>
 
 <property>

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
Thu Jan 24 02:45:45 2013
@@ -1,4 +1,21 @@
 <?xml version="1.0"?>
+<!--
+   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.
+-->
+
 <configuration>
 
 <property>

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
Thu Jan 24 02:45:45 2013
@@ -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.
 info threads
 backtrace
 quit

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
Thu Jan 24 02:45:45 2013
@@ -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.
 core=`find . -name 'core*'`
 #Only pipes programs have 5th argument as program name.
 gdb -quiet $5 -c $core -x $HADOOP_PREFIX/src/c++/pipes/debug/pipes-default-gdb-commands.txt


Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
(original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/anonymization/WordList.java
Thu Jan 24 02:45:45 2013
@@ -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.
+*/
 package org.apache.hadoop.tools.rumen.anonymization;
 
 import java.util.HashMap;

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-tools-dist/pom.xml Thu Jan 24 02:45:45
2013
@@ -91,9 +91,6 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
-          <includes>
-            <include>pom.xml</include>
-          </includes>
         </configuration>
       </plugin>
     </plugins>

Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/pom.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-tools/pom.xml Thu Jan 24 02:45:45 2013
@@ -54,9 +54,6 @@
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>
-          <includes>
-            <include>pom.xml</include>
-          </includes>
         </configuration>
       </plugin>
     </plugins>

Modified: hadoop/common/branches/HDFS-2802/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/pom.xml?rev=1437843&r1=1437842&r2=1437843&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/pom.xml (original)
+++ hadoop/common/branches/HDFS-2802/pom.xml Thu Jan 24 02:45:45 2013
@@ -36,12 +36,12 @@ xsi:schemaLocation="http://maven.apache.
 
   <distributionManagement>
     <repository>
-      <id>apache.staging.https</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>https://repository.apache.org/service/local/staging/deploy/maven2</url>
+      <id>${distMgmtStagingId}</id>
+      <name>${distMgmtStagingName}</name>
+      <url>${distMgmtStagingUrl}</url>
     </repository>
     <snapshotRepository>
-      <id>apache.snapshots.https</id>
+      <id>${distMgmtSnapshotsId}</id>
       <name>${distMgmtSnapshotsName}</name>
       <url>${distMgmtSnapshotsUrl}</url>
     </snapshotRepository>
@@ -53,7 +53,7 @@ xsi:schemaLocation="http://maven.apache.
 
   <repositories>
     <repository>
-      <id>apache.snapshots.https</id>
+      <id>${distMgmtSnapshotsId}</id>
       <name>${distMgmtSnapshotsName}</name>
       <url>${distMgmtSnapshotsUrl}</url>
     </repository>
@@ -79,14 +79,19 @@ xsi:schemaLocation="http://maven.apache.
   </organization>
 
   <properties>
+    <distMgmtSnapshotsId>apache.snapshots.https</distMgmtSnapshotsId>
     <distMgmtSnapshotsName>Apache Development Snapshot Repository</distMgmtSnapshotsName>
     <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl>
+    <distMgmtStagingId>apache.staging.https</distMgmtStagingId>
+    <distMgmtStagingName>Apache Release Distribution Repository</distMgmtStagingName>
+    <distMgmtStagingUrl>https://repository.apache.org/service/local/staging/deploy/maven2</distMgmtStagingUrl>
   </properties>
 
   <modules>
     <module>hadoop-project</module>
     <module>hadoop-project-dist</module>
     <module>hadoop-assemblies</module>
+    <module>hadoop-maven-plugins</module>
     <module>hadoop-common-project</module>
     <module>hadoop-hdfs-project</module>
     <module>hadoop-yarn-project</module>
@@ -294,12 +299,14 @@ xsi:schemaLocation="http://maven.apache.
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>dev-support/*</include>
-            <include>pom.xml</include>
-          </includes>
-        </configuration>
+       <configuration>
+          <excludes>
+            <exclude>.gitattributes</exclude>
+            <exclude>.gitignore</exclude>
+            <exclude>.git/**</exclude>
+            <exclude>.idea/**</exclude>
+         </excludes>
+       </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-site-plugin</artifactId>



Mime
View raw message