From c0ad2db13e6f5c26c4fc519941335b75914e0eca Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Sun, 27 Oct 2024 00:03:27 +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. 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.0' 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 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 4172 sbesson 'testSaneUsedFiles: check getCurrentFile is the first file in the getUsedFiles list' (stage: draft) - 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 4219 melissalinkert 'ImageJ exporter: save original metadata' - PR 4243 melissalinkert 'Update IExtraMetadataWriter.setExtraMetadata(...) to accept an Object' - PR 4248 melissalinkert 'Operetta reader: don't add directories to the 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. Conflicting PRs (not included): - 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#243 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/243/) --- .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..c84c6a95f6 160000 --- a/ZarrReader +++ b/ZarrReader @@ -1 +1 @@ -Subproject commit 9a9e662a3b00b37d51100df7256b11e4036ae693 +Subproject commit c84c6a95f60edc88aeb927331edab910e037fa16 diff --git a/bio-formats-documentation b/bio-formats-documentation index b07c8df342..a36db27684 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit b07c8df342c6a350f923f30aedd411897b3aa20a +Subproject commit a36db27684a3539205828859407415520931870b diff --git a/bio-formats-examples b/bio-formats-examples index 02d0afb8c7..47b5df7f8b 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 02d0afb8c7847f3b694a55bdf5c854aef5daea03 +Subproject commit 47b5df7f8b88365c9f60e9b8abecd768ff54f9ae diff --git a/bioformats b/bioformats index df36e69198..967377e736 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit df36e69198b0d83cb68f2f83e23dd943d86656fd +Subproject commit 967377e73647f38126071038646a6375a7886d09 diff --git a/ome-codecs b/ome-codecs index c95aee4a3f..91cc20bb38 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit c95aee4a3fc80910e0d209c6f2a404135d60b995 +Subproject commit 91cc20bb386a96b1f3e2aec0197b95cb2f7e4bb0 diff --git a/ome-common-java b/ome-common-java index 429242f85a..857a3276c5 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 429242f85a204c0139d007932620222fb0d4a0e2 +Subproject commit 857a3276c5e3744c713982a3b8585a17f7caaa60 diff --git a/ome-jai b/ome-jai index e70c2abdc8..07d1e09338 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit e70c2abdc8407dd1903b51719703b01b1a3fcf47 +Subproject commit 07d1e09338f3a882014400112a8de18110e3ea97 diff --git a/ome-mdbtools b/ome-mdbtools index 91939304df..8da835e5ec 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 91939304df9b925e45471ae5c24760955316053d +Subproject commit 8da835e5ec57fb6766f26683d0ac204c146c5816 diff --git a/ome-metakit b/ome-metakit index 8f31242815..22ac6cbc0f 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 8f31242815d99f1488f674a5df49aa60c85a5e1a +Subproject commit 22ac6cbc0f5d62c898d3df078ce1f5878e4d765b diff --git a/ome-model b/ome-model index be5b189cec..079dcd33dd 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit be5b189cecd4358154a7fa08e89aeeda7976865d +Subproject commit 079dcd33ddc016103b03bc26f6b88cf736e82a31 diff --git a/ome-poi b/ome-poi index da3a5f3ced..509e49e04f 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit da3a5f3ced42dc1e5a8572d951d8f2f67c5be783 +Subproject commit 509e49e04f834147a7a1d5fb48fe5cf86a06dfd4 diff --git a/ome-stubs b/ome-stubs index 1559997769..6e41f9e896 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit 1559997769957b7ed305779457ab96c1a8bced42 +Subproject commit 6e41f9e89661f7b04477c1a4304726d4bd06a343