diff --git a/core/.factorypath b/core/.factorypath index fc8238e..1331bf4 100644 --- a/core/.factorypath +++ b/core/.factorypath @@ -13,7 +13,7 @@ - + @@ -101,6 +101,7 @@ + @@ -283,7 +284,7 @@ - + diff --git a/core/dependency-reduced-pom.xml b/core/dependency-reduced-pom.xml index aec6486..942ca74 100644 --- a/core/dependency-reduced-pom.xml +++ b/core/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0 core @@ -21,106 +21,4 @@ https://jitpack.io - - - com.github.SJCross - ModularImageAnalysis - 0.14.0 - provided - - - maven-project-info-reports-plugin - org.apache.maven.plugins - - - maven-model - org.apache.maven - - - poi - org.apache.poi - - - poi-ooxml - org.apache.poi - - - xmlbeans - org.apache.xmlbeans - - - imagej - net.imagej - - - imagej-ui-swing - net.imagej - - - imagej-legacy - net.imagej - - - imagej-ops - net.imagej - - - AnalyzeSkeleton_ - sc.fiji - - - Auto_Local_Threshold - sc.fiji - - - bUnwarpJ_ - sc.fiji - - - Colocalisation_Analysis - sc.fiji - - - Colour_Deconvolution - sc.fiji - - - CorrectBleach_ - sc.fiji - - - TrackMate_ - sc.fiji - - - Trainable_Segmentation - sc.fiji - - - mpicbg - mpicbg - - - MorphoLibJ_ - fr.inra.ijpb - - - ij_ridge_detect - de.biomedical-imaging.imagej - - - classgraph - io.github.classgraph - - - commonmark - com.atlassian.commonmark - - - Common - com.github.SJCross - - - - diff --git a/core/pom.xml b/core/pom.xml index 06bc89d..4dd320b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0 @@ -49,8 +49,8 @@ com.github.SJCross ModularImageAnalysis - 0.14.0 - ${myscope} + v0.14.4 + ${scp} diff --git a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java index 0493563..19c7b98 100644 --- a/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java +++ b/core/src/main/java/wbif/sjx/VideoHandler/VideoLoader.java @@ -318,7 +318,7 @@ public ParameterCollection updateAndGetParameters() { returnedParameters.add(parameters.getParameter(AVAILABLE_METADATA_FIELDS)); MetadataRefCollection metadataRefs = modules.getMetadataRefs(this); parameters.getParameter(AVAILABLE_METADATA_FIELDS) - .setValue(ImageLoader.getMetadataValues(metadataRefs)); + .setValue(metadataRefs.getMetadataValues()); break; case NameFormats.INPUT_FILE_PREFIX: returnedParameters.add(parameters.getParameter(PREFIX)); diff --git a/linux32/.factorypath b/linux32/.factorypath index 9eb57d7..3885d2f 100644 --- a/linux32/.factorypath +++ b/linux32/.factorypath @@ -13,7 +13,7 @@ - + @@ -101,6 +101,7 @@ + @@ -283,7 +284,7 @@ - + diff --git a/linux32/pom.xml b/linux32/pom.xml index c1e8d11..56391c5 100644 --- a/linux32/pom.xml +++ b/linux32/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0 diff --git a/linux64/.factorypath b/linux64/.factorypath index 4ee99fb..c500de2 100644 --- a/linux64/.factorypath +++ b/linux64/.factorypath @@ -13,7 +13,7 @@ - + @@ -101,6 +101,7 @@ + @@ -283,7 +284,7 @@ - + diff --git a/linux64/pom.xml b/linux64/pom.xml index feda184..571483e 100644 --- a/linux64/pom.xml +++ b/linux64/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0 diff --git a/mac64/.factorypath b/mac64/.factorypath index 94cae5f..b889e70 100644 --- a/mac64/.factorypath +++ b/mac64/.factorypath @@ -13,7 +13,7 @@ - + @@ -101,6 +101,7 @@ + @@ -283,7 +284,7 @@ - + diff --git a/mac64/pom.xml b/mac64/pom.xml index 70b5103..6d4ee06 100644 --- a/mac64/pom.xml +++ b/mac64/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0 diff --git a/pom.xml b/pom.xml index ec8eb84..e4d8d76 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ wbif.sjx VideoHandler pom - 1.0.2 + 1.0.3 VideoHandler https://github.com/SJCross/VideoHandler 2019 @@ -57,7 +57,7 @@ false 1.8 1.8 - compile + compile system GNU General Public License v3+ Stephen Cross @@ -107,6 +107,20 @@ + + + false + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + diff --git a/win32/.factorypath b/win32/.factorypath index 8bd81b7..19c053c 100644 --- a/win32/.factorypath +++ b/win32/.factorypath @@ -13,7 +13,7 @@ - + @@ -101,6 +101,7 @@ + @@ -283,7 +284,7 @@ - + diff --git a/win32/pom.xml b/win32/pom.xml index f319148..564f3f3 100644 --- a/win32/pom.xml +++ b/win32/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0 diff --git a/win64/.factorypath b/win64/.factorypath index 24e8ce0..1fa0329 100644 --- a/win64/.factorypath +++ b/win64/.factorypath @@ -13,7 +13,7 @@ - + @@ -101,6 +101,7 @@ + @@ -283,7 +284,7 @@ - + diff --git a/win64/pom.xml b/win64/pom.xml index da5432e..1961720 100644 --- a/win64/pom.xml +++ b/win64/pom.xml @@ -5,7 +5,7 @@ VideoHandler wbif.sjx - 1.0.2 + 1.0.3 4.0.0