Repository: falcon Updated Branches: refs/heads/master 395675fb0 -> f95581007
FALCON-1138: JDK requirement for merlin should be 1.7 contributed by Raghav Kumar Gautam Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f9558100 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f9558100 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f9558100 Branch: refs/heads/master Commit: f95581007c5b6177cfbc85a23bb589f315c42373 Parents: 395675f Author: Raghav Kumar Gautam <[email protected]> Authored: Thu Apr 9 13:51:43 2015 -0700 Committer: Raghav Kumar Gautam <[email protected]> Committed: Thu Apr 9 13:51:43 2015 -0700 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ falcon-regression/pom.xml | 15 --------------- 2 files changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/f9558100/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 76c1090..891576c 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -63,6 +63,8 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-1138: JDK requirement for merlin should be 1.7 (Raghav Kumar Gautam) + FALCON-1135 Migrate methods related to *Merlin.java classes from InstanceUtil.java and Bundle.java (Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/f9558100/falcon-regression/pom.xml ---------------------------------------------------------------------- diff --git a/falcon-regression/pom.xml b/falcon-regression/pom.xml index b6fffc8..2b1d15a 100644 --- a/falcon-regression/pom.xml +++ b/falcon-regression/pom.xml @@ -238,12 +238,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <version>2.2.1</version> </plugin> @@ -283,15 +277,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> <execution>
