Skip to content

Commit 1e472af

Browse files
committed
CopyJars: add additional archs
This is a quickfix until #21 is resolved. When an arch is not present in the regular expression, the arch modifier is interpreted as part of the version string, resulting in bogus behavior.
1 parent efc7ad1 commit 1e472af

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ private static boolean isIJ1Plugin(final File file) {
439439

440440
private final static Pattern versionPattern = Pattern.compile("(.+?)"
441441
+ "(-\\d+(\\.\\d+|\\d{7})+[a-z]?\\d?(-[A-Za-z0-9.]+?|\\.GA)*?)?"
442-
+ "((-(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]*)?))");
442+
+ "((-(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]*)?))");
443443
private final static int PREFIX_INDEX = 1;
444444
private final static int VERSION_INDEX = 2;
445445
private final static int SUFFIX_INDEX = 5;

0 commit comments

Comments
 (0)