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 jo...@apache.org on 2009/02/28 15:42:54 UTC
svn commit: r748861 - in /hadoop/core/trunk: CHANGES.txt build.xml ivy.xml
ivy/libraries.properties
Author: johan
Date: Sat Feb 28 14:42:53 2009
New Revision: 748861
URL: http://svn.apache.org/viewvc?rev=748861&view=rev
Log:
HADOOP-5229. Remove duplicate version variables in build files (Stefan Groschupf via johan)
Modified:
hadoop/core/trunk/CHANGES.txt
hadoop/core/trunk/build.xml
hadoop/core/trunk/ivy.xml
hadoop/core/trunk/ivy/libraries.properties
Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=748861&r1=748860&r2=748861&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Sat Feb 28 14:42:53 2009
@@ -259,6 +259,9 @@
HADOOP-5273. Add license header to TestJobInProgress.java. (Jakob Homan
via szetszwo)
+
+ HADOOP-5229. Remove duplicate version variables in build files
+ (Stefan Groschupf via johan)
Release 0.20.0 - Unreleased
Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=748861&r1=748860&r2=748861&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Sat Feb 28 14:42:53 2009
@@ -177,15 +177,15 @@
<property name="common.ivy.lib.dir" location="${build.ivy.lib.dir}/${ant.project.name}/common"/>
<property name="build.ivy.report.dir" location="${build.ivy.dir}/report" />
<property name="build.ivy.maven.dir" location="${build.ivy.dir}/maven" />
- <property name="build.ivy.maven.pom" location="${build.ivy.maven.dir}/hadoop-core-${hadoop.version}.pom" />
- <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${hadoop.version}.jar" />
+ <property name="build.ivy.maven.pom" location="${build.ivy.maven.dir}/hadoop-core-${version}.pom" />
+ <property name="build.ivy.maven.jar" location="${build.ivy.maven.dir}/hadoop-core-${version}.jar" />
<!--this is the naming policy for artifacts we want pulled down-->
<property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[conf]/[artifact]-[revision].[ext]"/>
<!--this is how artifacts that get built are named-->
<property name="ivy.publish.pattern" value="hadoop-[revision]-core.[ext]"/>
- <property name="hadoop.jar" location="${build.dir}/hadoop-${hadoop.version}-core.jar" />
+ <property name="hadoop.jar" location="${build.dir}/${final.name}-core.jar" />
<!-- jdiff.home property set -->
<property name="jdiff.home" value="${build.ivy.lib.dir}/${ant.project.name}/jdiff"/>
@@ -555,7 +555,7 @@
<tar compression="gzip" destfile="${build.classes}/bin.tgz">
<tarfileset dir="bin" mode="755"/>
</tar>
- <jar jarfile="${build.dir}/${final.name}-core.jar"
+ <jar jarfile="${hadoop.jar}"
basedir="${build.classes}">
<manifest>
<section name="org/apache/hadoop">
@@ -1721,7 +1721,7 @@
<ivy:publish
settingsRef="${ant.project.name}.ivy.settings"
resolver="local"
- pubrevision="${hadoop.version}"
+ pubrevision="${version}"
overwrite="true"
artifactspattern="${build.dir}/${ivy.publish.pattern}" />
</target>
Modified: hadoop/core/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/ivy.xml?rev=748861&r1=748860&r2=748861&view=diff
==============================================================================
--- hadoop/core/trunk/ivy.xml (original)
+++ hadoop/core/trunk/ivy.xml Sat Feb 28 14:42:53 2009
@@ -18,7 +18,7 @@
-->
<ivy-module version="1.0">
- <info organisation="org.apache.hadoop" module="${ant.project.name}">
+ <info organisation="org.apache.hadoop" module="${ant.project.name}" revision="${version}">
<license name="Apache 2.0"/>
<ivyauthor name="Apache Hadoop Team" url="http://hadoop.apache.org"/>
<description>
Modified: hadoop/core/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/ivy/libraries.properties?rev=748861&r1=748860&r2=748861&view=diff
==============================================================================
--- hadoop/core/trunk/ivy/libraries.properties (original)
+++ hadoop/core/trunk/ivy/libraries.properties Sat Feb 28 14:42:53 2009
@@ -13,9 +13,6 @@
#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
-# This is the version of hadoop we are generating
-hadoop.version=0.20.0
-
#These are the versions of our dependencies (in alphabetical order)
apacheant.version=1.7.0