@@ -147,7 +147,7 @@
           description="Compile all source files">
   </target>
 
-  <target name="do-compile" depends="resolve-java5-runtime">
+  <target name="do-compile" depends="resolve-java7-runtime">
 
     <echo message="Compiling src directory to classes/base and classes/test with command 'javac'" />
 
 
@@ -158,21 +158,24 @@ public static JavaVersion parseClassVersion(java.io.InputStream is) {
     }
   }
 
-  /**
-   * Produce the {@code JavaVersion.FullVersion} corresponding to the given version string.  Accepts
-   * input of the form "1.6.0", "1.4.2_10", or "1.5.0_05-ea".  The underscore may be replaced by a dot.
-   * If the text cannot be parsed, a trivial version with major version UNRECOGNIZED is returned.
-   * The location of the JDK, which may be null, will be stored in the version.
-   * 
-   * @see <a href="http://java.sun.com/j2se/versioning_naming.html#">The Sun version specification</a>
-   */
+  /** Produce the {@code JavaVersion.FullVersion} corresponding to the given version string.  Accepts
+    * input of the form "1.6.0", "1.4.2_10", or "1.5.0_05-ea".  The underscore may be replaced by a dot.
+    * If the text cannot be parsed, a trivial version with major version UNRECOGNIZED is returned.
+    * The location of the JDK, which may be null, will be stored in the version.
+    * 
+    * @see <a href="http://java.sun.com/j2se/versioning_naming.html#">The Sun version specification</a>
+    */
+  // Why are underscores used as word separators in identifiers below?
   public static FullVersion parseFullVersion(String java_version,
                                              String java_runtime_name,
                                              String java_vm_vendor,
                                              File location) {
     VendorType vendor = VendorType.UNKNOWN;
     String vendorString = null;
 
+    /** Strip trailing ".jdk" off of java_version strings from post Java 6 Oracle JVMs for Mac OS X. */
+    if (java_version.endsWith(".jdk")) java_version = java_version.substring(0, java_version.length() - 4);
+    
     if (vendor == VendorType.UNKNOWN) {
       if (java_runtime_name.toLowerCase().contains("openjdk")) {
         vendor = VendorType.OPENJDK;
@@ -194,7 +197,7 @@ else if (java_vm_vendor.toLowerCase().contains("sun") ||
     // if version doesn't start with "1." and has only one dot, prefix with "1."
     // example: 6.0 --> 1.6.0
     if ((!java_version.startsWith("1.")) && (java_version.replaceAll("[^\\.]","").length()==1)) {
-      java_version = "1."+java_version;
+      java_version = "1." + java_version;
     }
     int dash = java_version.indexOf('-');
     if (dash == -1) { number = java_version; typeString = null; }