diff --git a/BUILDING.txt b/BUILDING.txt
index 06bef1f..94cbe5e 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 66b6bdb..b53bacc 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 84a106e..c011b45 100644
--- a/hadoop-common-project/hadoop-annotations/pom.xml
+++ b/hadoop-common-project/hadoop-annotations/pom.xml
@@ -40,23 +40,6 @@
- os.linux
-
-
- !Mac
-
-
-
-
- jdk.tools
- jdk.tools
- 1.6
- system
- ${java.home}/../lib/tools.jar
-
-
-
-
jdk1.7
1.7
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index d3c404e..3b52dc3 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,)
@@ -922,8 +933,8 @@
maven-compiler-plugin
2.5.1
- 1.6
- 1.6
+ ${javac.version}
+ ${javac.version}
@@ -1182,8 +1193,8 @@
maven-compiler-plugin
true
- 1.6
- 1.6
+ ${javac.version}
+ ${javac.version}
9999
diff --git a/pom.xml b/pom.xml
index 5cc30c2..de51a65 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,)