diff --git a/BUILDING.txt b/BUILDING.txt index 7afc3f0bb2..8b2bba6882 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. diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index aa20f79c87..c9b282fb24 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -36,9 +36,6 @@ true ../etc/hadoop wsce-site.xml - - ${pom.version} 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 9b74960cf7..ad9a24d590 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 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 ee6f13d77d..9a8575c6de 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}