Repository: falcon Updated Branches: refs/heads/master c23eaf7cc -> 4b31d774d
FALCON-774 Discontinue support for JDK 1.6 and move to 1.7. Contributed by Peeyush Bishnoi Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/4b31d774 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/4b31d774 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/4b31d774 Branch: refs/heads/master Commit: 4b31d774ddbd61feb70a2dae036ea9dbd4579724 Parents: c23eaf7 Author: Srikanth Sundarrajan <[email protected]> Authored: Wed Feb 18 12:29:21 2015 +0530 Committer: Srikanth Sundarrajan <[email protected]> Committed: Wed Feb 18 12:29:21 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ Installation-steps.txt | 8 +++++--- addons/designer/pom.xml | 4 ++-- build-tools/src/bin/build-oozie.sh | 2 +- common/pom.xml | 4 ++-- docs/src/site/twiki/InstallationSteps.twiki | 8 +++++++- oozie/pom.xml | 4 ++-- pom.xml | 4 ++-- src/bin/falcon-config.sh | 4 +++- src/bin/package.sh | 2 +- 10 files changed, 28 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0123fae..97244ec 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,9 @@ Trunk (Unreleased) FALCON-949 Force update feature (pavan kumar kolamuri via Suhas Vasu) IMPROVEMENTS + FALCON-774 Discontinue support for JDK 1.6 and move to 1.7. (Peeyush + Bishnoi via Srikanth Sundarrajan) + FALCON-263 Adding documentation for params api (Ajay Yadav via Srikanth Sundarrajan) http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/Installation-steps.txt ---------------------------------------------------------------------- diff --git a/Installation-steps.txt b/Installation-steps.txt index 650799f..bb92a85 100644 --- a/Installation-steps.txt +++ b/Installation-steps.txt @@ -22,7 +22,7 @@ A. Building & Installing Falcon You would need the following installed: -* JDK 1.6 +* JDK 1.7 * Maven 3.x *Note:* To build Falcon on Ubuntu/Centos set umask to 022. To do so, add the following line in ~/.bashrc or @@ -38,10 +38,11 @@ a. Building falcon from the source release * tar -xzvf apache-falcon-${project.version}-source.tar.gz * cd falcon-sources-${project.version} -* export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install +* export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m -noverify" && mvn clean install [optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for a specific version of hadoop] *Note:* Falcon drops support for Hadoop-1 and only supports Hadoop-2 from Falcon 0.6 onwards + Falcon build with JDK 1.7 using -noverify option b. Building falcon from the source repository @@ -49,10 +50,11 @@ b. Building falcon from the source repository * git clone https://git-wip-us.apache.org/repos/asf/falcon.git falcon * cd falcon -* export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install +* export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m -noverify" && mvn clean install [optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for a specific version of hadoop] *Note:* Falcon drops support for Hadoop-1 and only supports Hadoop-2 from Falcon 0.6 onwards + Falcon build with JDK 1.7 using -noverify option 2. Deploying Falcon http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/addons/designer/pom.xml ---------------------------------------------------------------------- diff --git a/addons/designer/pom.xml b/addons/designer/pom.xml index 26110f3..28a977a 100644 --- a/addons/designer/pom.xml +++ b/addons/designer/pom.xml @@ -516,8 +516,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/build-tools/src/bin/build-oozie.sh ---------------------------------------------------------------------- diff --git a/build-tools/src/bin/build-oozie.sh b/build-tools/src/bin/build-oozie.sh index 1899ff4..5ab9092 100755 --- a/build-tools/src/bin/build-oozie.sh +++ b/build-tools/src/bin/build-oozie.sh @@ -61,6 +61,6 @@ esac rm `find . -name 'pom.xml.bak'` -$MVN_CMD clean source:jar install -DskipTests -Phadoop-2 +$MVN_CMD clean source:jar install -DjavaVersion=1.7 -DtargetJavaVersion=1.6 -DskipTests -Phadoop-2 popd http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/common/pom.xml ---------------------------------------------------------------------- diff --git a/common/pom.xml b/common/pom.xml index d5629b2..f0b7e32 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -189,8 +189,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/docs/src/site/twiki/InstallationSteps.twiki ---------------------------------------------------------------------- diff --git a/docs/src/site/twiki/InstallationSteps.twiki b/docs/src/site/twiki/InstallationSteps.twiki index ddf2951..3f622c7 100644 --- a/docs/src/site/twiki/InstallationSteps.twiki +++ b/docs/src/site/twiki/InstallationSteps.twiki @@ -4,16 +4,22 @@ ---+++ Building Falcon <verbatim> +You would need the following installed to build Falcon + +* JDK 1.7 +* Maven 3.x + git clone https://git-wip-us.apache.org/repos/asf/falcon.git falcon cd falcon -export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m" && mvn clean install +export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=256m -noverify" && mvn clean install [optionally -Dhadoop.version=<<hadoop.version>> can be appended to build for a specific version of hadoop] *Note:* Falcon drops support for Hadoop-1 and only supports Hadoop-2 from Falcon 0.6 onwards [optionally -Doozie.version=<<oozie version>> can be appended to build with a specific version of oozie. Oozie versions >= 4 are supported] +Falcon build with JDK 1.7 using -noverify option </verbatim> http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/oozie/pom.xml ---------------------------------------------------------------------- diff --git a/oozie/pom.xml b/oozie/pom.xml index a150f3f..4271bd4 100644 --- a/oozie/pom.xml +++ b/oozie/pom.xml @@ -195,8 +195,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index fea00bf..bbb6e99 100644 --- a/pom.xml +++ b/pom.xml @@ -1152,8 +1152,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/src/bin/falcon-config.sh ---------------------------------------------------------------------- diff --git a/src/bin/falcon-config.sh b/src/bin/falcon-config.sh index d97356b..e87add2 100644 --- a/src/bin/falcon-config.sh +++ b/src/bin/falcon-config.sh @@ -55,7 +55,9 @@ fi # default the heap size to 1GB DEFAULT_JAVA_HEAP_MAX=-Xmx1024m -FALCON_OPTS="$DEFAULT_JAVA_HEAP_MAX $FALCON_OPTS" +# setting -noverify option to skip bytecode verification due to JDK 1.7 (FALCON-774) +NOVERIFY=-noverify +FALCON_OPTS="$DEFAULT_JAVA_HEAP_MAX $NOVERIFY $FALCON_OPTS" type="$1" shift http://git-wip-us.apache.org/repos/asf/falcon/blob/4b31d774/src/bin/package.sh ---------------------------------------------------------------------- diff --git a/src/bin/package.sh b/src/bin/package.sh index d9c1678..328d6f1 100755 --- a/src/bin/package.sh +++ b/src/bin/package.sh @@ -52,7 +52,7 @@ pushd ${FALCON_SRC} echo "Builing oozie-el-extension and oozie" mvn clean install -P $HADOOP_PROFILE -pl build-tools,hadoop-dependencies,oozie-el-extensions -am -Dhadoop.version=$HADOOP_VERSION -Doozie.version=$OOZIE_VERSION -Doozie.forcebuild=true -DskipTests pushd target/oozie-$OOZIE_VERSION -bin/mkdistro.sh -DskipTests +bin/mkdistro.sh -DjavaVersion=1.7 -DtargetJavaVersion=1.6 -DskipTests pushd distro/target/oozie-* mkdir -p WEB-INF/lib cp ${FALCON_SRC}/oozie-el-extensions/target/falcon-oozie-el-extension*.jar WEB-INF/lib/
