From f7f40e6e1a1f8439b7d6df9257f1e44bbbfe5cec Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Fri, 10 Jan 2025 00:03:59 +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 671 dependabot[bot] 'Bump ome-common-java from `429242f` to `2410006`' - PR 672 dependabot[bot] 'Bump bio-formats-documentation from `05b7bf5` to `6043187`' - PR 674 dependabot[bot] 'Bump ome-metakit from `8f31242` to `ff62323`' - PR 675 dependabot[bot] 'Bump ome-model from `59688e0` to `a69d8fe`' 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 Already up to date. Merged PRs: - PR 404 dependabot[bot] 'Bump ch.qos.logback:logback-core from 1.3.14 to 1.3.15' 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 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 Excluded PRs: - PR 198 DimitriPapadopoulos 'Apply ruff rules to Python scripts' (user: DimitriPapadopoulos) Already up to date. Repository: ome/ome-poi Already up to date. Repository: ome/ome-stubs Already up to date. Generated by BIOFORMATS-push#321 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/321/) --- .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..4dee43773f 160000 --- a/ZarrReader +++ b/ZarrReader @@ -1 +1 @@ -Subproject commit 9a9e662a3b00b37d51100df7256b11e4036ae693 +Subproject commit 4dee43773f0ad84c507fd842a4b1380d2235ff22 diff --git a/bio-formats-documentation b/bio-formats-documentation index 604318761b..d097156c21 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 604318761b08941862a7cd1f2990ad49039e7cd9 +Subproject commit d097156c21594cb98c793c338e4c4feb4585bf41 diff --git a/bio-formats-examples b/bio-formats-examples index 02d0afb8c7..ed15785577 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 02d0afb8c7847f3b694a55bdf5c854aef5daea03 +Subproject commit ed1578557773744e67ce051e045f24346ff4ea4e diff --git a/bioformats b/bioformats index 2ffe82cee8..bcde2b04c2 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit 2ffe82cee816bd5392a9fff5da3aa8fb8cb76e2b +Subproject commit bcde2b04c28249b456830d3b8791bca125456713 diff --git a/ome-codecs b/ome-codecs index fab1a01bf4..42f5569b2e 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit fab1a01bf4e0aad8f34715132789a674a1934709 +Subproject commit 42f5569b2e6f990dcf9211e53892386b6a9f3a6e diff --git a/ome-common-java b/ome-common-java index 24100068f4..c605737be9 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 24100068f46ff2e3ca7a0b73e72d74b5fbd97340 +Subproject commit c605737be9847fce5f718b186302f7a4b4f0a1c1 diff --git a/ome-jai b/ome-jai index e70c2abdc8..9405948f14 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit e70c2abdc8407dd1903b51719703b01b1a3fcf47 +Subproject commit 9405948f1478483ff0834b0830ead17b67d16873 diff --git a/ome-mdbtools b/ome-mdbtools index 91939304df..ece466d27f 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 91939304df9b925e45471ae5c24760955316053d +Subproject commit ece466d27f1f88a7c5f19155b4dba21f3141ade6 diff --git a/ome-metakit b/ome-metakit index ff62323c22..80ae732cf4 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit ff62323c22ca3a176f33133c840015bca5135133 +Subproject commit 80ae732cf43126be7535c526cfe1fd60869cc6b1 diff --git a/ome-model b/ome-model index a69d8fe558..e5c5cf6177 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit a69d8fe558b1261f4ab007f58ed658c56ea49244 +Subproject commit e5c5cf6177148367f17a3f0bffa16e46b95b8ac2 diff --git a/ome-poi b/ome-poi index da3a5f3ced..252eaa84a9 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit da3a5f3ced42dc1e5a8572d951d8f2f67c5be783 +Subproject commit 252eaa84a91ea69f9889f8588943e8c0b9cfb032 diff --git a/ome-stubs b/ome-stubs index 1559997769..e2cf5ae2fd 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit 1559997769957b7ed305779457ab96c1a8bced42 +Subproject commit e2cf5ae2fd09ddbfd0451ed08aea1edbc89b8015