You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ni...@apache.org on 2009/03/14 05:30:43 UTC
svn commit: r753599 - in /hadoop/core/branches/branch-0.20: ./ CHANGES.txt
build.xml ivy.xml ivy/hadoop-core.pom ivy/ivysettings.xml
ivy/libraries.properties
Author: nigel
Date: Sat Mar 14 04:30:42 2009
New Revision: 753599
URL: http://svn.apache.org/viewvc?rev=753599&view=rev
Log:
Merge of -r 746337:746338 from trunk to branch 0.20 to fix HADOOP-5275.
Modified:
hadoop/core/branches/branch-0.20/ (props changed)
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/build.xml
hadoop/core/branches/branch-0.20/ivy.xml
hadoop/core/branches/branch-0.20/ivy/hadoop-core.pom
hadoop/core/branches/branch-0.20/ivy/ivysettings.xml
hadoop/core/branches/branch-0.20/ivy/libraries.properties
Propchange: hadoop/core/branches/branch-0.20/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 14 04:30:42 2009
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19:713112
-/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746902-746903,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346
+/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=753599&r1=753598&r2=753599&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Sat Mar 14 04:30:42 2009
@@ -344,6 +344,9 @@
HADOOP-5466. Change documenation CSS style for headers and code. (Corinne
Chandel via szetszwo)
+ HADOOP-5275. Add ivy directory and files to built tar.
+ (Giridharan Kesavan via nigel)
+
OPTIMIZATIONS
HADOOP-3293. Fixes FileInputFormat to do provide locations for splits
Modified: hadoop/core/branches/branch-0.20/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/build.xml?rev=753599&r1=753598&r2=753599&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/build.xml (original)
+++ hadoop/core/branches/branch-0.20/build.xml Sat Mar 14 04:30:42 2009
@@ -1093,6 +1093,12 @@
<fileset dir="${build.docs}"/>
</copy>
+ <copy file="ivy.xml" tofile="${dist.dir}/ivy.xml"/>
+
+ <copy todir="${dist.dir}/ivy">
+ <fileset dir="ivy"/>
+ </copy>
+
<copy todir="${dist.dir}">
<fileset dir=".">
<include name="*.txt" />
Modified: hadoop/core/branches/branch-0.20/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/ivy.xml?rev=753599&r1=753598&r2=753599&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/ivy.xml (original)
+++ hadoop/core/branches/branch-0.20/ivy.xml Sat Mar 14 04:30:42 2009
@@ -1,4 +1,22 @@
<?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.
+-->
+
<ivy-module version="1.0">
<info organisation="org.apache.hadoop" module="${ant.project.name}">
<license name="Apache 2.0"/>
Modified: hadoop/core/branches/branch-0.20/ivy/hadoop-core.pom
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/ivy/hadoop-core.pom?rev=753599&r1=753598&r2=753599&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/ivy/hadoop-core.pom (original)
+++ hadoop/core/branches/branch-0.20/ivy/hadoop-core.pom Sat Mar 14 04:30:42 2009
@@ -1,9 +1,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
<!--
- This POM is released under the Apache License, Version 2.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.
-->
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
Modified: hadoop/core/branches/branch-0.20/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/ivy/ivysettings.xml?rev=753599&r1=753598&r2=753599&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/ivy/ivysettings.xml (original)
+++ hadoop/core/branches/branch-0.20/ivy/ivysettings.xml Sat Mar 14 04:30:42 2009
@@ -1,5 +1,23 @@
<ivysettings>
- <!--
+
+ <!--
+ 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.
+-->
+
+ <!--
see http://www.jayasoft.org/ivy/doc/configuration
-->
<!-- you can override this property to use mirrors
@@ -60,4 +78,4 @@
<!--until commons cli is external, we need to pull it in from the snapshot repository -if present -->
<module organisation="org.apache.commons" name=".*" resolver="external-and-snapshots"/>
</modules>
-</ivysettings>
\ No newline at end of file
+</ivysettings>
Modified: hadoop/core/branches/branch-0.20/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/ivy/libraries.properties?rev=753599&r1=753598&r2=753599&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/ivy/libraries.properties (original)
+++ hadoop/core/branches/branch-0.20/ivy/libraries.properties Sat Mar 14 04:30:42 2009
@@ -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 hadoop and components.
#It drives ivy and the generation of a maven POM