Merge branch 'quickfix-additional-archs'

This fixes some erroneous detection of artifacts as duplicates,
when really they have different classifiers.

Closes joheras/IJ-OpenCV#13.

Author: ctrueden

src/it/do-not-delete-natives/setup.bsh

@@ -32,3 +32,14 @@ source(new File(basedir, "../../../src/it/lib.bsh").getPath());
 
 if (!plugins.exists()) plugins.mkdirs();
 touchFile(new File(plugins, "Example_PlugIn-0.9.0-natives-linux.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-android-arm.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-android-arm64.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-android-x86.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-android-x86_64.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-linux-x86.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-linux-x86_64.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-linux-armhf.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-linux-ppc64le.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-macosx-x86_64.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-windows-x86.jar"));
+touchFile(new File(plugins, "Example_PlugIn-0.9.0-windows-x86_64.jar"));

src/it/do-not-delete-natives/verify.bsh

@@ -31,5 +31,15 @@
 source(new File(basedir, "../../../src/it/lib.bsh").getPath());
 
 assertTrue("Should exist: " + plugin, plugin.exists());
-natives = new File(plugins, "Example_PlugIn-0.9.0-natives-linux.jar");
-assertTrue("Should exist: " + natives, natives.exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-natives-linux.jar"), new File(plugins, "Example_PlugIn-0.9.0-natives-linux.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-android-arm.jar"), new File(plugins, "Example_PlugIn-0.9.0-android-arm.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-android-arm64.jar"), new File(plugins, "Example_PlugIn-0.9.0-android-arm64.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-android-x86.jar"), new File(plugins, "Example_PlugIn-0.9.0-android-x86.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-android-x86_64.jar"), new File(plugins, "Example_PlugIn-0.9.0-android-x86_64.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-linux-x86.jar"), new File(plugins, "Example_PlugIn-0.9.0-linux-x86.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-linux-x86_64.jar"), new File(plugins, "Example_PlugIn-0.9.0-linux-x86_64.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-linux-armhf.jar"), new File(plugins, "Example_PlugIn-0.9.0-linux-armhf.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-linux-ppc64le.jar"), new File(plugins, "Example_PlugIn-0.9.0-linux-ppc64le.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-macosx-x86_64.jar"), new File(plugins, "Example_PlugIn-0.9.0-macosx-x86_64.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-windows-x86.jar"), new File(plugins, "Example_PlugIn-0.9.0-windows-x86.jar").exists());
+assertTrue("Should exist: " + new File(plugins, "Example_PlugIn-0.9.0-windows-x86_64.jar"), new File(plugins, "Example_PlugIn-0.9.0-windows-x86_64.jar").exists());

src/main/java/org/scijava/maven/plugin/install/AbstractCopyJarsMojo.java

@@ -439,7 +439,7 @@ private static boolean isIJ1Plugin(final File file) {
 
 	private final static Pattern versionPattern = Pattern.compile("(.+?)"
 		+ "(-\\d+(\\.\\d+|\\d{7})+[a-z]?\\d?(-[A-Za-z0-9.]+?|\\.GA)*?)?"
-		+ "((-(swing|swt|sources|javadoc|native|linux-x86|linux-x86_64|macosx-x86_64|windows-x86|windows-x86_64|android-arm|android-x86|natives-windows|natives-macos|natives-linux))?(\\.jar(-[a-z]*)?))");
+		+ "((-(swing|swt|sources|javadoc|native|linux-x86|linux-x86_64|linux-armhf|linux-ppc64le|macosx-x86_64|windows-x86|windows-x86_64|android-x86|android-x86_64|android-arm|android-arm64|ios-x86_64|ios-arm64|natives-windows|natives-macos|natives-linux))?(\\.jar(-[a-z]*)?))");
 	private final static int PREFIX_INDEX = 1;
 	private final static int VERSION_INDEX = 2;
 	private final static int SUFFIX_INDEX = 5;