@@ -344,6 +344,9 @@ Release 0.20.0 - Unreleased 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 CHANGES.txt @@ -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" /> build.xml @@ -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"/> ivy.xml @@ -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> ivy/hadoop-core.pom @@ -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> ivy/ivysettings.xml @@ -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 ivy/libraries.properties e6bce7cd96f7b567a6b349b0edca6f18810bab63 Nigel Daley nigel@apache.org http://github.com/yahoo/hadoop/commit/b6fa171e1e11455e4b70cad59d3da9d127818e2e b6fa171e1e11455e4b70cad59d3da9d127818e2e 2009-03-13T21:30:42-07:00 2009-03-13T21:30:42-07:00 Merge of -r 746337:746338 from trunk to branch 0.20 to fix HADOOP-5275. git-svn-id: https://svn.eu.apache.org/repos/asf/hadoop/core/branches/branch-0.20@753599 13f79535-47bb-0310-9956-ffa450edef68 57990459e18502750eb3bc281bab46d032967128 Nigel Daley nigel@apache.org