Revert "HADOOP-13852 hadoop build to allow hadoop version property to be explicitly set. Contriibuted by Steve Loughran"
This reverts commit c2655157257079b8541d71bb1e5b6cbae75561ff. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d8e440e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d8e440e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d8e440e Branch: refs/heads/YARN-5734 Commit: 7d8e440eee51562d0769efe04eb97256fe6061d1 Parents: 13d8e55 Author: Akira Ajisaka <aajis...@apache.org> Authored: Fri Dec 9 12:49:27 2016 +0900 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Fri Dec 9 12:49:27 2016 +0900 ---------------------------------------------------------------------- BUILDING.txt | 11 +---------- hadoop-common-project/hadoop-common/pom.xml | 3 --- .../src/main/resources/common-version-info.properties | 4 ++-- .../src/main/resources/yarn-version-info.properties | 2 +- 4 files changed, 4 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d8e440e/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index 7afc3f0..8b2bba6 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][-Dmaven.javadoc.skip=true] + * Build distribution with native code : mvn package [-Pdist][-Pdocs][-Psrc][-Dtar] ---------------------------------------------------------------------------------- Running compatibility checks with checkcompatibility.py @@ -402,12 +402,3 @@ 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/7d8e440e/hadoop-common-project/hadoop-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index aa20f79..c9b282f 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -36,9 +36,6 @@ <is.hadoop.common.component>true</is.hadoop.common.component> <wsce.config.dir>../etc/hadoop</wsce.config.dir> <wsce.config.file>wsce-site.xml</wsce.config.file> - <!-- 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> http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d8e440e/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 9b74960..ad9a24d 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=${declared.hadoop.version} +version=${pom.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} +protocVersion=${protobuf.version} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d8e440e/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 ee6f13d..9a8575c 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=${declared.hadoop.version} +version=${pom.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
