You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by br...@apache.org on 2009/11/18 18:29:53 UTC
svn commit: r881841 - in /hadoop/zookeeper/trunk: CHANGES.txt build.xml
Author: breed
Date: Wed Nov 18 17:29:53 2009
New Revision: 881841
URL: http://svn.apache.org/viewvc?rev=881841&view=rev
Log:
ZOOKEEPER-532. java compiler should be target Java 1.5
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/build.xml
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=881841&r1=881840&r2=881841&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Wed Nov 18 17:29:53 2009
@@ -115,6 +115,8 @@
ZOOKEEPER-547. Sanity check in QuorumCnxn Manager and quorum communication port.
(mahadev via breed)
+ ZOOKEEPER-532. java compiler should be target Java 1.5 (hiram chirino and phunt via breed)
+
IMPROVEMENTS:
ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
"socket reuse" and failure to close client (phunt via mahadev)
Modified: hadoop/zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/build.xml?rev=881841&r1=881840&r2=881841&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/build.xml (original)
+++ hadoop/zookeeper/trunk/build.xml Wed Nov 18 17:29:53 2009
@@ -30,9 +30,8 @@
<property name="revision.properties" value="revision.properties" />
<property file="${basedir}/src/java/${revision.properties}" />
- <!-- Target JDK version to build for. Certain zookeeper features -->
- <!-- (for example, JMX) are only supported on JDK 1.6 -->
- <property name="target.jdk" value="${ant.java.version}" />
+ <!-- Target Java 1.5 -->
+ <property name="javac.target" value="1.5" />
<property name="src.dir" value="${basedir}/src" />
<property name="java.src.dir" value="${src.dir}/java/main" />
@@ -196,7 +195,7 @@
</target>
<target name="jute" depends="init">
- <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}"
+ <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${javac.target}"
includes="org/apache/jute/**" debug="on" />
</target>
@@ -231,7 +230,7 @@
</target>
<target name="ver-gen" depends="init">
- <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${target.jdk}"
+ <javac srcdir="${java.src.dir}" destdir="${build.classes}" target="${javac.target}"
includes="org/apache/zookeeper/version/util/**" debug="on" />
</target>
@@ -265,7 +264,7 @@
<target name="build-generated" depends="compile_jute,version-info" >
<javac srcdir="${src_generated.dir}" destdir="${build.classes}"
- target="${target.jdk}" debug="on" />
+ target="${javac.target}" debug="on" />
</target>
<target name="ivy-download" unless="ivy.jar.exists" depends="init">
@@ -300,7 +299,7 @@
<target name="compile" depends="ivy-retrieve,clover,build-generated">
<javac srcdir="${java.src.dir}" destdir="${build.classes}"
- target="${target.jdk}" debug="on">
+ target="${javac.target}" debug="on">
<classpath refid="java.classpath"/>
<compilerarg value="-Xlint:all"/>
<compilerarg value="-Xlint:-path"/>
@@ -310,11 +309,11 @@
<target name="compile-test" depends="ivy-retrieve-test,compile">
<mkdir dir="${test.java.classes}"/>
<javac srcdir="${test.src.dir}" destdir="${test.java.classes}"
- target="${target.jdk}" debug="on">
+ target="${javac.target}" debug="on">
<classpath refid="test.java.classpath"/>
</javac>
<javac srcdir="${systest.src.dir}" destdir="${test.java.classes}"
- target="${target.jdk}" debug="on">
+ target="${javac.target}" debug="on">
<classpath refid="test.java.classpath"/>
</javac>
</target>