Merge pull request #146 from ctasada/issue132

Issue 132 - Java 7 Compilation Bug tested for compilation and smoke test
voldemort · Jun 3, 2013 · 8efee8a · 8efee8a
2 parents 797b7c6 + 113d234
commit 8efee8a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/build.properties b/build.properties
@@ -38,6 +38,9 @@ tomcat.manager.username=tomcat
 tomcat.manager.password=tomcat
 tomcat.context=/voldemort
 
+## Java version
+javac.version=1.5
+
 ## Release
 curr.release=1.3.3
 
diff --git a/build.xml b/build.xml
@@ -89,7 +89,7 @@
     <!-- place to put log4j.properties -->
     <replace-dir dir="${resources.dir}"/>
     <copy file="${java.dir}/log4j.properties" todir="${resources.dir}"/>
-    <javac destdir="${classes.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+    <javac destdir="${classes.dir}" target="${javac.version}" source="${javac.version}" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
       <src path="${java.dir}" />
       <classpath refid="main-classpath" />
     </javac>
@@ -109,7 +109,7 @@
         <exclude name="**/*.html" />
       </fileset>
     </copy>
-    <javac destdir="${testclasses.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+    <javac destdir="${testclasses.dir}" target="${javac.version}" source="${javac.version}" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
       <src path="${unittestsrc.dir}" />
       <src path="${inttestsrc.dir}" />
       <src path="${commontestsrc.dir}" />
@@ -201,7 +201,7 @@
 
   <target name="contrib-build" depends="build, buildtest" description="Compile contrib packages (java and test) ">
     <replace-dir dir="${contrib.classes.dir}" />
-    <javac destdir="${contrib.classes.dir}" target="1.5" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
+    <javac destdir="${contrib.classes.dir}" target="${javac.version}" source="${javac.version}" debug="true" deprecation="false" failonerror="true" includeantruntime="false">
       <src path="${contrib.root.dir}" />
       <src path="${contrib.root.dir}" />
       <classpath refid="main-classpath" />
@@ -342,15 +342,15 @@
     <zip destfile="${dist.dir}/${name}-@{version}.zip">
       <zipfileset dir="." prefix="voldemort-@{version}" filemode="755" includes="bin/*"/>
       <zipfileset dir="." prefix="voldemort-@{version}" includes="**">
-        <exclude name="${dist.dir}/*classes"/>
+        <exclude name="${dist.dir}/*classes/"/>
         <exclude name="bin/*"/>
         <exclude name=".git*/**"/>
       </zipfileset>
     </zip>
     <tar destfile="${dist.dir}/${name}-@{version}.tar.gz" compression="gzip" longfile="gnu">
       <tarfileset dir="." prefix="voldemort-@{version}" filemode="755" includes="bin/*"/>
       <tarfileset dir="." prefix="voldemort-@{version}" includes="**">
-        <exclude name="${dist.dir}/*classes"/>
+        <exclude name="${dist.dir}/*classes/"/>
         <exclude name="${dist.dir}/*.zip"/>
         <exclude name="bin/*"/>
         <exclude name=".git*/**"/>
@@ -456,7 +456,7 @@
     <attribute name="javadir" />
     <sequential>
       <replace-dir dir="@{dir}" />
-      <javadoc sourcepath="@{javadir}" destdir="@{dir}" windowtitle="${display.name}" source="1.5" author="true" version="true" use="true" packagenames="@{packagenames}">
+      <javadoc sourcepath="@{javadir}" destdir="@{dir}" windowtitle="${display.name}" source="${javac.version}" author="true" version="true" use="true" packagenames="@{packagenames}">
         <doctitle>${display.name}</doctitle>
         <bottom>${author}</bottom>
         <classpath refid="main-classpath" />

diff --git a/src/java/voldemort/store/readonly/io/BaseCloser.java b/src/java/voldemort/store/readonly/io/BaseCloser.java
@@ -64,7 +64,7 @@ protected void exec() throws GroupIOException {
                 if(exc == null) {
                     exc = new GroupIOException(t);
                 } else {
-                    exc.addSuppressed(t);
+                    exc.addSuppressedException(t);
                 }
 
             }

diff --git a/src/java/voldemort/store/readonly/io/GroupIOException.java b/src/java/voldemort/store/readonly/io/GroupIOException.java
@@ -15,7 +15,7 @@ public GroupIOException(Throwable cause) {
         suppressed.add(cause);
     }
 
-    public void addSuppressed(Throwable t) {
+    public void addSuppressedException(Throwable t) {
         suppressed.add(t);
     }