mirror of https://github.com/rusefi/usb4java.git
Update dependencies
This commit is contained in:
Klaus Reimer
parent
a04d12bbd3
commit
47534f98bc
70
pom.xml
70
pom.xml
|
|
@ -6,7 +6,7 @@
|
|||
<artifactId>usb4java</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>usb4java</name>
|
||||
<version>1.2.1-SNAPSHOT</version>
|
||||
<version>1.3.0-SNAPSHOT</version>
|
||||
<url>http://usb4java.org/</url>
|
||||
<description>
|
||||
USB library for Java based on libusb and implementing javax-usb (JSR-80).
|
||||
|
|
@ -64,8 +64,8 @@
|
|||
<!--<repoBaseUrl>https://oss.sonatype.org/content/groups/public/org/usb4java</repoBaseUrl>-->
|
||||
<artifactBaseUrl>${repoBaseUrl}/${project.version}/${project.artifactId}-${project.version}</artifactBaseUrl>
|
||||
<javaxArtifactBaseUrl>${repoBaseUrl}-javax/${usb4javaJavaxVersion}/${project.artifactId}-javax-${usb4javaJavaxVersion}</javaxArtifactBaseUrl>
|
||||
<libusb4java.version>1.2.1-SNAPSHOT</libusb4java.version>
|
||||
<usb4javaJavaxVersion>1.2.1-SNAPSHOT</usb4javaJavaxVersion>
|
||||
<libusb4java.version>1.3.0-SNAPSHOT</libusb4java.version>
|
||||
<usb4javaJavaxVersion>1.3.0-SNAPSHOT</usb4javaJavaxVersion>
|
||||
</properties>
|
||||
|
||||
<scm>
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
</ciManagement>
|
||||
|
||||
<prerequisites>
|
||||
<maven>3.0</maven>
|
||||
<maven>3.0.5</maven>
|
||||
</prerequisites>
|
||||
|
||||
<reporting>
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>2.8</version>
|
||||
<version>3.0.0</version>
|
||||
<configuration>
|
||||
<dependencyDetailEnabled>false</dependencyDetailEnabled>
|
||||
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-changes-plugin</artifactId>
|
||||
<version>2.11</version>
|
||||
<version>2.12.1</version>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
|
|
@ -131,7 +131,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>2.10.2</version>
|
||||
<version>3.0.1</version>
|
||||
<reportSets>
|
||||
<reportSet>
|
||||
<reports>
|
||||
|
|
@ -149,27 +149,27 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.18.1</version>
|
||||
<version>2.22.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>2.6.1</version>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
<version>3.0.0-M1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<version>3.0.0-M1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>2.7</version>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
|
|
@ -180,7 +180,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.3</version>
|
||||
<version>3.8.0</version>
|
||||
<configuration>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
|
|
@ -192,7 +192,7 @@
|
|||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.4</version>
|
||||
<version>3.7.1</version>
|
||||
<configuration>
|
||||
<chmod>false</chmod>
|
||||
<locales>en</locales>
|
||||
|
|
@ -201,46 +201,30 @@
|
|||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!--
|
||||
- Updated plexus-archi er dependency fixes a problem with broken
|
||||
- permissions inside the JAR files.
|
||||
-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.6</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-archiver</artifactId>
|
||||
<version>2.4.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
|
||||
<!-- Build binary artifacts for Unix, Mac OS X and Windows -->
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<version>2.5.3</version>
|
||||
<version>3.1.0</version>
|
||||
<configuration>
|
||||
<append>true</append>
|
||||
<appendAssemblyId>false</appendAssemblyId>
|
||||
<descriptors>
|
||||
<descriptor>src/main/assembly/tarball.xml</descriptor>
|
||||
<descriptor>src/main/assembly/zip.xml</descriptor>
|
||||
</descriptors>
|
||||
<!-- Workaround for issue MASSEMBLY-449 -->
|
||||
<archiverConfig>
|
||||
<fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
|
||||
<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
|
||||
<defaultDirectoryMode>493</defaultDirectoryMode>
|
||||
</archiverConfig>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>package-assembly</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>attached</goal>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
|
|
@ -336,12 +320,6 @@
|
|||
<version>${libusb4java.version}</version>
|
||||
<classifier>linux-x86_64</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.usb4java</groupId>
|
||||
<artifactId>libusb4java</artifactId>
|
||||
<version>${libusb4java.version}</version>
|
||||
<classifier>linux-arm</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.usb4java</groupId>
|
||||
<artifactId>libusb4java</artifactId>
|
||||
|
|
@ -358,18 +336,24 @@
|
|||
<groupId>org.usb4java</groupId>
|
||||
<artifactId>libusb4java</artifactId>
|
||||
<version>${libusb4java.version}</version>
|
||||
<classifier>osx-x86</classifier>
|
||||
<classifier>macos-x86_64</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.usb4java</groupId>
|
||||
<artifactId>libusb4java</artifactId>
|
||||
<version>${libusb4java.version}</version>
|
||||
<classifier>osx-x86_64</classifier>
|
||||
<classifier>linux-armhf</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.usb4java</groupId>
|
||||
<artifactId>libusb4java</artifactId>
|
||||
<version>${libusb4java.version}</version>
|
||||
<classifier>linux-arm64</classifier>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.commons</groupId>
|
||||
<artifactId>commons-lang3</artifactId>
|
||||
<version>3.4</version>
|
||||
<version>3.8.1</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public final class Loader
|
|||
private static final int BUFFER_SIZE = 8192;
|
||||
|
||||
/** Constant for OS X operating system. */
|
||||
private static final String OS_OSX = "osx";
|
||||
private static final String OS_MACOS = "macos";
|
||||
|
||||
/** Constant for OS X operating system. */
|
||||
private static final String OS_MACOSX = "macosx";
|
||||
|
|
@ -51,6 +51,18 @@ public final class Loader
|
|||
|
||||
/** Constant for amd64 architecture. */
|
||||
private static final String ARCH_AMD64 = "amd64";
|
||||
|
||||
/** Constant for armhf architecture. */
|
||||
private static final String ARCH_ARMHF = "armhf";
|
||||
|
||||
/** Constant for aarch64 architecture. */
|
||||
private static final String ARCH_AARCH64 = "aarch64";
|
||||
|
||||
/** Constant for arm architecture. */
|
||||
private static final String ARCH_ARM = "arm";
|
||||
|
||||
/** Constant for arm64 architecture. */
|
||||
private static final String ARCH_ARM64 = "arm64";
|
||||
|
||||
/** Constant for so file extension. */
|
||||
private static final String EXT_SO = "so";
|
||||
|
|
@ -77,7 +89,7 @@ public final class Loader
|
|||
|
||||
/**
|
||||
* Returns the operating system name. This could be "linux", "windows" or
|
||||
* "osx" or (for any other non-supported platform) the value of the
|
||||
* "macos" or (for any other non-supported platform) the value of the
|
||||
* "os.name" property converted to lower case and with removed space
|
||||
* characters.
|
||||
*
|
||||
|
|
@ -93,7 +105,7 @@ public final class Loader
|
|||
}
|
||||
if (os.equals(OS_MACOSX))
|
||||
{
|
||||
return OS_OSX;
|
||||
return OS_MACOS;
|
||||
}
|
||||
return os;
|
||||
}
|
||||
|
|
@ -118,6 +130,14 @@ public final class Loader
|
|||
{
|
||||
return ARCH_X86_64;
|
||||
}
|
||||
if (arch.equals(ARCH_AARCH64))
|
||||
{
|
||||
return ARCH_ARM64;
|
||||
}
|
||||
if (arch.equals(ARCH_ARM))
|
||||
{
|
||||
return ARCH_ARMHF;
|
||||
}
|
||||
return arch;
|
||||
}
|
||||
|
||||
|
|
@ -143,7 +163,7 @@ public final class Loader
|
|||
{
|
||||
return EXT_DLL;
|
||||
}
|
||||
if (os.equals(OS_OSX))
|
||||
if (os.equals(OS_MACOS))
|
||||
{
|
||||
return EXT_DYLIB;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue