From 97aa09fb16da3b1ab523b3e954cf4c7bbaa439f1 Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Wed, 20 Nov 2024 00:04:03 +0000 Subject: [PATCH] merge master -Dorg -Ssuccess-only Repository: ome/bio-formats-build Excluded PRs: - PR 632 dependabot[bot] 'Bump ZarrReader from `9a9e662` to `b17c3ab`' (status: failure) Already up to date. Merged PRs: - PR 658 dependabot[bot] 'Bump bio-formats-documentation from `b07c8df` to `8dc4ea1`' - PR 659 dependabot[bot] 'Bump bioformats from `df36e69` to `ee508a0`' Repository: ome/ZarrReader Excluded PRs: - PR 95 dgault 'Class cast exception when parsing metadata' (status: failure) - PR 20 dgault 'ZarrReader: Use chunk API' (exclude comment) Updating 9a9e662..b17c3ab Previously merged: - PR 93 dgault 'Bump version to 0.5.3-SNAPSHOT' - PR 92 dgault 'Bump version to 0.5.2' - PR 91 dgault 'Bump Bio-Formats version to 7.3.1' Merged PRs: - PR 97 melissalinkert 'Bump Bio-Formats version to 8.0.1' - PR 98 dominikl 'Fix class cast and labels issue.' Repository: ome/bio-formats-documentation Already up to date. Merged PRs: - PR 394 pwalczysko 'Add sas.upenn.edu to ignore list linkchecker' Repository: ome/bio-formats-examples Already up to date. Merged PRs: - PR 69 dgault 'Add macro examples from OME 2020 NGFF workshop' Repository: openmicroscopy/bioformats Excluded PRs: - PR 4254 melissalinkert 'Memoizer: ask any ImageReader instances to remove all but the current reader' (stage: draft) - PR 4249 marcobitplane 'Imaris Reader: support for LZ4 compression and performance improvements' (user: marcobitplane) - PR 4196 melissalinkert 'DICOM: use FrameTimePointer to detect timelapse data' (label: exclude) - PR 4131 dgault 'VirtualImagePlus: Retain B&C settings for each slice' (status: failure) - PR 4092 NicoKiaru 'Commits an alternative Zeiss CZI Reader' (user: NicoKiaru) - PR 4000 XLEFReaderForBioformats 'Reworking LMSMetadata package and adding a new lif reader' (user: XLEFReaderForBioformats) - PR 3794 dgault 'Chunk API: Add new API and functionality for reading and writing chunks' (label: exclude) - PR 3618 dgault 'Memoizer: Persist caching to sub readers' (label: breaking) Already up to date. Merged PRs: - PR 4130 carandraug 'matlab/bfGetPlane.m: avoid use of makeDataArray2D when Octave (ome/bio-formats-octave-docker#29)' - PR 4195 WalkerKnapp 'Andor SIF: Support files larger than 4 GB and with non-fixed-size footers' - PR 4243 melissalinkert 'Update IExtraMetadataWriter.setExtraMetadata(...) to accept an Object' - PR 4252 melissalinkert 'Leica TCS: make sure XML file is on used files list' Repository: ome/ome-codecs Already up to date. Merged PRs: - PR 41 rharkes 'Add LZ4 compression/decompression' 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. Merged PRs: - PR 174 jburel 'Remove docs' Repository: ome/ome-poi Already up to date. Repository: ome/ome-stubs Already up to date. Generated by BIOFORMATS-push#268 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/268/) --- .gitmodules | 48 +++++++++++++++++++-------------------- ZarrReader | 2 +- 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 +- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2ba40ae34d..b97d1ad3d8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,48 +1,48 @@ [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 [submodule "ZarrReader"] path = ZarrReader - url = https://github.com/ome/ZarrReader.git - branch = main + url = https://github.com/snoopycrimecop/ZarrReader.git + branch = merge_ci diff --git a/ZarrReader b/ZarrReader index 9a9e662a3b..c979057579 160000 --- a/ZarrReader +++ b/ZarrReader @@ -1 +1 @@ -Subproject commit 9a9e662a3b00b37d51100df7256b11e4036ae693 +Subproject commit c979057579a50ff9576fca8964d65ad9d2808604 diff --git a/bio-formats-documentation b/bio-formats-documentation index 8dc4ea1e11..078c36b83c 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 8dc4ea1e117b6374dba08b5bc10aaca6a4a78614 +Subproject commit 078c36b83c819faea03b3b9566ba9004c09f5540 diff --git a/bio-formats-examples b/bio-formats-examples index 02d0afb8c7..eab549b41e 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 02d0afb8c7847f3b694a55bdf5c854aef5daea03 +Subproject commit eab549b41e08d9a91fe8fad1f18170e2a00de9a6 diff --git a/bioformats b/bioformats index ee508a0697..5a458db129 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit ee508a0697f110cb1c54cda9e52c9040a3ebe2ed +Subproject commit 5a458db1290eed214b6328483696d388a5dbfb0d diff --git a/ome-codecs b/ome-codecs index c95aee4a3f..9b61e277e1 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit c95aee4a3fc80910e0d209c6f2a404135d60b995 +Subproject commit 9b61e277e174ef95b3160e45b51274619a77c9e3 diff --git a/ome-common-java b/ome-common-java index 429242f85a..e7ba0e0996 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 429242f85a204c0139d007932620222fb0d4a0e2 +Subproject commit e7ba0e0996ea61b91e4613c2b0aaabd52064a66d diff --git a/ome-jai b/ome-jai index e70c2abdc8..029c576150 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit e70c2abdc8407dd1903b51719703b01b1a3fcf47 +Subproject commit 029c5761507c91a7b31c588151d86f662f0677e0 diff --git a/ome-mdbtools b/ome-mdbtools index 91939304df..ff379777e3 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 91939304df9b925e45471ae5c24760955316053d +Subproject commit ff379777e3961316980d2aff43cb78b1c379956c diff --git a/ome-metakit b/ome-metakit index 8f31242815..46a116ac93 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 8f31242815d99f1488f674a5df49aa60c85a5e1a +Subproject commit 46a116ac93dda507e07b42637f00a7720dc24497 diff --git a/ome-model b/ome-model index be5b189cec..cf65f2ed3a 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit be5b189cecd4358154a7fa08e89aeeda7976865d +Subproject commit cf65f2ed3a3f7884fcb4d336132be107cad4b16c diff --git a/ome-poi b/ome-poi index da3a5f3ced..4ceac82f56 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit da3a5f3ced42dc1e5a8572d951d8f2f67c5be783 +Subproject commit 4ceac82f56c8379b083a67ee25555785a197f38b diff --git a/ome-stubs b/ome-stubs index 1559997769..28995c2c77 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit 1559997769957b7ed305779457ab96c1a8bced42 +Subproject commit 28995c2c773644b5de57ddc64f7c7d802c1745cf