From 74b8d54bae0abdefa6147b1d7e5c357fe46a0bac Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Sat, 3 Oct 2020 08:48:24 +0000 Subject: [PATCH] merge master -Dorg -Ssuccess-only Repository: ome/bio-formats-build Already up-to-date. Repository: ome/bio-formats-documentation Already up-to-date. 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 3609 dgault 'MetaMorph: Correct laser index for multi series datasets' - PR 3610 dgault 'CZI: Pad scene number and switch to 1 indexed' - PR 3617 sbesson 'Options: test-suite improvements' 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 Already up-to-date. Repository: ome/ome-poi Already up-to-date. Repository: ome/ome-stubs Already up-to-date. Generated by BIOFORMATS-push#599 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/599/) --- .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 2dab0eca87..3086512150 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 2dab0eca8726b0fcf6ba9ec47fb6c0c3ddf7b82c +Subproject commit 3086512150117ce01a718a731c687e65ddd08ad6 diff --git a/bio-formats-examples b/bio-formats-examples index bcd0fdd42a..a393e83d7d 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit bcd0fdd42a9788f733c5157bfcda53234ce87a3a +Subproject commit a393e83d7d9b45c401533933798ad2c8c704b19c diff --git a/bioformats b/bioformats index c29e626296..329b3afa08 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit c29e626296fcf360da9959eaec041a7d2c885f69 +Subproject commit 329b3afa080533278a46eb4a73408c9a50972716 diff --git a/ome-codecs b/ome-codecs index c9c3f836da..95408808c9 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit c9c3f836dab208c0a8e9502261a4b0e8b953265a +Subproject commit 95408808c949c51be2fcf50eeab61f91c8ea399b diff --git a/ome-common-java b/ome-common-java index 0cfb62ccf3..1e494c26b2 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 0cfb62ccf347f5733afc1309121ebac225cb5c6d +Subproject commit 1e494c26b262cccfad33d2e2db50fcdf534fb406 diff --git a/ome-jai b/ome-jai index 8c5a23a9dd..e39765ab6a 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit 8c5a23a9ddfa3882f0fdd656746345d72f3d6978 +Subproject commit e39765ab6ab3633b75a385debabda52916837e4e diff --git a/ome-mdbtools b/ome-mdbtools index 37941d951f..bc46feb19b 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 37941d951f6198af2f529c2705a87992aef22ab5 +Subproject commit bc46feb19b8ebe52a3fb6565ceacb8e11055cac9 diff --git a/ome-metakit b/ome-metakit index 955cbc5740..7381ea44bc 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 955cbc57404255971912998f3f539e9965bd7178 +Subproject commit 7381ea44bcead33167e8df262cc1acbc4bc79f02 diff --git a/ome-model b/ome-model index 10e3a50bd9..b36f76de36 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit 10e3a50bd979b39f766682dbd6dde183d8c718a7 +Subproject commit b36f76de363a551c87f948bf2bfe20756bbf88fe diff --git a/ome-poi b/ome-poi index 08154ce7c2..8c7dd1a6b5 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit 08154ce7c239a8f30ce6948b3a51940bab92401c +Subproject commit 8c7dd1a6b5d4240da3b5b2e9e17a702e98af9dd5 diff --git a/ome-stubs b/ome-stubs index c19117e320..c1988fd50a 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit c19117e320cc99eb61b6f236bc082ff050bf9875 +Subproject commit c1988fd50a6ab97df8a65626a7fb3688875e087b