Add native classifier exception to version pattern

This pattern was stripping the native classifier from jars, e.g.
ffmpeg-windows-x86 was appearing the same as ffmpeg.jar, where the prior
contains platform-specific binaries and the latter contains the Java
hooks.

To facilitate this native bundle + hook distribution pattern, our
version-stripping pattern now allows several platform classifiers to
remain in a given file name.

Author: hinerm

src/main/java/org/scijava/util/FileUtils.java

@@ -173,7 +173,7 @@ public static void writeFile(final File file, final byte[] bytes)
 	/** A regular expression to match filenames containing version information. */
 	private final static Pattern versionPattern =
 		Pattern
-			.compile("(.+?)(-\\d+(\\.\\d+|\\d{7})+[a-z]?\\d?(-[A-Za-z0-9.]+?|\\.GA)*?)?((-(swing|swt|shaded|sources|javadoc|native))?(\\.jar(-[a-z]*)?))");
+			.compile("(.+?)(-\\d+(\\.\\d+|\\d{7})+[a-z]?\\d?(-[A-Za-z0-9.]+?|\\.GA)*?)?((-(swing|swt|shaded|sources|javadoc|native|linux-x86_64|macosx-x86_64|windows-x86|windows-x86_64))?(\\.jar(-[a-z]*)?))");
 
 	public static String stripFilenameVersion(final String filename) {
 		final Matcher matcher = versionPattern.matcher(filename);

src/test/java/org/scijava/util/FileUtilsTest.java

@@ -34,6 +34,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.scijava.test.TestUtils.createTemporaryDirectory;
@@ -289,6 +290,12 @@ public void testStripVersionFromFilename() {
 		assertEquals(FileUtils.stripFilenameVersion("jars/bsh.jar"), FileUtils.stripFilenameVersion("jars/bsh-2.0b4.jar"));
 		assertEquals(FileUtils.stripFilenameVersion("jars/mpicbg.jar"), FileUtils.stripFilenameVersion("jars/mpicbg-20111128.jar"));
 		assertEquals(FileUtils.stripFilenameVersion("jars/miglayout-swing.jar"), FileUtils.stripFilenameVersion("jars/miglayout-3.7.3.1-swing.jar"));
+
+		// Test that native binary .jars don't clash with their partner hook .jar
+		assertNotEquals("jars/ffmpeg.jar", FileUtils.stripFilenameVersion("jars/ffmpeg-2.6.1-0.11-windows-x86.jar"));
+		assertNotEquals("jars/ffmpeg.jar", FileUtils.stripFilenameVersion("jars/ffmpeg-2.6.1-0.11-windows-x86_64.jar"));
+		assertNotEquals("jars/ffmpeg.jar", FileUtils.stripFilenameVersion("jars/ffmpeg-2.6.1-0.11-macosx-x86_64.jar"));
+		assertNotEquals("jars/ffmpeg.jar", FileUtils.stripFilenameVersion("jars/ffmpeg-2.6.1-0.11-linux-x86_64.jar"));
 	}
 
 	@Test