diff --git a/BUILDING.txt b/BUILDING.txt
index 06bef1fc33048..94cbe5ea14834 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -4,7 +4,7 @@ Build instructions for Hadoop
Requirements:
* Unix System
-* JDK 1.6+
+* JDK 1.7+
* Maven 3.0 or later
* Findbugs 1.3.9 (if running findbugs)
* ProtocolBuffer 2.5.0
@@ -204,7 +204,7 @@ Building on Windows
Requirements:
* Windows System
-* JDK 1.6+
+* JDK 1.7+
* Maven 3.0 or later
* Findbugs 1.3.9 (if running findbugs)
* ProtocolBuffer 2.5.0
diff --git a/hadoop-assemblies/pom.xml b/hadoop-assemblies/pom.xml
index da2d0b6332cab..5f0e226242819 100644
--- a/hadoop-assemblies/pom.xml
+++ b/hadoop-assemblies/pom.xml
@@ -45,10 +45,10 @@
- [3.0.0,)
+ ${enforced.maven.version}
- 1.6
+ ${enforced.java.version}
diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml
index 2d6255ac5f821..1221001f343b3 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -39,23 +39,6 @@
-
- os.linux
-
-
- !Mac
-
-
-
-
- jdk.tools
- jdk.tools
- 1.6
- system
- ${java.home}/../lib/tools.jar
-
-
-
jdk1.7
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 6db9eec7265f3..617dfbbaa55f5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -4,6 +4,8 @@ Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
+ HADOOP-10530 Make hadoop build on Java7+ only (stevel)
+
NEW FEATURES
HADOOP-10987. Provide an iterator-based listing API for FileSystem (kihwal)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index cd904484265d4..76b86459c21bc 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -73,6 +73,17 @@
3.4.6
6.0.41
+
+
+ 1.7
+
+
+
+ [${javac.version},)
+ [3.0.2,)
@@ -920,8 +931,8 @@
maven-compiler-plugin
2.5.1
- 1.6
- 1.6
+ ${javac.version}
+ ${javac.version}
@@ -1218,8 +1229,8 @@
maven-compiler-plugin
true
- 1.6
- 1.6
+ ${javac.version}
+ ${javac.version}
9999
diff --git a/pom.xml b/pom.xml
index 01b61c7877ac0..2154c524b393a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
[3.0.2,)
- 1.6
+ [1.7,)