Repository: hadoop Updated Branches: refs/heads/branch-2 bb1fedfbc -> 275561d84 refs/heads/trunk 8963515b8 -> 144da2e46
HADOOP-10530 Make hadoop build on Java7+ only (stevel) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/275561d8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/275561d8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/275561d8 Branch: refs/heads/branch-2 Commit: 275561d8488fda9a2735b29f5396d8b6140ffa19 Parents: bb1fedf Author: Steve Loughran <[email protected]> Authored: Mon Dec 8 15:30:34 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Mon Dec 8 15:30:34 2014 +0000 ---------------------------------------------------------------------- BUILDING.txt | 4 ++-- hadoop-assemblies/pom.xml | 4 ++-- hadoop-common-project/hadoop-annotations/pom.xml | 17 ----------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ hadoop-project/pom.xml | 19 +++++++++++++++---- pom.xml | 2 +- 6 files changed, 22 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/275561d8/BUILDING.txt ---------------------------------------------------------------------- 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/275561d8/hadoop-assemblies/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-assemblies/pom.xml b/hadoop-assemblies/pom.xml index da2d0b6..5f0e226 100644 --- a/hadoop-assemblies/pom.xml +++ b/hadoop-assemblies/pom.xml @@ -45,10 +45,10 @@ <configuration> <rules> <requireMavenVersion> - <version>[3.0.0,)</version> + <version>${enforced.maven.version}</version> </requireMavenVersion> <requireJavaVersion> - <version>1.6</version> + <version>${enforced.java.version}</version> </requireJavaVersion> </rules> </configuration> http://git-wip-us.apache.org/repos/asf/hadoop/blob/275561d8/hadoop-common-project/hadoop-annotations/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml index 2d6255a..1221001 100644 --- a/hadoop-common-project/hadoop-annotations/pom.xml +++ b/hadoop-common-project/hadoop-annotations/pom.xml @@ -40,23 +40,6 @@ <profiles> <profile> - <id>os.linux</id> - <activation> - <os> - <family>!Mac</family> - </os> - </activation> - <dependencies> - <dependency> - <groupId>jdk.tools</groupId> - <artifactId>jdk.tools</artifactId> - <version>1.6</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - </dependencies> - </profile> - <profile> <id>jdk1.7</id> <activation> <jdk>1.7</jdk> http://git-wip-us.apache.org/repos/asf/hadoop/blob/275561d8/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6db9eec..617dfbb 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) http://git-wip-us.apache.org/repos/asf/hadoop/blob/275561d8/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index cd90448..76b8645 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -73,6 +73,17 @@ <zookeeper.version>3.4.6</zookeeper.version> <tomcat.version>6.0.41</tomcat.version> + + <!-- define the Java language version used by the compiler --> + <javac.version>1.7</javac.version> + + <!-- The java version enforced by the maven enforcer --> + <!-- more complex patterns can be used here, such as + [${javac.version}) + for an open-ended enforcement + --> + <enforced.java.version>[${javac.version},)</enforced.java.version> + <enforced.maven.version>[3.0.2,)</enforced.maven.version> </properties> <dependencyManagement> @@ -920,8 +931,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>2.5.1</version> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>${javac.version}</source> + <target>${javac.version}</target> </configuration> </plugin> <plugin> @@ -1218,8 +1229,8 @@ <artifactId>maven-compiler-plugin</artifactId> <configuration> <fork>true</fork> - <source>1.6</source> - <target>1.6</target> + <source>${javac.version}</source> + <target>${javac.version}</target> <compilerArguments> <Xlint/> <Xmaxwarns>9999</Xmaxwarns> http://git-wip-us.apache.org/repos/asf/hadoop/blob/275561d8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 01b61c78..2154c52 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 <version>[3.0.2,)</version> </requireMavenVersion> <requireJavaVersion> - <version>1.6</version> + <version>[1.7,)</version> </requireJavaVersion> </rules> </configuration>
