big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "HADOOP-13852 hadoop build to allow hadoop version property to be explicitly set. Contriibuted by Steve Loughran"

Browse Source 
This reverts commit c265515725.
This commit is contained in:
Akira Ajisaka 2016-12-09 12:49:27 +09:00
parent 13d8e552d2
commit 7d8e440eee
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BUILDING.txt
View File

@ -390,7 +390,7 @@ http://www.zlib.net/
---------------------------------------------------------------------------------- ----------------------------------------------------------------------------------
Building distributions: 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 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: 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 ./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.

3
hadoop-common-project/hadoop-common/pom.xml
View File

@ -36,9 +36,6 @@
<is.hadoop.common.component>true</is.hadoop.common.component> <is.hadoop.common.component>true</is.hadoop.common.component>
<wsce.config.dir>../etc/hadoop</wsce.config.dir> <wsce.config.dir>../etc/hadoop</wsce.config.dir>
<wsce.config.file>wsce-site.xml</wsce.config.file> <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> </properties>

2
hadoop-common-project/hadoop-common/src/main/resources/common-version-info.properties
View File

@ -16,7 +16,7 @@
# limitations under the License. # limitations under the License.
# #
version=${declared.hadoop.version} version=${pom.version}
revision=${version-info.scm.commit} revision=${version-info.scm.commit}
branch=${version-info.scm.branch} branch=${version-info.scm.branch}
user=${user.name} user=${user.name}

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-version-info.properties
View File

@ -16,7 +16,7 @@
# limitations under the License. # limitations under the License.
# #
version=${declared.hadoop.version} version=${pom.version}
revision=${version-info.scm.commit} revision=${version-info.scm.commit}
branch=${version-info.scm.branch} branch=${version-info.scm.branch}
user=${user.name} user=${user.name}