diff --git a/.idea/libraries/buck_lib.xml b/.idea/libraries/buck_lib.xml index e92530beec5..9eaa20b11fa 100644 --- a/.idea/libraries/buck_lib.xml +++ b/.idea/libraries/buck_lib.xml @@ -5,18 +5,18 @@ - - + + - + - + - - + + @@ -27,18 +27,18 @@ - - + + - + - - + + diff --git a/.idea/libraries/jna.xml b/.idea/libraries/jna.xml index d05e27b8ef4..9e6c23fceff 100644 --- a/.idea/libraries/jna.xml +++ b/.idea/libraries/jna.xml @@ -1,11 +1,13 @@ - + - + + + - + \ No newline at end of file diff --git a/.idea/libraries/jna_4_5_1.xml b/.idea/libraries/jna_4_5_1.xml deleted file mode 100644 index df7d4364463..00000000000 --- a/.idea/libraries/jna_4_5_1.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/jna_5_6_0.xml b/.idea/libraries/jna_5_6_0.xml new file mode 100644 index 00000000000..bd4782cb4f9 --- /dev/null +++ b/.idea/libraries/jna_5_6_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jna_platform.xml b/.idea/libraries/jna_platform.xml index 542205ed3ee..8fb34d80ae0 100644 --- a/.idea/libraries/jna_platform.xml +++ b/.idea/libraries/jna_platform.xml @@ -1,11 +1,13 @@ - + - + + + - + \ No newline at end of file diff --git a/.idea/libraries/jna_platform_4_5_1.xml b/.idea/libraries/jna_platform_5_6_0.xml similarity index 73% rename from .idea/libraries/jna_platform_4_5_1.xml rename to .idea/libraries/jna_platform_5_6_0.xml index 24acb1e24ad..ddb25ee37df 100644 --- a/.idea/libraries/jna_platform_4_5_1.xml +++ b/.idea/libraries/jna_platform_5_6_0.xml @@ -1,11 +1,11 @@ - + - + - + \ No newline at end of file diff --git a/buck.iml b/buck.iml index c0d96fdc408..4935f2b888e 100644 --- a/buck.iml +++ b/buck.iml @@ -123,8 +123,8 @@ - - + + diff --git a/build.xml b/build.xml index 75ca779735b..dda61b97102 100644 --- a/build.xml +++ b/build.xml @@ -152,9 +152,9 @@ - - - + + + @@ -168,7 +168,7 @@ - + @@ -229,14 +229,14 @@ - + - + diff --git a/programs/classpaths b/programs/classpaths index 8ab03688bdd..029e0bf8055 100644 --- a/programs/classpaths +++ b/programs/classpaths @@ -59,20 +59,20 @@ third-party/java/jackson/jackson-datatype-jdk8-2.9.7.jar third-party/java/jackson/jackson-module-kotlin-2.9.9.jar third-party/java/jdom/jdom-2.0.6.jar third-party/java/jetty/jetty-all-9.4.9.v20180320-uber.jar -third-party/java/jna/jna-4.5.1.jar -third-party/java/jna/jna-platform-4.5.1.jar +third-party/java/jna/jna-5.6.0.jar +third-party/java/jna/jna-platform-5.6.0.jar third-party/java/jopt-simple/jopt-simple-4.6.jar third-party/java/json-simple/json-simple-1.1.1.jar third-party/java/jsr/javax.inject-1.jar third-party/java/jsr/jsr305.jar third-party/java/kxml2/kxml2-2.3.0.jar -third-party/java/nailgun/nailgun-server-1.0.0.jar -third-party/java/nuprocess/nuprocess-1.2.4.jar -third-party/java/ObjCBridge/ObjCBridge.jar +third-party/java/nailgun/nailgun-server-1.0.1.jar +third-party/java/nuprocess/nuprocess-2.0.1.jar +third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar third-party/java/objenesis/objenesis-1.2.jar third-party/java/okhttp/okhttp-3.9.0.jar third-party/java/okio/okio-1.13.0.jar -third-party/java/oshi/oshi-core-3.3-SNAPSHOT.jar +third-party/java/oshi/oshi-core-5.2.5.jar third-party/java/opencensus/opencensus-api-0.24.0.jar third-party/java/opencensus/opencensus-contrib-grpc-metrics-0.24.0.jar third-party/java/pf4j/pf4j-2.0.0-SNAPSHOT.jar diff --git a/src/com/facebook/buck/cli/BuckDaemon.java b/src/com/facebook/buck/cli/BuckDaemon.java index 4af0a1ed418..5dfc3895797 100644 --- a/src/com/facebook/buck/cli/BuckDaemon.java +++ b/src/com/facebook/buck/cli/BuckDaemon.java @@ -48,7 +48,7 @@ public final class BuckDaemon { * *

See: https://github.com/java-native-access/jna/issues/652 */ - public static final int JNA_POINTER_SIZE = Pointer.SIZE; + public static final int JNA_POINTER_SIZE = Native.POINTER_SIZE; private static final int AFTER_COMMAND_AUTO_GC_DELAY_MS = 5000; private static final int SUBSEQUENT_GC_DELAY_MS = 10000; diff --git a/src/com/facebook/buck/cli/MainRunner.java b/src/com/facebook/buck/cli/MainRunner.java index b04648ac307..4f3b8abd57b 100644 --- a/src/com/facebook/buck/cli/MainRunner.java +++ b/src/com/facebook/buck/cli/MainRunner.java @@ -235,7 +235,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.sun.jna.Pointer; +import com.sun.jna.Native; import java.io.Closeable; import java.io.FileNotFoundException; import java.io.IOException; @@ -284,7 +284,7 @@ public final class MainRunner { * *

See: https://github.com/java-native-access/jna/issues/652 */ - public static final int JNA_POINTER_SIZE = Pointer.SIZE; + public static final int JNA_POINTER_SIZE = Native.POINTER_SIZE; private static final Optional BUCKD_LAUNCH_TIME_NANOS = Optional.ofNullable(System.getProperty("buck.buckd_launch_time_nanos")); diff --git a/src/com/facebook/buck/util/ProcessHelper.java b/src/com/facebook/buck/util/ProcessHelper.java index 730ab31ba56..69fdc598d1e 100644 --- a/src/com/facebook/buck/util/ProcessHelper.java +++ b/src/com/facebook/buck/util/ProcessHelper.java @@ -68,7 +68,7 @@ public static ProcessHelper getInstance() { try { LOG.verbose("Getting process tree..."); OperatingSystem os = OSHI.getOperatingSystem(); - OSProcess[] processes = os.getProcesses(100, OperatingSystem.ProcessSort.NEWEST); + List processes = os.getProcesses(100, OperatingSystem.ProcessSort.NEWEST); for (OSProcess process : processes) { tree.add(process); } diff --git a/third-party/java/ObjCBridge/BUCK b/third-party/java/ObjCBridge/BUCK index 46dab407b28..122f890ca2e 100644 --- a/third-party/java/ObjCBridge/BUCK +++ b/third-party/java/ObjCBridge/BUCK @@ -1,9 +1,10 @@ prebuilt_jar( name = "ObjCBridge", - binary_jar = "ObjCBridge.jar", + binary_jar = "java-objc-bridge-1.1-SNAPSHOT.jar", licenses = [ "LICENSE", ], + source_jar = "java-objc-bridge-1.1-SNAPSHOT-sources.jar", visibility = ["PUBLIC"], deps = [ "//third-party/java/jna:jna", diff --git a/third-party/java/ObjCBridge/ObjCBridge.jar b/third-party/java/ObjCBridge/ObjCBridge.jar deleted file mode 100644 index f558a6f5bb7..00000000000 Binary files a/third-party/java/ObjCBridge/ObjCBridge.jar and /dev/null differ diff --git a/third-party/java/ObjCBridge/README.facebook b/third-party/java/ObjCBridge/README.facebook index 193e7075d84..caa5ca9702c 100644 --- a/third-party/java/ObjCBridge/README.facebook +++ b/third-party/java/ObjCBridge/README.facebook @@ -1,6 +1,16 @@ Project: Java Objective-C Bridge -Version: Git revision c22107743c2751f1fbaef3f509d59683f16adb60 -Release Date: 2014-08-06 +Version: Git revision c38d607820e18bdc607067457ba6680a6277f7cd +Release Date: Sun Nov 3 19:35:06 2019 +0100 Website: https://github.com/shannah/Java-Objective-C-Bridge/ License: Apache 2.0 Description: JNA library to allow Java programs to invoke Objective-C APIs +Instructions: + brew install maven + brew install gpg + gpg --gen-key + git clone https://github.com/shannah/Java-Objective-C-Bridge.git + cd Java-Objective-C-Bridge + Edit pom.xml (or apply patch.diff) + Change to version 8 + Change to version 8 + mvn clean install -Drelease=true diff --git a/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT-javadoc.jar b/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT-javadoc.jar new file mode 100644 index 00000000000..c6ea5287adf Binary files /dev/null and b/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT-javadoc.jar differ diff --git a/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT-sources.jar b/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT-sources.jar new file mode 100644 index 00000000000..996c6b79e3f Binary files /dev/null and b/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT-sources.jar differ diff --git a/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar b/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar new file mode 100644 index 00000000000..d4bb935503d Binary files /dev/null and b/third-party/java/ObjCBridge/java-objc-bridge-1.1-SNAPSHOT.jar differ diff --git a/third-party/java/ObjCBridge/libjcocoa.dylib b/third-party/java/ObjCBridge/libjcocoa.dylib index f01c68b9c18..9cb1873bf13 100755 Binary files a/third-party/java/ObjCBridge/libjcocoa.dylib and b/third-party/java/ObjCBridge/libjcocoa.dylib differ diff --git a/third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Info.plist b/third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Info.plist new file mode 100644 index 00000000000..58347f605d3 --- /dev/null +++ b/third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.libjcocoa.dylib + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Resources/DWARF/libjcocoa.dylib b/third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Resources/DWARF/libjcocoa.dylib new file mode 100644 index 00000000000..270550ec424 Binary files /dev/null and b/third-party/java/ObjCBridge/libjcocoa.dylib.dSYM/Contents/Resources/DWARF/libjcocoa.dylib differ diff --git a/third-party/java/ObjCBridge/patch.diff b/third-party/java/ObjCBridge/patch.diff new file mode 100644 index 00000000000..4de66405a49 --- /dev/null +++ b/third-party/java/ObjCBridge/patch.diff @@ -0,0 +1,27 @@ +diff --git a/pom.xml b/pom.xml +index 76d7547..50fef9a 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -40,8 +40,8 @@ + + + UTF-8 +- 11 +- 11 ++ 8 ++ 8 + Debug + + +diff --git a/src/main/java/ca/weblite/objc/Proxy.java b/src/main/java/ca/weblite/objc/Proxy.java +index 0654519..7aba1f5 100644 +--- a/src/main/java/ca/weblite/objc/Proxy.java ++++ b/src/main/java/ca/weblite/objc/Proxy.java +@@ -501,7 +501,6 @@ public class Proxy implements Peerable { + */ + @Override + public String toString(){ +- System.out.println("The peer is "+getPeer()); + if ( getPeer() == null ){ + return "null"; + } diff --git a/third-party/java/jna/BUCK b/third-party/java/jna/BUCK index 7c3e5e17bd1..0ce430edc44 100644 --- a/third-party/java/jna/BUCK +++ b/third-party/java/jna/BUCK @@ -1,19 +1,19 @@ prebuilt_jar( name = "jna", - binary_jar = "jna-4.5.1.jar", + binary_jar = "jna-5.6.0.jar", licenses = [ "LICENSE", ], - source_jar = "jna-4.5.1-sources.jar", + source_jar = "jna-5.6.0-sources.jar", visibility = ["PUBLIC"], ) prebuilt_jar( name = "jna-platform", - binary_jar = "jna-platform-4.5.1.jar", + binary_jar = "jna-platform-5.6.0.jar", licenses = [ "LICENSE", ], - source_jar = "jna-platform-4.5.1-sources.jar", + source_jar = "jna-platform-5.6.0-sources.jar", visibility = ["PUBLIC"], ) diff --git a/third-party/java/jna/README.facebook b/third-party/java/jna/README.facebook index 7f4bacea943..7e9df94b41c 100644 --- a/third-party/java/jna/README.facebook +++ b/third-party/java/jna/README.facebook @@ -2,6 +2,6 @@ README for JNA URL: https://github.com/java-native-access/jna Downloaded From: - http://central.maven.org/maven2/net/java/dev/jna/jna/4.5.1/ - http://central.maven.org/maven2/net/java/dev/jna/jna-platform/4.5.1/ + https://search.maven.org/artifact/net.java.dev.jna/jna/5.6.0/jar + https://search.maven.org/artifact/net.java.dev.jna/jna-platform/5.6.0/jar License: Apache 2.0 and LPGL 2.1 dual license diff --git a/third-party/java/jna/jna-4.5.1-sources.jar b/third-party/java/jna/jna-4.5.1-sources.jar deleted file mode 100644 index c4b516c1773..00000000000 Binary files a/third-party/java/jna/jna-4.5.1-sources.jar and /dev/null differ diff --git a/third-party/java/jna/jna-4.5.1.jar b/third-party/java/jna/jna-4.5.1.jar deleted file mode 100644 index 68216afbea0..00000000000 Binary files a/third-party/java/jna/jna-4.5.1.jar and /dev/null differ diff --git a/third-party/java/jna/jna-5.6.0-javadoc.jar b/third-party/java/jna/jna-5.6.0-javadoc.jar new file mode 100644 index 00000000000..8be1f339e34 Binary files /dev/null and b/third-party/java/jna/jna-5.6.0-javadoc.jar differ diff --git a/third-party/java/jna/jna-5.6.0-sources.jar b/third-party/java/jna/jna-5.6.0-sources.jar new file mode 100644 index 00000000000..36f599d36d1 Binary files /dev/null and b/third-party/java/jna/jna-5.6.0-sources.jar differ diff --git a/third-party/java/jna/jna-5.6.0.jar b/third-party/java/jna/jna-5.6.0.jar new file mode 100644 index 00000000000..fda5aa4132a Binary files /dev/null and b/third-party/java/jna/jna-5.6.0.jar differ diff --git a/third-party/java/jna/jna-platform-4.5.1-sources.jar b/third-party/java/jna/jna-platform-4.5.1-sources.jar deleted file mode 100644 index 98308622da3..00000000000 Binary files a/third-party/java/jna/jna-platform-4.5.1-sources.jar and /dev/null differ diff --git a/third-party/java/jna/jna-platform-5.6.0-javadoc.jar b/third-party/java/jna/jna-platform-5.6.0-javadoc.jar new file mode 100644 index 00000000000..1fae1207962 Binary files /dev/null and b/third-party/java/jna/jna-platform-5.6.0-javadoc.jar differ diff --git a/third-party/java/jna/jna-platform-5.6.0-sources.jar b/third-party/java/jna/jna-platform-5.6.0-sources.jar new file mode 100644 index 00000000000..2c3ee27a365 Binary files /dev/null and b/third-party/java/jna/jna-platform-5.6.0-sources.jar differ diff --git a/third-party/java/jna/jna-platform-4.5.1.jar b/third-party/java/jna/jna-platform-5.6.0.jar similarity index 55% rename from third-party/java/jna/jna-platform-4.5.1.jar rename to third-party/java/jna/jna-platform-5.6.0.jar index 5aeb3e4e35f..91b263520b6 100644 Binary files a/third-party/java/jna/jna-platform-4.5.1.jar and b/third-party/java/jna/jna-platform-5.6.0.jar differ diff --git a/third-party/java/nailgun/BUCK b/third-party/java/nailgun/BUCK index f59eb231472..ef6f117ce2e 100644 --- a/third-party/java/nailgun/BUCK +++ b/third-party/java/nailgun/BUCK @@ -1,10 +1,10 @@ prebuilt_jar( name = "nailgun", - binary_jar = "nailgun-server-1.0.0.jar", + binary_jar = "nailgun-server-1.0.1.jar", licenses = [ "LICENSE", ], - source_jar = "nailgun-server-1.0.0-sources.jar", + source_jar = "nailgun-server-1.0.1-sources.jar", visibility = [ "//src/com/facebook/buck/cli:cli", "//src/com/facebook/buck/cli/exceptions/handlers:handlers", diff --git a/third-party/java/nailgun/README.txt b/third-party/java/nailgun/README.txt index c0c629ea0db..54eeefe177f 100644 --- a/third-party/java/nailgun/README.txt +++ b/third-party/java/nailgun/README.txt @@ -1,7 +1,8 @@ -nailgun-server-1.0.0.jar and nailgun-server-1.0.0-sources.jar were -built from https://github.com/facebook/nailgun +Repository: https://github.com/facebook/nailgun +URL: https://search.maven.org/artifact/com.facebook/nailgun-server/1.0.1/jar +Version: 1.0.1 -To regenerate these jars: +Build Instructions: 0) install maven (brew install maven) 1) git clone https://github.com/facebook/nailgun diff --git a/third-party/java/nailgun/nailgun-server-1.0.1-javadoc.jar b/third-party/java/nailgun/nailgun-server-1.0.1-javadoc.jar new file mode 100644 index 00000000000..9ab091a2003 Binary files /dev/null and b/third-party/java/nailgun/nailgun-server-1.0.1-javadoc.jar differ diff --git a/third-party/java/nailgun/nailgun-server-1.0.0-sources.jar b/third-party/java/nailgun/nailgun-server-1.0.1-sources.jar similarity index 65% rename from third-party/java/nailgun/nailgun-server-1.0.0-sources.jar rename to third-party/java/nailgun/nailgun-server-1.0.1-sources.jar index c6d5d58c6e4..7f24928e862 100644 Binary files a/third-party/java/nailgun/nailgun-server-1.0.0-sources.jar and b/third-party/java/nailgun/nailgun-server-1.0.1-sources.jar differ diff --git a/third-party/java/nailgun/nailgun-server-1.0.0.jar b/third-party/java/nailgun/nailgun-server-1.0.1.jar similarity index 82% rename from third-party/java/nailgun/nailgun-server-1.0.0.jar rename to third-party/java/nailgun/nailgun-server-1.0.1.jar index 1c9333c8c85..112e4f8c879 100644 Binary files a/third-party/java/nailgun/nailgun-server-1.0.0.jar and b/third-party/java/nailgun/nailgun-server-1.0.1.jar differ diff --git a/third-party/java/nuprocess/BUCK b/third-party/java/nuprocess/BUCK index e05f557e50e..9fb5c1436ac 100644 --- a/third-party/java/nuprocess/BUCK +++ b/third-party/java/nuprocess/BUCK @@ -1,10 +1,10 @@ prebuilt_jar( name = "nuprocess", - binary_jar = "nuprocess-1.2.4.jar", + binary_jar = "nuprocess-2.0.1.jar", licenses = [ "LICENSE", ], - source_jar = "nuprocess-1.2.4-sources.jar", + source_jar = "nuprocess-2.0.1-sources.jar", visibility = ["PUBLIC"], deps = [ "//third-party/java/jna:jna", diff --git a/third-party/java/nuprocess/README.facebook b/third-party/java/nuprocess/README.facebook index 34c7618bad4..35a933801e1 100644 --- a/third-party/java/nuprocess/README.facebook +++ b/third-party/java/nuprocess/README.facebook @@ -1,6 +1,8 @@ README for NuProcess -URL: https://github.com/brettwooldridge/NuProcess -Revision: 562e0b39cd893ca389ba2d0b3689dde305b7632d -Built With: mvn package +Repository: https://github.com/brettwooldridge/NuProcess +URL: https://search.maven.org/artifact/com.zaxxer/nuprocess/2.0.1/bundle +Version: 2.01 +Build Instructions: + mvn package License: Apache 2.0 license diff --git a/third-party/java/nuprocess/nuprocess-1.2.4-sources.jar b/third-party/java/nuprocess/nuprocess-1.2.4-sources.jar deleted file mode 100644 index 2c7c2c2fc5c..00000000000 Binary files a/third-party/java/nuprocess/nuprocess-1.2.4-sources.jar and /dev/null differ diff --git a/third-party/java/nuprocess/nuprocess-1.2.4.jar b/third-party/java/nuprocess/nuprocess-1.2.4.jar deleted file mode 100644 index 7475418b426..00000000000 Binary files a/third-party/java/nuprocess/nuprocess-1.2.4.jar and /dev/null differ diff --git a/third-party/java/nuprocess/nuprocess-2.0.1-javadoc.jar b/third-party/java/nuprocess/nuprocess-2.0.1-javadoc.jar new file mode 100644 index 00000000000..735f3b7b057 Binary files /dev/null and b/third-party/java/nuprocess/nuprocess-2.0.1-javadoc.jar differ diff --git a/third-party/java/nuprocess/nuprocess-2.0.1-sources.jar b/third-party/java/nuprocess/nuprocess-2.0.1-sources.jar new file mode 100644 index 00000000000..d1d90c21d2d Binary files /dev/null and b/third-party/java/nuprocess/nuprocess-2.0.1-sources.jar differ diff --git a/third-party/java/nuprocess/nuprocess-2.0.1.jar b/third-party/java/nuprocess/nuprocess-2.0.1.jar new file mode 100644 index 00000000000..7c856ed78df Binary files /dev/null and b/third-party/java/nuprocess/nuprocess-2.0.1.jar differ diff --git a/third-party/java/oshi/BUCK b/third-party/java/oshi/BUCK index 237c82d46e3..b0bf74e1ceb 100644 --- a/third-party/java/oshi/BUCK +++ b/third-party/java/oshi/BUCK @@ -1,10 +1,10 @@ prebuilt_jar( name = "oshi-core", - binary_jar = "oshi-core-3.3-SNAPSHOT.jar", + binary_jar = "oshi-core-5.2.5.jar", licenses = [ "LICENSE.html", ], - source_jar = "oshi-core-3.3-SNAPSHOT-sources.jar", + source_jar = "oshi-core-5.2.5-sources.jar", visibility = ["PUBLIC"], deps = [ "//third-party/java/jna:jna", diff --git a/third-party/java/oshi/README.facebook b/third-party/java/oshi/README.facebook index b8dbfef4dcf..3dcaf4e924a 100644 --- a/third-party/java/oshi/README.facebook +++ b/third-party/java/oshi/README.facebook @@ -1,8 +1,9 @@ README for OSHI -URL: https://github.com/oshi/oshi/commit/e51f8e84f20bc4b132aa02601a4760b20bd4a198 -Version: 3.3-SNAPSHOT e51f8e84f20bc4b132aa02601a4760b20bd4a198 -Built with: +Repository: https://github.com/oshi/oshi +URL: https://search.maven.org/artifact/com.github.oshi/oshi-core/5.2.5/jar +Version: 5.2.5 +Build Instructions: mvn package mvn source:jar License: Eclipse Public License v1.0 diff --git a/third-party/java/oshi/oshi-core-3.3-SNAPSHOT-sources.jar b/third-party/java/oshi/oshi-core-3.3-SNAPSHOT-sources.jar deleted file mode 100644 index 9fde3592b57..00000000000 Binary files a/third-party/java/oshi/oshi-core-3.3-SNAPSHOT-sources.jar and /dev/null differ diff --git a/third-party/java/oshi/oshi-core-3.3-SNAPSHOT.jar b/third-party/java/oshi/oshi-core-3.3-SNAPSHOT.jar deleted file mode 100644 index 5772648ad55..00000000000 Binary files a/third-party/java/oshi/oshi-core-3.3-SNAPSHOT.jar and /dev/null differ diff --git a/third-party/java/oshi/oshi-core-5.2.5-javadoc.jar b/third-party/java/oshi/oshi-core-5.2.5-javadoc.jar new file mode 100644 index 00000000000..4499e583381 Binary files /dev/null and b/third-party/java/oshi/oshi-core-5.2.5-javadoc.jar differ diff --git a/third-party/java/oshi/oshi-core-5.2.5-sources.jar b/third-party/java/oshi/oshi-core-5.2.5-sources.jar new file mode 100644 index 00000000000..e21677e6e16 Binary files /dev/null and b/third-party/java/oshi/oshi-core-5.2.5-sources.jar differ diff --git a/third-party/java/oshi/oshi-core-5.2.5.jar b/third-party/java/oshi/oshi-core-5.2.5.jar new file mode 100644 index 00000000000..c53d2451eec Binary files /dev/null and b/third-party/java/oshi/oshi-core-5.2.5.jar differ