Author: hashutosh
Date: Mon Sep 9 15:20:23 2013
New Revision: 1521157
URL: http://svn.apache.org/r1521157
Log:
HIVE-4925 : Modify Hive build to enable compiling and running Hive with JDK7
(Xuefu Zhang via Ashutosh Chauhan)
Modified:
hive/trunk/build-common.xml
hive/trunk/build.properties
hive/trunk/hcatalog/build.properties
hive/trunk/hcatalog/storage-handlers/hbase/build.xml
hive/trunk/shims/build.xml
Modified: hive/trunk/build-common.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1521157&r1=1521156&r2=1521157&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Mon Sep 9 15:20:23 2013
@@ -298,8 +298,6 @@
destdir="${test.build.classes}"
debug="${javac.debug}"
optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
deprecation="${javac.deprecation}"
includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
@@ -312,8 +310,6 @@
destdir="${test.build.classes}"
debug="${javac.debug}"
optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
deprecation="${javac.deprecation}"
includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
Modified: hive/trunk/build.properties
URL:
http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1521157&r1=1521156&r2=1521157&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Mon Sep 9 15:20:23 2013
@@ -21,7 +21,6 @@ hcatalog.version=${version}
year=2012
javac.debug=on
-javac.version=1.6
javac.optimize=on
javac.deprecation=off
javac.args=
Modified: hive/trunk/hcatalog/build.properties
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/build.properties?rev=1521157&r1=1521156&r2=1521157&view=diff
==============================================================================
--- hive/trunk/hcatalog/build.properties (original)
+++ hive/trunk/hcatalog/build.properties Mon Sep 9 15:20:23 2013
@@ -63,7 +63,6 @@ excludes=
javac.debug=on
javac.optimize=on
javac.deprecation=off
-javac.version=1.6
javac.args=
javac.args.warnings=
Modified: hive/trunk/hcatalog/storage-handlers/hbase/build.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/hcatalog/storage-handlers/hbase/build.xml?rev=1521157&r1=1521156&r2=1521157&view=diff
==============================================================================
--- hive/trunk/hcatalog/storage-handlers/hbase/build.xml (original)
+++ hive/trunk/hcatalog/storage-handlers/hbase/build.xml Mon Sep 9 15:20:23
2013
@@ -52,7 +52,6 @@
<property name="javac.debug" value="on" />
<property name="javac.optimize" value="on" />
<property name="javac.deprecation" value="off" />
- <property name="javac.version" value="1.6" />
<property name="javac.args" value="" />
<!-- test properties -->
@@ -91,8 +90,8 @@
<target name="compile-src" depends="init">
<javac encoding="${build.encoding}"
srcdir="${src.dir}:${basedir}/src/gen-java:${basedir}/src/resources"
excludes="${excludes}"
includes="**/*.java" destdir="${build.classes}"
debug="${javac.debug}"
- optimize="${javac.optimize}" target="${javac.version}"
- source="${javac.version}" deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ deprecation="${javac.deprecation}"
includeantruntime="false">
<compilerarg line="${javac.args}"/>
<classpath refid="compile.class.path"/>
@@ -118,8 +117,8 @@
<target name="compile-test" depends="jar">
<javac encoding="${build.encoding}" srcdir="${test.src.dir}"
excludes="${excludes}"
includes="**/*.java" destdir="${test.build.classes}"
debug="${javac.debug}"
- optimize="${javac.optimize}" target="${javac.version}"
- source="${javac.version}" deprecation="${javac.deprecation}"
+ optimize="${javac.optimize}"
+ deprecation="${javac.deprecation}"
includeantruntime="false">
<compilerarg line="${javac.args}"/>
<classpath refid="test.class.path" />
Modified: hive/trunk/shims/build.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/shims/build.xml?rev=1521157&r1=1521156&r2=1521157&view=diff
==============================================================================
--- hive/trunk/shims/build.xml (original)
+++ hive/trunk/shims/build.xml Mon Sep 9 15:20:23 2013
@@ -100,8 +100,6 @@ to call at top-level: ant deploy-contrib
destdir="${test.build.classes}"
debug="${javac.debug}"
optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
deprecation="${javac.deprecation}"
includeantruntime="false">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
