diff --git a/.classpath b/.classpath index 1ebf54417dd..574e1c7f83d 100644 --- a/.classpath +++ b/.classpath @@ -23,7 +23,6 @@ - diff --git a/app/.classpath b/app/.classpath index 4a1f51314f8..27164be5b04 100644 --- a/app/.classpath +++ b/app/.classpath @@ -34,7 +34,6 @@ - diff --git a/app/lib/jackson-module-mrbean-2.9.5.jar b/app/lib/jackson-module-mrbean-2.9.5.jar deleted file mode 100644 index dc7f5a05721..00000000000 Binary files a/app/lib/jackson-module-mrbean-2.9.5.jar and /dev/null differ diff --git a/app/test/cc/arduino/contributions/GzippedJsonDownloaderTest.java b/app/test/cc/arduino/contributions/GzippedJsonDownloaderTest.java index 745ccb1dd5b..f3f11a00247 100644 --- a/app/test/cc/arduino/contributions/GzippedJsonDownloaderTest.java +++ b/app/test/cc/arduino/contributions/GzippedJsonDownloaderTest.java @@ -4,7 +4,6 @@ import cc.arduino.utils.MultiStepProgress; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.mrbean.MrBeanModule; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,7 +43,6 @@ public void testJsonDownload() throws Exception { InputStream indexIn = new FileInputStream(tempFile); ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new MrBeanModule()); mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true); mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/app/test/cc/arduino/contributions/JsonDownloaderTest.java b/app/test/cc/arduino/contributions/JsonDownloaderTest.java index bdb64325f59..1fa7ef26f30 100644 --- a/app/test/cc/arduino/contributions/JsonDownloaderTest.java +++ b/app/test/cc/arduino/contributions/JsonDownloaderTest.java @@ -4,7 +4,6 @@ import cc.arduino.utils.MultiStepProgress; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.mrbean.MrBeanModule; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -43,7 +42,6 @@ public void testJsonDownload() throws Exception { InputStream indexIn = new FileInputStream(tempFile); ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new MrBeanModule()); mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true); mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/arduino-core/.classpath b/arduino-core/.classpath index a74c83fd64f..b4f9733f8dd 100644 --- a/arduino-core/.classpath +++ b/arduino-core/.classpath @@ -20,7 +20,6 @@ - diff --git a/arduino-core/lib/jackson-module-mrbean-2.9.5.jar b/arduino-core/lib/jackson-module-mrbean-2.9.5.jar deleted file mode 100644 index dc7f5a05721..00000000000 Binary files a/arduino-core/lib/jackson-module-mrbean-2.9.5.jar and /dev/null differ diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java index 692a3dfb20b..603b46909b3 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibrary.java @@ -35,38 +35,67 @@ import static processing.app.I18n.tr; import java.util.Comparator; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import cc.arduino.contributions.VersionHelper; -public abstract class ContributedLibrary extends DownloadableContribution { +public class ContributedLibrary extends DownloadableContribution { - public abstract String getName(); + private String url; + private String version; + private String checksum; + private long size; + private String archiveFileName; + private String name; + private String maintainer; + private String author; + private String website; + private String category; + private String licence; + private String paragraph; + private String sentence; + private ArrayList architectures; + private ArrayList types; + private ArrayList dependencies; + private ArrayList providesIncludes; - public abstract String getMaintainer(); + public String getUrl() { return url; } - public abstract String getAuthor(); + public String getVersion() { return version; } - public abstract String getWebsite(); + public String getChecksum() { return checksum; } - public abstract String getCategory(); + public long getSize() { return size; } - public abstract void setCategory(String category); + public String getArchiveFileName() { return archiveFileName; } - public abstract String getLicense(); + public String getName() { return name; } - public abstract String getParagraph(); + public String getMaintainer() { return maintainer; } - public abstract String getSentence(); + public String getAuthor() { return author; } - public abstract List getArchitectures(); + public String getWebsite() { return website; } - public abstract List getTypes(); + public String getCategory() { return category; } - public abstract List getDependencies(); + public void setCategory(String category) { this.category = category; } - public abstract List getProvidesIncludes(); + public String getLicense() { return licence; } + + public String getParagraph() { return paragraph; } + + public String getSentence() { return sentence; } + + public List getArchitectures() { return architectures; } + + public List getTypes() { return types; } + + public List getDependencies() { return dependencies; } + + public List getProvidesIncludes() { return providesIncludes; } public static final Comparator CASE_INSENSITIVE_ORDER = (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()); diff --git a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java index e8e500dd585..4da5ba6f75b 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/ContributedLibraryDependency.java @@ -29,11 +29,14 @@ package cc.arduino.contributions.libraries; -public abstract class ContributedLibraryDependency { +public class ContributedLibraryDependency { - public abstract String getName(); + private String name; + private String version; - public abstract String getVersion(); + public String getName() { return name; } + + public String getVersion() { return version; } @Override public String toString() { diff --git a/arduino-core/src/cc/arduino/contributions/libraries/EmptyLibrariesIndex.java b/arduino-core/src/cc/arduino/contributions/libraries/EmptyLibrariesIndex.java deleted file mode 100644 index f85ab46ef3c..00000000000 --- a/arduino-core/src/cc/arduino/contributions/libraries/EmptyLibrariesIndex.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of Arduino. - * - * Copyright 2016 Arduino LLC (http://www.arduino.cc/) - * - * Arduino is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As a special exception, you may use this file as part of a free software - * library without restriction. Specifically, if other files instantiate - * templates or use macros or inline functions from this file, or you compile - * this file and link it with other files to produce an executable, this - * file does not by itself cause the resulting executable to be covered by - * the GNU General Public License. This exception does not however - * invalidate any other reasons why the executable file might be covered by - * the GNU General Public License. - */ - -package cc.arduino.contributions.libraries; - -import java.util.ArrayList; -import java.util.List; - -public class EmptyLibrariesIndex extends LibrariesIndex { - - private List list = new ArrayList<>(); - - @Override - public List getLibraries() { - return list; - } - -} diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java index d66a31fd3ce..02ff0475cfa 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java @@ -40,9 +40,13 @@ import cc.arduino.contributions.VersionComparator; -public abstract class LibrariesIndex { +public class LibrariesIndex { - public abstract List getLibraries(); + private ArrayList list = new ArrayList<>(); + + public List getLibraries() { + return list; + } public List find(final String name) { return getLibraries().stream() // diff --git a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java index c43a4a09423..fb0b0c76abe 100644 --- a/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java +++ b/arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndexer.java @@ -36,7 +36,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.mrbean.MrBeanModule; import org.apache.commons.compress.utils.IOUtils; import processing.app.BaseNoGui; import processing.app.I18n; @@ -76,7 +75,7 @@ public LibrariesIndexer(File preferencesFolder) { } public void parseIndex() throws IOException { - index = new EmptyLibrariesIndex(); // Fallback + index = new LibrariesIndex(); // Fallback if (!indexFile.exists()) { return; @@ -92,7 +91,6 @@ private void parseIndex(File file) throws IOException { try { indexIn = new FileInputStream(file); ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new MrBeanModule()); mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true); mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java index 7017ced5d10..c29110376bc 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedBoard.java @@ -29,8 +29,9 @@ package cc.arduino.contributions.packages; -public interface ContributedBoard { +public class ContributedBoard { - String getName(); + private String name; + public String getName() { return name; } } diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java index a8f998f668b..2156f5c48c9 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedHelp.java @@ -29,8 +29,9 @@ package cc.arduino.contributions.packages; -public abstract class ContributedHelp { +public class ContributedHelp { - public abstract String getOnline(); + private String online; + public String getOnline() { return online; } } diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java index 507a63be11d..8b260527ae5 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPackage.java @@ -29,25 +29,33 @@ package cc.arduino.contributions.packages; +import java.util.ArrayList; import java.util.List; -public abstract class ContributedPackage { +public class ContributedPackage { - public abstract String getName(); + private String name; + private String maintainer; + private String websiteURL; + private String email; + private ArrayList platforms = new ArrayList(); + private ArrayList tools = new ArrayList(); + private ContributedHelp help; + private boolean trusted; - public abstract String getMaintainer(); + public String getName() { return name; } - public abstract String getWebsiteURL(); + public String getMaintainer() { return maintainer; } - public abstract String getEmail(); + public String getWebsiteURL() { return websiteURL; } - public abstract List getPlatforms(); + public String getEmail() { return email; } - public abstract List getTools(); + public List getPlatforms() { return platforms; } - public abstract ContributedHelp getHelp(); + public List getTools() { return tools; } - private boolean trusted; + public ContributedHelp getHelp() { return help; } public ContributedPlatform findPlatform(String architecture, String version) { if (architecture == null || version == null) { diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java index 3149aea1e2f..5fea546c108 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedPlatform.java @@ -35,26 +35,49 @@ import java.io.File; import java.util.*; -public abstract class ContributedPlatform extends DownloadableContribution { +public class ContributedPlatform extends DownloadableContribution { + + private String url; + private String version; + private long size; + private String archiveFileName; + private String name; + private String category; + private String architecture; + private String checksum; + private ArrayList toolsDependencies = new ArrayList(); + private ArrayList boards = new ArrayList(); + private ContributedHelp help; + private boolean installed; + private File installedFolder; + private boolean builtIn; + private Map resolvedToolReferences; + private ContributedPackage parentPackage; - public abstract String getName(); + public String getUrl() { return url; } - public abstract String getCategory(); + public String getVersion() { return version; } - public abstract void setCategory(String category); + public long getSize() { return size; } - public abstract String getArchitecture(); + public String getArchiveFileName() { return archiveFileName; } - @Override - public abstract String getChecksum(); + public String getName() { return name; } - public abstract List getToolsDependencies(); + public String getCategory() { return category; } - public abstract List getBoards(); + public void setCategory(String category) { this.category = category; } - public abstract ContributedHelp getHelp(); + public String getArchitecture() { return architecture; } - private boolean installed; + @Override + public String getChecksum() { return checksum; } + + public List getToolsDependencies() { return toolsDependencies; } + + public List getBoards() { return boards; } + + public ContributedHelp getHelp() { return help; } public boolean isInstalled() { return installed; @@ -64,8 +87,6 @@ public void setInstalled(boolean installed) { this.installed = installed; } - private File installedFolder; - public File getInstalledFolder() { return installedFolder; } @@ -74,8 +95,6 @@ public void setInstalledFolder(File installedFolder) { this.installedFolder = installedFolder; } - private boolean builtIn; - public boolean isBuiltIn() { return builtIn; } @@ -90,10 +109,6 @@ public void setBuiltIn(boolean builtIn) { return px - py; }; - private Map resolvedToolReferences; - - private ContributedPackage parentPackage; - public List getResolvedTools() { return new LinkedList<>(resolvedToolReferences.values()); } diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java index cafeb9aef84..915dc28489b 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedTool.java @@ -33,17 +33,24 @@ import processing.app.Platform; import java.io.File; +import java.util.ArrayList; import java.util.List; -public abstract class ContributedTool { +public class ContributedTool { - public abstract String getName(); + private String name; + private String version; + private ArrayList systems = new ArrayList(); + private boolean installed; + private File installedFolder; + private boolean builtIn; + private ContributedPackage contributedPackage; - public abstract String getVersion(); + public String getName() { return name; } - public abstract List getSystems(); + public String getVersion() { return version; } - private boolean installed; + public List getSystems() { return systems; } public boolean isInstalled() { return installed; @@ -53,8 +60,6 @@ public void setInstalled(boolean installed) { this.installed = installed; } - private File installedFolder; - public File getInstalledFolder() { return installedFolder; } @@ -63,8 +68,6 @@ public void setInstalledFolder(File installedFolder) { this.installedFolder = installedFolder; } - private boolean builtIn; - public boolean isBuiltIn() { return builtIn; } @@ -73,8 +76,6 @@ public void setBuiltIn(boolean builtIn) { this.builtIn = builtIn; } - private ContributedPackage contributedPackage; - public ContributedPackage getPackage() { return contributedPackage; } diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java b/arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java index 7d86f234f23..3faf0cbbd31 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributedToolReference.java @@ -31,13 +31,17 @@ import java.util.Collection; -public abstract class ContributedToolReference { +public class ContributedToolReference { - public abstract String getName(); + private String name; + private String version; + private String packager; - public abstract String getVersion(); + public String getName() { return name; } - public abstract String getPackager(); + public String getVersion() { return version; } + + public String getPackager() { return packager; } public ContributedTool resolve(Collection packages) { for (ContributedPackage pack : packages) { diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java index 4ca65863939..0a9b19cc365 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java @@ -38,9 +38,10 @@ import java.util.List; import java.util.stream.Collectors; -public abstract class ContributionsIndex { +public class ContributionsIndex { - public abstract List getPackages(); + private ArrayList packages = new ArrayList(); + public List getPackages() { return packages; } public ContributedPackage findPackage(String packageName) { for (ContributedPackage pack : getPackages()) { diff --git a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java index 2a97e0e7d0e..060a94e6aa6 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java +++ b/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java @@ -35,7 +35,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.module.mrbean.MrBeanModule; import org.apache.commons.compress.utils.IOUtils; import processing.app.BaseNoGui; @@ -73,7 +72,7 @@ public ContributionsIndexer(File preferencesFolder, File builtInHardwareFolder, this.builtInHardwareFolder = builtInHardwareFolder; this.platform = platform; this.signatureVerifier = signatureVerifier; - index = new EmptyContributionIndex(); + index = new ContributionsIndex(); packagesFolder = new File(preferencesFolder, "packages"); stagingFolder = new File(preferencesFolder, "staging" + File.separator + "packages"); } @@ -208,7 +207,6 @@ private ContributionsIndex parseIndex(File indexFile) throws IOException { try { inputStream = new FileInputStream(indexFile); ObjectMapper mapper = new ObjectMapper(); - mapper.registerModule(new MrBeanModule()); mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true); mapper.configure(DeserializationFeature.EAGER_DESERIALIZER_FETCH, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); diff --git a/arduino-core/src/cc/arduino/contributions/packages/EmptyContributionIndex.java b/arduino-core/src/cc/arduino/contributions/packages/EmptyContributionIndex.java deleted file mode 100644 index 200dce3c2fe..00000000000 --- a/arduino-core/src/cc/arduino/contributions/packages/EmptyContributionIndex.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of Arduino. - * - * Copyright 2014 Arduino LLC (http://www.arduino.cc/) - * - * Arduino is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * As a special exception, you may use this file as part of a free software - * library without restriction. Specifically, if other files instantiate - * templates or use macros or inline functions from this file, or you compile - * this file and link it with other files to produce an executable, this - * file does not by itself cause the resulting executable to be covered by - * the GNU General Public License. This exception does not however - * invalidate any other reasons why the executable file might be covered by - * the GNU General Public License. - */ - -package cc.arduino.contributions.packages; - -import java.util.ArrayList; -import java.util.List; - -class EmptyContributionIndex extends ContributionsIndex { - List packs = new ArrayList<>(); - - @Override - public List getPackages() { - return packs; - } -} \ No newline at end of file diff --git a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java index cb7137d8638..2b692a54fb8 100644 --- a/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java +++ b/arduino-core/src/cc/arduino/contributions/packages/HostDependentDownloadableContribution.java @@ -32,9 +32,26 @@ import cc.arduino.contributions.DownloadableContribution; import processing.app.Platform; -public abstract class HostDependentDownloadableContribution extends DownloadableContribution { +public class HostDependentDownloadableContribution extends DownloadableContribution { - public abstract String getHost(); + private String url; + private String version; + private String checksum; + private long size; + private String archiveFileName; + private String host; + + public String getUrl() { return url; } + + public String getVersion() { return version; } + + public String getChecksum() { return checksum; } + + public long getSize() { return size; } + + public String getArchiveFileName() { return archiveFileName; } + + public String getHost() { return host; } @Override public String toString() { diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index 6fbdd02bd0e..affef023c77 100644 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -40,7 +40,6 @@ %EXEDIR%/lib/jackson-annotations-2.9.5.jar %EXEDIR%/lib/jackson-core-2.9.5.jar %EXEDIR%/lib/jackson-databind-2.9.5.jar - %EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar %EXEDIR%/lib/java-semver-0.8.0.jar %EXEDIR%/lib/jmdns-3.5.3.jar %EXEDIR%/lib/jtouchbar-1.0.0.jar diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml index 4da3bc3b6d9..59d5a35ae0a 100644 --- a/build/windows/launcher/config_debug.xml +++ b/build/windows/launcher/config_debug.xml @@ -40,7 +40,6 @@ %EXEDIR%/lib/jackson-annotations-2.9.5.jar %EXEDIR%/lib/jackson-core-2.9.5.jar %EXEDIR%/lib/jackson-databind-2.9.5.jar - %EXEDIR%/lib/jackson-module-mrbean-2.9.5.jar %EXEDIR%/lib/java-semver-0.8.0.jar %EXEDIR%/lib/jmdns-3.5.3.jar %EXEDIR%/lib/jtouchbar-1.0.0.jar