Bug 515929: Version comparison in Ant does not support two numbers in minor positionY20170511-1000I20170510-2000I20170510-0800I20170509-2000

2 files changed, 9 insertions, 4 deletions

diff --git a/ant/org.eclipse.ant.launching/lib/remote.jar b/ant/org.eclipse.ant.launching/lib/remote.jar
index 6e4c67181..161d741aa 100644
--- a/ant/org.eclipse.ant.launching/lib/remote.jar
+++ b/ant/org.eclipse.ant.launching/lib/remote.jar
diff --git a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
index 0daf97360..4a5c45ade 100644
--- a/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
+++ b/ant/org.eclipse.ant.launching/remote/org/eclipse/ant/internal/launching/remote/InternalAntRunner.java
@@ -664,8 +664,8 @@ public class InternalAntRunner {
 		}
 	}
 
-	/*
-	 * Returns a String representation of the Ant version number as specified in the version.txt file.
+	/**
+	 * @return a String representation of the Ant version number as specified in the version.txt file
 	 */
 	private String getAntVersionNumber() throws BuildException {
 		if (antVersionNumber == null) {
@@ -687,7 +687,7 @@ public class InternalAntRunner {
 		return antVersionNumber;
 	}
 
-	/*
+	/**
 	 * Returns whether the given version is compatible with the current Ant version. A version is compatible if it is less than or equal to the
 	 * current version.
 	 */
@@ -698,7 +698,12 @@ public class InternalAntRunner {
 		return osgiVersion.compareTo(osgiComparison) >= 0;
 	}
 
-	class Version {
+	/**
+	 * Copy of org.osgi.framework.Version.
+	 * <p>
+	 * We can't know how Ant version numbers will evolve in the future, but the OSGi version number format looks like a good bet.
+	 */
+	private static class Version {
 		private final int major;
 		private final int minor;
 		private final int micro;