Skip to content
Snippets Groups Projects
Commit d43aab5d authored by felmer's avatar felmer
Browse files

SSDM-10150: change to bioformats 6.5.1 and microscopy/flow plugins to 20.x

parent 76efa5e0
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ dependencies { ...@@ -37,7 +37,7 @@ dependencies {
'javax.xml.bind:jaxb-api:2.3.0', 'javax.xml.bind:jaxb-api:2.3.0',
'org.glassfish.main.javaee-api:javax.jws:3.1.2.2' 'org.glassfish.main.javaee-api:javax.jws:3.1.2.2'
runtime 'bioformats:bioformats:6.5.0' runtime 'bioformats:bioformats:6.5.1'
// eln-lims Jython APIs dependencies // eln-lims Jython APIs dependencies
datastoreExecRuntime files("../openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/lib/zip4j_1.3.2.jar"), datastoreExecRuntime files("../openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/eln-lims-api/lib/zip4j_1.3.2.jar"),
......
...@@ -7,7 +7,7 @@ dependencies { ...@@ -7,7 +7,7 @@ dependencies {
compile project(':common'), compile project(':common'),
'imagej:ij:1.43u', 'imagej:ij:1.43u',
'sun:jai:1.1.3-CISD', 'sun:jai:1.1.3-CISD',
'bioformats:bioformats:6.5.0', 'bioformats:bioformats:6.5.1',
'slf4j:slf4j:1.6.2', 'slf4j:slf4j:1.6.2',
'slf4j:slf4j-log4j12:1.6.2' 'slf4j:slf4j-log4j12:1.6.2'
......
...@@ -85,7 +85,7 @@ dependencies { ...@@ -85,7 +85,7 @@ dependencies {
project(':screening'), project(':screening'),
project(':rtd_phosphonetx'), project(':rtd_phosphonetx'),
project(':plasmid'), project(':plasmid'),
'bioformats:bioformats:6.5.0', 'bioformats:bioformats:6.5.1',
'imagej:ij:1.43u', 'imagej:ij:1.43u',
'cisd:cisd-openbis-knime-server:13.6.0.r29301', 'cisd:cisd-openbis-knime-server:13.6.0.r29301',
'apache:xml-apis:1.3.03', 'apache:xml-apis:1.3.03',
...@@ -301,15 +301,15 @@ task zipCorePlugins(type: SymZip) { ...@@ -301,15 +301,15 @@ task zipCorePlugins(type: SymZip) {
includeEmptyDirs = false includeEmptyDirs = false
archiveName 'core-plugins.zip' archiveName 'core-plugins.zip'
downloadCorePlugin('https://github.com/aarpon/obit_flow_core_technology/archive/release/19.x.zip', 'flow') downloadCorePlugin('https://github.com/aarpon/obit_flow_core_technology/archive/release/20.x.zip', 'flow')
downloadCorePlugin('https://github.com/aarpon/obit_microscopy_core_technology/archive/release/19.x.zip', 'microscopy') downloadCorePlugin('https://github.com/aarpon/obit_microscopy_core_technology/archive/release/20.x.zip', 'microscopy')
downloadCorePlugin('https://github.com/aarpon/obit_shared_core_technology/archive/release/19.x.zip', 'shared') downloadCorePlugin('https://github.com/aarpon/obit_shared_core_technology/archive/release/20.x.zip', 'shared')
from project(':rtd_phosphonetx').fileTree(dir: 'source/core-plugins', includes:['proteomics/**', 'proteomics-optional/**'], excludes:['**/dss/**', '**/package-to-dist']) from project(':rtd_phosphonetx').fileTree(dir: 'source/core-plugins', includes:['proteomics/**', 'proteomics-optional/**'], excludes:['**/dss/**', '**/package-to-dist'])
from project(':screening').fileTree(dir: 'source/core-plugins', includes:['screening/**', 'screening-optional/**'], excludes:['**/dss/**', '**/package-to-dist']) from project(':screening').fileTree(dir: 'source/core-plugins', includes:['screening/**', 'screening-optional/**'], excludes:['**/dss/**', '**/package-to-dist'])
from project(':deep_sequencing_unit').fileTree(dir: 'source/core-plugins', includes:['illumina-ngs/**'], excludes:['**/dss/**', '**/package-to-dist']) from project(':deep_sequencing_unit').fileTree(dir: 'source/core-plugins', includes:['illumina-ngs/**'], excludes:['**/dss/**', '**/package-to-dist'])
from fileTree(dir: 'targets/downloads/obit_flow_core_technology-release-19.x/core-plugins', includes:['flow/**']) from fileTree(dir: 'targets/downloads/obit_flow_core_technology-release-20.x/core-plugins', includes:['flow/**'])
from fileTree(dir: 'targets/downloads/obit_microscopy_core_technology-release-19.x/core-plugins', includes:['microscopy/**']) from fileTree(dir: 'targets/downloads/obit_microscopy_core_technology-release-20.x/core-plugins', includes:['microscopy/**'])
from fileTree(dir: 'targets/downloads/obit_shared_core_technology-release-19.x/core-plugins', includes:['shared/**']) from fileTree(dir: 'targets/downloads/obit_shared_core_technology-release-20.x/core-plugins', includes:['shared/**'])
from 'dist/core-plugins' from 'dist/core-plugins'
from 'dist/server/core-plugins.properties' from 'dist/server/core-plugins.properties'
into 'core-plugins' into 'core-plugins'
......
...@@ -17,7 +17,7 @@ dependencies { ...@@ -17,7 +17,7 @@ dependencies {
'openhms:jackcess:1.2.2', 'openhms:jackcess:1.2.2',
'reveregroup:gwt-image-loader:1.1.4', 'reveregroup:gwt-image-loader:1.1.4',
'imagej:ij:1.43u', 'imagej:ij:1.43u',
'bioformats:bioformats:6.5.0' 'bioformats:bioformats:6.5.1'
devRuntime project(path: ':openbis', configuration: 'devRuntime') devRuntime project(path: ':openbis', configuration: 'devRuntime')
testCompile project(path: ':datastore_server', configuration: 'tests') testCompile project(path: ':datastore_server', configuration: 'tests')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment