Use VersionUtils where appropriate

Author: ctrueden

src/main/java/org/scijava/command/CommandInfo.java

@@ -59,8 +59,8 @@
 import org.scijava.plugin.PluginInfo;
 import org.scijava.service.Service;
 import org.scijava.util.ClassUtils;
-import org.scijava.util.Manifest;
 import org.scijava.util.StringMaker;
+import org.scijava.util.VersionUtils;
 
 /**
  * A collection of metadata about a particular {@link Command}.
@@ -442,8 +442,7 @@ public String getLocation() {
 	@Override
 	public String getVersion() {
 		try {
-			final Manifest m = Manifest.getManifest(loadDelegateClass());
-			return m == null ? null : m.getImplementationVersion();
+			return VersionUtils.getVersion(loadDelegateClass());
 		}
 		catch (final ClassNotFoundException exc) {
 			return null;

src/main/java/org/scijava/module/AbstractModuleInfo.java

@@ -46,7 +46,7 @@
 import org.scijava.module.event.ModulesUpdatedEvent;
 import org.scijava.util.ClassUtils;
 import org.scijava.util.ConversionUtils;
-import org.scijava.util.Manifest;
+import org.scijava.util.VersionUtils;
 
 /**
  * Abstract superclass of {@link ModuleInfo} implementation.
@@ -197,8 +197,7 @@ public String getVersion() {
 		// If the same delegate class is used for more than one module, though,
 		// it may need to override this method to indicate a different version.
 		try {
-			final Manifest m = Manifest.getManifest(loadDelegateClass());
-			return m == null ? null : m.getImplementationVersion();
+			return VersionUtils.getVersion(loadDelegateClass());
 		}
 		catch (final ClassNotFoundException exc) {
 			return null;