Repository: hadoop Updated Branches: refs/heads/YARN-5734 4c38f11ce -> ef34bf2bb
HADOOP-13852 hadoop build to allow hadoop version property to be explicitly set. Contriibuted by Steve Loughran Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f66f6189 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f66f6189 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f66f6189 Branch: refs/heads/YARN-5734 Commit: f66f61892ac7cbd57e8323d0a2a90cf58e9286ce Parents: 4c38f11 Author: Steve Loughran <ste...@apache.org> Authored: Mon Dec 12 13:58:27 2016 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Dec 12 13:58:27 2016 +0000 ---------------------------------------------------------------------- BUILDING.txt | 11 ++++++++++- .../src/main/resources/common-version-info.properties | 4 ++-- hadoop-project/pom.xml | 3 +++ .../src/main/resources/yarn-version-info.properties | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66f6189/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index 8b2bba6..7afc3f0 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -390,7 +390,7 @@ http://www.zlib.net/ ---------------------------------------------------------------------------------- Building distributions: - * Build distribution with native code : mvn package [-Pdist][-Pdocs][-Psrc][-Dtar] + * Build distribution with native code : mvn package [-Pdist][-Pdocs][-Psrc][-Dtar][-Dmaven.javadoc.skip=true] ---------------------------------------------------------------------------------- Running compatibility checks with checkcompatibility.py @@ -402,3 +402,12 @@ managers to compare the compatibility of a previous and current release. As an example, this invocation will check the compatibility of interfaces annotated as Public or LimitedPrivate: ./dev-support/bin/checkcompatibility.py --annotation org.apache.hadoop.classification.InterfaceAudience.Public --annotation org.apache.hadoop.classification.InterfaceAudience.LimitedPrivate --include "hadoop.*" branch-2.7.2 trunk + +---------------------------------------------------------------------------------- +Changing the Hadoop version declared returned by VersionInfo + +If for compatibility reasons the version of Hadoop has to be declared as a 2.x release in the information returned by +org.apache.hadoop.util.VersionInfo, set the property declared.hadoop.version to the desired version. +For example: mvn package -Pdist -Ddeclared.hadoop.version=2.11 + +If unset, the project version declared in the POM file is used. http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66f6189/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties b/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties index ad9a24d..9b74960 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties +++ b/hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties @@ -16,11 +16,11 @@ # limitations under the License. # -version=${pom.version} +version=${declared.hadoop.version} revision=${version-info.scm.commit} branch=${version-info.scm.branch} user=${user.name} date=${version-info.build.time} url=${version-info.scm.uri} srcChecksum=${version-info.source.md5} -protocVersion=${protobuf.version} \ No newline at end of file +protocVersion=${protobuf.version} http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66f6189/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 336231e..9ec24ea 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -126,6 +126,9 @@ <native-maven-plugin.version>1.0-alpha-8</native-maven-plugin.version> <surefire.fork.timeout>900</surefire.fork.timeout> <aws-java-sdk.version>1.11.45</aws-java-sdk.version> + <!-- the version of Hadoop declared in the version resources; can be overridden + so that Hadoop 3.x can declare itself a 2.x artifact. --> + <declared.hadoop.version>${pom.version}</declared.hadoop.version> </properties> <dependencyManagement> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f66f6189/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-version-info.properties ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-version-info.properties b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-version-info.properties index 9a8575c..ee6f13d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-version-info.properties +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-version-info.properties @@ -16,7 +16,7 @@ # limitations under the License. # -version=${pom.version} +version=${declared.hadoop.version} revision=${version-info.scm.commit} branch=${version-info.scm.branch} user=${user.name} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
