From e8153cba227937bda8aa753647fd90b52512f011 Mon Sep 17 00:00:00 2001 From: KodeMunkie Date: Sun, 24 May 2020 14:30:43 +0100 Subject: [PATCH] Updated dependencies and fixed an error message --- pom.xml | 643 +++++++++++----------- src/main/resources/Messages_en.properties | 2 +- 2 files changed, 321 insertions(+), 324 deletions(-) diff --git a/pom.xml b/pom.xml index 8bbc45b..bec17e8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,332 +1,329 @@ - 4.0.0 - uk.co.silentsoftware - imagetozxspec - 2.2.0-beta - Image To ZX Spec - Image converter for the ZX Spectrum - - - AGPL - http://www.gnu.org/licenses/agpl-3.0.txt - - - - UTF-8 - - - - - maven-compiler-plugin - 3.3 - - - - 1.8 - 1.8 - - - - org.codehaus.groovy - groovy-eclipse-compiler - 2.9.1-01 - - - org.codehaus.groovy - groovy-eclipse-batch - 2.3.7-01 - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 1.5 - - - - - - - - testGenerateStubs - testCompile - - removeTestStubs - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - true - - **/*Test*.* - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - package - - shade - - - false - - - - - ${project.artifactId}-${project.version} - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - uk.co.silentsoftware.ui.ImageToZxSpec - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + uk.co.silentsoftware + imagetozxspec + 2.2.0-beta + Image To ZX Spec + Image converter for the ZX Spectrum + + + AGPL + http://www.gnu.org/licenses/agpl-3.0.txt + + + + UTF-8 + + + + + maven-compiler-plugin + 3.3 + + + + 1.8 + 1.8 + + + + org.codehaus.groovy + groovy-eclipse-compiler + 2.9.1-01 + + + org.codehaus.groovy + groovy-eclipse-batch + 2.3.7-01 + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 1.5 + + + + + + + + testGenerateStubs + testCompile + + removeTestStubs + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + true + + **/*Test*.* + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.3 + + + package + + shade + + + false + + + + + ${project.artifactId}-${project.version} + + + *:* + + module-info.class + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + uk.co.silentsoftware.ui.ImageToZxSpec + + - - + + - - com.ruleoftech - markdown-page-generator-plugin - 0.10 - - - process-sources - - generate - - - - - doc - ${project.build.directory} - doc/header.html - doc/footer.html - - - - maven-assembly-plugin - 2.6 - - src/assembly/bin.xml - - - - create-archive - package - - single - - - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - - - - - io.spring.platform - platform-bom - Athens-SR1 - pom - import - - - - - - - - - - - - org.apache.logging.log4j - log4j-core - 2.11.1 - - - org.slf4j - slf4j-log4j12 - 1.7.25 - - - org.slf4j - slf4j-api - 1.7.25 - - - com.github.ben-manes.caffeine - caffeine - 2.8.0 - - - uk.co.caprica - vlcj - 3.10.1 - - - net.java.dev.jna - jna - - - org.apache.commons - commons-collections4 - 4.1 - - - org.apache.commons - commons-lang3 - - - io.humble - humble-video-noarch - 0.2.1 - + + com.ruleoftech + markdown-page-generator-plugin + 0.10 + + + process-sources + + generate + + + + + doc + ${project.build.directory} + doc/header.html + doc/footer.html + + + + maven-assembly-plugin + 2.6 + + src/assembly/bin.xml + + + + create-archive + package + + single + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + + + + + + io.spring.platform + platform-bom + Cairo-SR8 + pom + import + + + + + + + + + + + + org.apache.logging.log4j + log4j-core + 2.11.1 + + + org.slf4j + slf4j-log4j12 + 1.7.25 + + + org.slf4j + slf4j-api + 1.7.25 + + + com.github.ben-manes.caffeine + caffeine + 2.8.4 + + + uk.co.caprica + vlcj + 3.12.1 + + + net.java.dev.jna + jna + + + org.apache.commons + commons-collections4 + 4.4 + + + org.apache.commons + commons-lang3 + + + io.humble + humble-video-noarch + 0.3.0 + - - - - com.conversantmedia - disruptor - 1.2.8 - - - - - org.magicwerk - brownies-collections - 0.9.13 - - - junit - junit - test - + + + com.conversantmedia + disruptor + 1.2.17 + - - org.codehaus.groovy - groovy-all - 2.4.7 - test - - + + + org.magicwerk + brownies-collections + 0.9.14 + - - - info-logging - true - - - src/main/resources - - src/main/resources/info-logging - - - - - - debug-logging - - - src/main/resources - - src/main/resources/debug-logging - - - - - - windows-x64 - - - io.humble - humble-video-arch-x86_64-w64-mingw32 - 0.2.1 - - - - - macos-x64 - - - io.humble - humble-video-arch-x86_64-apple-darwin12 - 0.2.1 - - - - - linux-x64 - - - io.humble - humble-video-arch-x86_64-pc-linux-gnu6 - 0.2.1 - - - - - windows-x86 - - - io.humble - humble-video-arch-x86_64-w64-mingw32 - 0.2.1 - - - - - macos-x86 - - - io.humble - humble-video-arch-i686-apple-darwin12 - 0.2.1 - - - - - linux-x86 - - - io.humble - humble-video-arch-i686-pc-linux-gnu6 - 0.2.1 - - - - + + junit + junit + test + + + + org.codehaus.groovy + groovy-all + 2.4.7 + test + + + + + + info-logging + + true + + + + + src/main/resources + + + src/main/resources/info-logging + + + + + + debug-logging + + + + src/main/resources + + + src/main/resources/debug-logging + + + + + + windows-x64 + + + io.humble + humble-video-arch-x86_64-w64-mingw32 + 0.3.0 + + + + + macos-x64 + + + io.humble + humble-video-arch-x86_64-apple-darwin18 + 0.3.0 + + + + + linux-x64 + + + io.humble + humble-video-arch-x86_64-pc-linux-gnu6 + 0.3.0 + + + + + windows-x86 + + + io.humble + humble-video-arch-i686-w64-mingw32 + 0.3.0 + + + + + linux-x86 + + + io.humble + humble-video-arch-i686-pc-linux-gnu6 + 0.3.0 + + + + \ No newline at end of file diff --git a/src/main/resources/Messages_en.properties b/src/main/resources/Messages_en.properties index 379097f..6dfe13c 100644 --- a/src/main/resources/Messages_en.properties +++ b/src/main/resources/Messages_en.properties @@ -71,7 +71,7 @@ adv_video_import_engine=Video Import Engine adv_video_vlc_fail_title=Unable to load VLC adv_video_vlc_fail=Unable to load VLC library. Make sure that you have specified the correct VLC directory,\n that it is the same architecture as the version of Java (i.e. 32 or 64 bit), and that VLC is\n up to date. adv_video_vlc_success_title=VLC Loaded -adv_video_vlc_success=The VLC library has been found and loaded!\nWarning this option is experimental and uses temporary files whilst working.\nIf you have problems switch back to JMF. +adv_video_vlc_success=The VLC library has been found and loaded!\nWarning this option is experimental and uses temporary files whilst working.\nIf you have problems switch back to Humble Video. adv_video_turbo=Turbo Mode (recommended off) adv_colour_dist_euclidean= Euclidean Comparison adv_colour_dist_compuphase=Compuphase Comparison