From c4fe5f3ca3bd76e2fe7eeae8ff0531c8386aaaea Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Sun, 29 Dec 2024 00:04:14 +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.1' - PR 100 dominikl 'Fix issues' Repository: ome/bio-formats-documentation Excluded PRs: - PR 403 dependabot[bot] 'Bump ch.qos.logback:logback-core from 1.3.14 to 1.5.13' (label: exclude) Already up to date. Merged PRs: - PR 402 pwalczysko 'Fix link' 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 4260 melissalinkert 'UpgradeChecker: more thorough check of upgrade check result and HTTP response code' (stage: draft) - PR 4254 melissalinkert 'Memoizer: ask any ImageReader instances to remove all but the current reader' (stage: draft) - PR 4196 melissalinkert 'DICOM: use FrameTimePointer to detect timelapse data' (label: exclude) - 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 4255 zacsimile 'Add Hamamatsu DCIMG Reader' - PR 4259 melissalinkert 'OIR: parse time step from TIMELAPSE axis when possible' Repository: ome/ome-codecs Already up to date. Repository: ome/ome-common-java Excluded PRs: - PR 93 dependabot[bot] 'Bump ch.qos.logback:logback-core from 1.3.14 to 1.5.13' (label: exclude) Already up to date. Repository: ome/ome-jai Already up to date. Repository: ome/ome-mdbtools Already up to date. Repository: ome/ome-metakit Excluded PRs: - PR 24 dependabot[bot] 'Bump ch.qos.logback:logback-core from 1.3.14 to 1.5.13' (label: exclude) 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#309 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/309/) --- .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..dc4f776e4a 160000 --- a/ZarrReader +++ b/ZarrReader @@ -1 +1 @@ -Subproject commit 9a9e662a3b00b37d51100df7256b11e4036ae693 +Subproject commit dc4f776e4a5baf188cb8724e6605b0cb7f81f5f9 diff --git a/bio-formats-documentation b/bio-formats-documentation index 05b7bf5588..dc904a29fb 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 05b7bf55887c5119ffde6b9c1248eb2702c36038 +Subproject commit dc904a29fb31195093d04a2362797a0ba236e0fb diff --git a/bio-formats-examples b/bio-formats-examples index 02d0afb8c7..36818199ba 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 02d0afb8c7847f3b694a55bdf5c854aef5daea03 +Subproject commit 36818199ba527052eb7d76009e5137deca40afc1 diff --git a/bioformats b/bioformats index 2ffe82cee8..dd1962ed58 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit 2ffe82cee816bd5392a9fff5da3aa8fb8cb76e2b +Subproject commit dd1962ed588d9c724999bf5cb56ae1ec20332d4b diff --git a/ome-codecs b/ome-codecs index fab1a01bf4..e0ac4e93d6 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit fab1a01bf4e0aad8f34715132789a674a1934709 +Subproject commit e0ac4e93d6212fae34a65b85dcfee18cbc3694a3 diff --git a/ome-common-java b/ome-common-java index 429242f85a..f6e7194598 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 429242f85a204c0139d007932620222fb0d4a0e2 +Subproject commit f6e7194598384bd454ffb223799f5590d4254a98 diff --git a/ome-jai b/ome-jai index e70c2abdc8..e003bebb17 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit e70c2abdc8407dd1903b51719703b01b1a3fcf47 +Subproject commit e003bebb175eb11056fea0d91d301b8de70b85c1 diff --git a/ome-mdbtools b/ome-mdbtools index 91939304df..75c8904711 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 91939304df9b925e45471ae5c24760955316053d +Subproject commit 75c8904711a18b112d8dbd3cb8e2e5d4666c0962 diff --git a/ome-metakit b/ome-metakit index 8f31242815..9df843d92c 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 8f31242815d99f1488f674a5df49aa60c85a5e1a +Subproject commit 9df843d92c1a4a78219c8ead47b42d61cc77f4d7 diff --git a/ome-model b/ome-model index 59688e0c9b..804115b529 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit 59688e0c9bed9799571c4f746c999b89debefbd0 +Subproject commit 804115b5291efd2eec823991e04e1e1fb854f826 diff --git a/ome-poi b/ome-poi index da3a5f3ced..8f574f7a1a 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit da3a5f3ced42dc1e5a8572d951d8f2f67c5be783 +Subproject commit 8f574f7a1a2119f8b5475fb499702cdbd7ec1ad4 diff --git a/ome-stubs b/ome-stubs index 1559997769..7610faf5f7 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit 1559997769957b7ed305779457ab96c1a8bced42 +Subproject commit 7610faf5f7751d98ad05ae3cea431aeff5a34f56