Ensure new build method standardises on JDK 5 or better.

dancres · Jun 13, 2013 · 77b9c2f · 77b9c2f
1 parent c6be74b
commit 77b9c2f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/ant_jars.xml b/ant_jars.xml
@@ -35,6 +35,8 @@
     <delete dir="${installer_build}"/>
     <mkdir dir="${installer_build}"/>
     <javac srcdir="${installer_base}/com/incax/install/blitz" destdir="${installer_build}" debug="true"
+      target="1.5"
+      source="1.5"
       debuglevel="lines,vars,source"
       classpathref="allclasses"/>
     <copy todir="${installer_build}/resources">
@@ -216,8 +218,8 @@
         description="Build a test client for the stats interface">
     <mkdir dir="${statsbuild}"/>
     <javac srcdir="${stats}" destdir="${statsbuild}" debug="true"
-      target="1.4"
-      source="1.4"
+      target="1.5"
+      source="1.5"
       debuglevel="lines,vars,source"
       classpath="${jini_root}/lib/jsk-platform.jar:${jini_root}/lib/jini-ext.jar:${jini_root}/lib/start.jar:${lib}/stats.jar"/>
   </target>
@@ -226,8 +228,8 @@
         description="Build a test client for Blitz">
     <mkdir dir="${hellobuild}"/>
     <javac srcdir="${hello}" destdir="${hellobuild}" debug="true"
-      target="1.4"
-      source="1.4"
+      target="1.5"
+      source="1.5"
       debuglevel="lines,vars,source"
       classpath="${jini_root}/lib/jsk-platform.jar:${jini_root}/lib/jini-ext.jar:${jini_root}/lib/start.jar:${lib}/stats.jar"/>
   </target>
@@ -236,8 +238,8 @@
         description="Build a test client for Blitz">
     <mkdir dir="${sizerbuild}"/>
     <javac srcdir="${sizer}" destdir="${sizerbuild}" debug="true"
-      target="1.4"
-      source="1.4"
+      target="1.5"
+      source="1.5"
       debuglevel="lines,vars,source"
       classpath="${jini_root}/lib/jsk-platform.jar:${jini_root}/lib/jini-ext.jar:${jini_root}/lib/start.jar:${lib}/blitz.jar"/>
   </target>

diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,15 @@
 
   <build>
       <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.1</version>
+          <configuration>
+              <source>1.5</source>
+              <target>1.5</target>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>rmic-maven-plugin</artifactId>