From 25973aecaedb4435792d3e1207194b63d0c07e92 Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Fri, 18 Sep 2020 05:49:55 +0000 Subject: [PATCH 1/3] merge master -Dorg -Ssuccess-only Repository: ome/bio-formats-build Already up-to-date. Generated by BIOFORMATS-push#583 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/583/) From 2236b864900ce9557b8e47bda5a949d10f387461 Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Fri, 18 Sep 2020 05:51:25 +0000 Subject: [PATCH 2/3] merge master -Dorg -Ssuccess-only Repository: ome/bio-formats-build Already up-to-date. Repository: ome/bio-formats-documentation Updating fc65b6c..2dab0ec Previously merged: - PR 179 mtbc 'Various adjustments to follow LOCI site migration.' Merged PRs: - PR 168 dgault 'Temporarily add imagej.net to link check ignore list' - PR 174 dgault 'Remove outdated mailing list references' Repository: ome/bio-formats-examples Already up-to-date. Merged PRs: - PR 56 jburel 'add ij macro example' - PR 69 dgault 'Add macro examples from OME 2020 NGFF workshop' Repository: openmicroscopy/bioformats Excluded PRs: - PR 3572 dependabot[bot] 'Bump xercesImpl from 2.8.1 to 2.12.0 in /components/formats-bsd' (user: dependabot[bot]) - PR 3563 dgault 'CZI: Parse TimeSpan Default Units' (label: exclude) - PR 3562 dgault 'SCN: No color correction for SCN400' (label: exclude) - PR 3524 RainerHeintzmann 'Added bfopen5D.m and modified bfsave.m.' (user: RainerHeintzmann) - PR 3402 dgault 'BDV: Verify timepoints' (label: exclude) - PR 3347 melissalinkert 'Add FormatTools methods for creating well names' (label: exclude) - PR 3311 melissalinkert 'OME-TIFF: use blank planes when UUID cannot be resolved to a filename' (label: exclude) - PR 3168 dgault 'ND2 - Improve parsing of acq times' (label: exclude) - PR 3056 dgault 'PCI: Don't modify the width when binning is used' (exclude comment) - PR 3032 dgault 'MetaMorph ND - Use version number to generate fileset' (label: breaking) - PR 3009 dgault 'ND2 - Support multipoint global metadata' (label: breaking) Already up-to-date. Merged PRs: - PR 3383 melissalinkert 'InCell 1000/2000: don't trust the plane count in the "Images" element' - PR 3435 dgault 'AmiraParameters: Use warning for empty key' - PR 3537 dgault 'Flex: Merge IDR changes and add new group plate option' - PR 3558 sbesson 'Gatan DM4: fix support for montages with single Z dimensions' - PR 3581 sbesson 'Review all instances of whitelist/blacklist' - PR 3605 dgault 'bfoptions: Add ability to read options from file' - PR 3606 dgault 'ScanR: Merge IDR changes and add new option' - PR 3609 dgault 'MetaMorph: Correct laser index for multi series datasets' - PR 3610 dgault 'CZI: Pad scene number and switch to 1 indexed' - PR 3611 sbesson 'Remove FileStitcher from FormatReaderTest and FormatReaderTestFactory' Repository: ome/ome-codecs Excluded PRs: - PR 11 melissalinkert 'ZLIB: use ByteArrayHandle instead of ByteVector for decompressing' (label: exclude) Already up-to-date. Merged PRs: - PR 18 melissalinkert 'Fix decompression in Base64Codec' Repository: ome/ome-common-java Already up-to-date. Repository: ome/ome-jai Already up-to-date. Repository: ome/ome-mdbtools Already up-to-date. Repository: ome/ome-metakit Already up-to-date. Repository: ome/ome-model Updating cb7109d..10e3a50 Previously merged: - PR 124 sbesson 'Convert Travis CI deployment into a build stage' Repository: ome/ome-poi Already up-to-date. Repository: ome/ome-stubs Already up-to-date. Generated by BIOFORMATS-push#583 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/583/) --- .gitmodules | 44 +++++++++++++++++++-------------------- bio-formats-documentation | 2 +- bio-formats-examples | 2 +- bioformats | 2 +- ome-codecs | 2 +- ome-common-java | 2 +- ome-jai | 2 +- ome-mdbtools | 2 +- ome-metakit | 2 +- ome-model | 2 +- ome-poi | 2 +- ome-stubs | 2 +- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3402784710..f0b1b28395 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,44 +1,44 @@ [submodule "ome-common-java"] path = ome-common-java - url = https://github.com/ome/ome-common-java.git - branch = master + url = https://github.com/snoopycrimecop/ome-common-java.git + branch = merge_ci [submodule "ome-model"] path = ome-model - url = https://github.com/ome/ome-model.git - branch = master + url = https://github.com/snoopycrimecop/ome-model.git + branch = merge_ci [submodule "ome-poi"] path = ome-poi - url = https://github.com/ome/ome-poi.git - branch = master + url = https://github.com/snoopycrimecop/ome-poi.git + branch = merge_ci [submodule "ome-mdbtools"] path = ome-mdbtools - url = https://github.com/ome/ome-mdbtools.git - branch = master + url = https://github.com/snoopycrimecop/ome-mdbtools.git + branch = merge_ci [submodule "ome-jai"] path = ome-jai - url = https://github.com/ome/ome-jai.git - branch = master + url = https://github.com/snoopycrimecop/ome-jai.git + branch = merge_ci [submodule "ome-codecs"] path = ome-codecs - url = https://github.com/ome/ome-codecs.git - branch = master + url = https://github.com/snoopycrimecop/ome-codecs.git + branch = merge_ci [submodule "ome-metakit"] path = ome-metakit - url = https://github.com/ome/ome-metakit.git - branch = master + url = https://github.com/snoopycrimecop/ome-metakit.git + branch = merge_ci [submodule "ome-stubs"] path = ome-stubs - url = https://github.com/ome/ome-stubs.git - branch = master + url = https://github.com/snoopycrimecop/ome-stubs.git + branch = merge_ci [submodule "bioformats"] path = bioformats - url = https://github.com/openmicroscopy/bioformats.git - branch = develop + url = https://github.com/snoopycrimecop/bioformats.git + branch = merge_ci [submodule "bio-formats-documentation"] path = bio-formats-documentation - url = https://github.com/ome/bio-formats-documentation.git - branch = master + url = https://github.com/snoopycrimecop/bio-formats-documentation.git + branch = merge_ci [submodule "bio-formats-examples"] path = bio-formats-examples - url = https://github.com/ome/bio-formats-examples.git - branch = master + url = https://github.com/snoopycrimecop/bio-formats-examples.git + branch = merge_ci diff --git a/bio-formats-documentation b/bio-formats-documentation index fc65b6c0e6..f0ff4b5b69 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit fc65b6c0e614c3704d37269d72d3f4ffeb693126 +Subproject commit f0ff4b5b695edc9595bf977028a01f8c60598cde diff --git a/bio-formats-examples b/bio-formats-examples index bcd0fdd42a..cfab3fc43e 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit bcd0fdd42a9788f733c5157bfcda53234ce87a3a +Subproject commit cfab3fc43e688a79b32043ec8efd6b8ba84312ae diff --git a/bioformats b/bioformats index ec4c456f6f..94ee3967a7 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit ec4c456f6faa94b5b617873aa0253ebbc8dd40be +Subproject commit 94ee3967a72279cf5380513cf81ef95cbd1ce3ac diff --git a/ome-codecs b/ome-codecs index c9c3f836da..e9a6f19567 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit c9c3f836dab208c0a8e9502261a4b0e8b953265a +Subproject commit e9a6f195671e99787b8c62a45506225483cfb9a1 diff --git a/ome-common-java b/ome-common-java index 0cfb62ccf3..ec7e534041 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 0cfb62ccf347f5733afc1309121ebac225cb5c6d +Subproject commit ec7e534041f309aa4748ab5e0f35c7420563e764 diff --git a/ome-jai b/ome-jai index 8c5a23a9dd..8bc7e40794 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit 8c5a23a9ddfa3882f0fdd656746345d72f3d6978 +Subproject commit 8bc7e407949166519023d91ff7f23c9cdd10e0dd diff --git a/ome-mdbtools b/ome-mdbtools index 37941d951f..ae891f296d 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 37941d951f6198af2f529c2705a87992aef22ab5 +Subproject commit ae891f296d7a68818ac3f559773eba6002039046 diff --git a/ome-metakit b/ome-metakit index 955cbc5740..e393fd9e2d 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 955cbc57404255971912998f3f539e9965bd7178 +Subproject commit e393fd9e2dc40945f553e89710f5be2623238a6f diff --git a/ome-model b/ome-model index cb7109d640..d6a4be0858 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit cb7109d640bfcc56f997e871b30c12a596f790d6 +Subproject commit d6a4be0858fb540715a90b6f54b7ec575f3bee68 diff --git a/ome-poi b/ome-poi index 08154ce7c2..f6b8e601d3 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit 08154ce7c239a8f30ce6948b3a51940bab92401c +Subproject commit f6b8e601d3a74d290a95f43abb3c18d2565d4c02 diff --git a/ome-stubs b/ome-stubs index c19117e320..a48834e6f1 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit c19117e320cc99eb61b6f236bc082ff050bf9875 +Subproject commit a48834e6f10f3455159048309f8cdd52a245f247 From 33fbb35bdb230707ba0323f730a2808418714a52 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2020 05:54:25 +0000 Subject: [PATCH 3/3] Bump ome-metakit from `e393fd9` to `6c075d3` Bumps [ome-metakit](https://github.com/snoopycrimecop/ome-metakit) from `e393fd9` to `6c075d3`. - [Release notes](https://github.com/snoopycrimecop/ome-metakit/releases) - [Commits](https://github.com/snoopycrimecop/ome-metakit/compare/e393fd9e2dc40945f553e89710f5be2623238a6f...6c075d3b42a2dccd7e146783395990a932e464ea) Signed-off-by: dependabot[bot] --- ome-metakit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ome-metakit b/ome-metakit index e393fd9e2d..6c075d3b42 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit e393fd9e2dc40945f553e89710f5be2623238a6f +Subproject commit 6c075d3b42a2dccd7e146783395990a932e464ea