diff --git a/app/.classpath b/app/.classpath index e0f00d36e..f851717ca 100644 --- a/app/.classpath +++ b/app/.classpath @@ -33,10 +33,10 @@ - - - - + + + + diff --git a/app/lib/jackson-annotations-2.6.3.jar b/app/lib/jackson-annotations-2.6.3.jar deleted file mode 100644 index 9bb53e875..000000000 Binary files a/app/lib/jackson-annotations-2.6.3.jar and /dev/null differ diff --git a/app/lib/jackson-annotations-2.9.5.jar b/app/lib/jackson-annotations-2.9.5.jar new file mode 100644 index 000000000..98ea00477 Binary files /dev/null and b/app/lib/jackson-annotations-2.9.5.jar differ diff --git a/app/lib/jackson-core-2.6.3.jar b/app/lib/jackson-core-2.6.3.jar deleted file mode 100644 index e1ec916dd..000000000 Binary files a/app/lib/jackson-core-2.6.3.jar and /dev/null differ diff --git a/app/lib/jackson-core-2.9.5.jar b/app/lib/jackson-core-2.9.5.jar new file mode 100644 index 000000000..b70d1ef1a Binary files /dev/null and b/app/lib/jackson-core-2.9.5.jar differ diff --git a/app/lib/jackson-databind-2.6.3.jar b/app/lib/jackson-databind-2.6.3.jar deleted file mode 100644 index e60f9fe1a..000000000 Binary files a/app/lib/jackson-databind-2.6.3.jar and /dev/null differ diff --git a/app/lib/jackson-databind-2.9.5.jar b/app/lib/jackson-databind-2.9.5.jar new file mode 100644 index 000000000..7a9515098 Binary files /dev/null and b/app/lib/jackson-databind-2.9.5.jar differ diff --git a/app/lib/jackson-module-mrbean-2.6.3.jar b/app/lib/jackson-module-mrbean-2.6.3.jar deleted file mode 100644 index 69cc60a58..000000000 Binary files a/app/lib/jackson-module-mrbean-2.6.3.jar and /dev/null differ diff --git a/app/lib/jackson-module-mrbean-2.9.5.jar b/app/lib/jackson-module-mrbean-2.9.5.jar new file mode 100644 index 000000000..dc7f5a057 Binary files /dev/null and b/app/lib/jackson-module-mrbean-2.9.5.jar differ diff --git a/arduino-core/.classpath b/arduino-core/.classpath index e8e013325..c889faaa3 100644 --- a/arduino-core/.classpath +++ b/arduino-core/.classpath @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/arduino-core/lib/jackson-annotations-2.6.3.jar b/arduino-core/lib/jackson-annotations-2.6.3.jar deleted file mode 100644 index 9bb53e875..000000000 Binary files a/arduino-core/lib/jackson-annotations-2.6.3.jar and /dev/null differ diff --git a/arduino-core/lib/jackson-annotations-2.9.5.jar b/arduino-core/lib/jackson-annotations-2.9.5.jar new file mode 100644 index 000000000..98ea00477 Binary files /dev/null and b/arduino-core/lib/jackson-annotations-2.9.5.jar differ diff --git a/arduino-core/lib/jackson-core-2.6.3.jar b/arduino-core/lib/jackson-core-2.6.3.jar deleted file mode 100644 index e1ec916dd..000000000 Binary files a/arduino-core/lib/jackson-core-2.6.3.jar and /dev/null differ diff --git a/arduino-core/lib/jackson-core-2.9.5.jar b/arduino-core/lib/jackson-core-2.9.5.jar new file mode 100644 index 000000000..b70d1ef1a Binary files /dev/null and b/arduino-core/lib/jackson-core-2.9.5.jar differ diff --git a/arduino-core/lib/jackson-databind-2.6.3.jar b/arduino-core/lib/jackson-databind-2.6.3.jar deleted file mode 100644 index e60f9fe1a..000000000 Binary files a/arduino-core/lib/jackson-databind-2.6.3.jar and /dev/null differ diff --git a/arduino-core/lib/jackson-databind-2.9.5.jar b/arduino-core/lib/jackson-databind-2.9.5.jar new file mode 100644 index 000000000..7a9515098 Binary files /dev/null and b/arduino-core/lib/jackson-databind-2.9.5.jar differ diff --git a/arduino-core/lib/jackson-module-mrbean-2.6.3.jar b/arduino-core/lib/jackson-module-mrbean-2.6.3.jar deleted file mode 100644 index 69cc60a58..000000000 Binary files a/arduino-core/lib/jackson-module-mrbean-2.6.3.jar and /dev/null differ diff --git a/arduino-core/lib/jackson-module-mrbean-2.9.5.jar b/arduino-core/lib/jackson-module-mrbean-2.9.5.jar new file mode 100644 index 000000000..dc7f5a057 Binary files /dev/null and b/arduino-core/lib/jackson-module-mrbean-2.9.5.jar differ diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml index d4cf92e8d..c427edf0b 100644 --- a/build/windows/launcher/config.xml +++ b/build/windows/launcher/config.xml @@ -36,10 +36,10 @@ %EXEDIR%/lib/commons-lang3-3.3.2.jar %EXEDIR%/lib/commons-logging-1.0.4.jar %EXEDIR%/lib/commons-net-3.3.jar - %EXEDIR%/lib/jackson-annotations-2.6.3.jar - %EXEDIR%/lib/jackson-core-2.6.3.jar - %EXEDIR%/lib/jackson-databind-2.6.3.jar - %EXEDIR%/lib/jackson-module-mrbean-2.6.3.jar + %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/slf4j-simple-1.7.22.jar diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml index 512949fa9..e776f3797 100644 --- a/build/windows/launcher/config_debug.xml +++ b/build/windows/launcher/config_debug.xml @@ -36,10 +36,10 @@ %EXEDIR%/lib/commons-lang3-3.3.2.jar %EXEDIR%/lib/commons-logging-1.0.4.jar %EXEDIR%/lib/commons-net-3.3.jar - %EXEDIR%/lib/jackson-annotations-2.6.3.jar - %EXEDIR%/lib/jackson-core-2.6.3.jar - %EXEDIR%/lib/jackson-databind-2.6.3.jar - %EXEDIR%/lib/jackson-module-mrbean-2.6.3.jar + %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/slf4j-simple-1.7.22.jar