Skip to content

Commit 32c4098

Browse files
committed
FileUtils: recognize more native classifiers
Any time we see "-native-..." or "-natives-..." it should be assumed to be a native classifier.
1 parent 482c170 commit 32c4098

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ private static String classifiers() {
729729
"shaded",
730730
"sources",
731731
"javadoc",
732-
"native",
732+
"natives?-?\\w*",
733733
"(natives-)?(android|linux|macosx|solaris|windows)-" +
734734
"(aarch64|amd64|arm|armv6|armv6hf|i586|universal|x86|x86_64)",
735735
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,12 @@ public void testStripVersionFromFilename() {
312312
assertEquals("jars/jogl-all-natives-solaris-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-solaris-i586.jar"));
313313
assertEquals("jars/jogl-all-natives-windows-amd64.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-windows-amd64.jar"));
314314
assertEquals("jars/jogl-all-natives-windows-i586.jar", FileUtils.stripFilenameVersion("jars/jogl-all-2.3.0-natives-windows-i586.jar"));
315+
316+
// Test jinput style of native binary .jars
317+
assertEquals("jars/jinput-natives-all.jar", FileUtils.stripFilenameVersion("jars/jinput-2.0.9-natives-all.jar"));
318+
319+
// Test that native-lib-loader is not misrecognized as a native classifier
320+
assertEquals("jars/native-lib-loader.jar", FileUtils.stripFilenameVersion("jars/native-lib-loader-2.3.2.jar"));
315321
}
316322

317323
@Test

0 commit comments

Comments
 (0)