From 2928a4be0d0c5fdac7e6c82e05a7b2a90021fef2 Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Thu, 14 Dec 2023 00:05:58 +0000 Subject: [PATCH] merge master -Dorg -Ssuccess-only Repository: ome/bio-formats-build Already up-to-date. Merged PRs: - PR 469 jburel 'install sphinx' - PR 549 dependabot[bot] 'Bump bio-formats-examples from `6218db5` to `083f617`' - PR 550 dependabot[bot] 'Bump ZarrReader from `1d18bbc` to `4deea8d`' - PR 552 dependabot[bot] 'Bump bioformats from `996da68` to `d566f70`' - PR 553 dependabot[bot] 'Bump bio-formats-documentation from `f4a4045` to `45b07e2`' Repository: ome/ZarrReader Excluded PRs: - PR 20 dgault 'ZarrReader: Use chunk API' (exclude comment) Already up-to-date. Merged PRs: - PR 71 sbesson 'Bump Bio-Formats to version 7.1.0' Repository: ome/bio-formats-documentation Already up-to-date. Merged PRs: - PR 355 dgault 'Adding checkerframework.org to link check ignore' 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 4114 melissalinkert 'Add test for image names when resolutions are not flattened' (label: exclude) - PR 4100 nicolapapp 'bug fix, thumb nails are unsigned integers, and exceeded 2^31, so I changed their size to Long' (user: nicolapapp) - 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 3898 melissalinkert 'InCell 1000/2000 field count and plane metadata fixes' (stage: draft) - PR 3872 arvequina 'New codec integration Jetraw' (user: arvequina) - PR 3794 dgault 'Chunk API: Add new API and functionality for reading and writing chunks' (label: exclude) - PR 3680 iwbh15 'Performance increase in writeIFD' (user: iwbh15) - PR 3618 dgault 'Memoizer: Persist caching to sub readers' (label: breaking) Already up-to-date. Merged PRs: - PR 4061 CGDogan 'Don't fail on non-4:4:4 JPEG' - PR 4111 melissalinkert 'OIR: channel order and missing pixel block fixes' - PR 4112 melissalinkert 'Imaris HDF: populate channel names' - PR 4117 ed-scanlon 'Work-around for breaking change in CellSens 4.1' - PR 4130 carandraug 'matlab/bfGetPlane.m: avoid use of makeDataArray2D when Octave (ome/bio-formats-octave-docker#29)' Repository: ome/ome-codecs Excluded PRs: - PR 24 dependabot[bot] 'Bump testng from 6.8 to 7.7.0' (status: failure) - PR 21 dgault 'Replace one-jai with jai-imageio-jpeg2000' (stage: draft) Already up-to-date. Repository: ome/ome-common-java Excluded PRs: - PR 72 dependabot[bot] 'Bump testng from 6.8 to 7.7.0' (label: exclude) - PR 59 NicoKiaru 'adds AverageImageScaler implementation of IImageScaler' (user: NicoKiaru) 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 180 joshmoore 'xsd-fu: templates for linkml generation' (stage: draft) 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#713 (https://snoopycrimecop-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/713/) --- .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 4deea8dc50..209db6e156 160000 --- a/ZarrReader +++ b/ZarrReader @@ -1 +1 @@ -Subproject commit 4deea8dc5017678ffb507503c249fb7d3c05802a +Subproject commit 209db6e156f0eba07b5471e52c00a6e6910fefb8 diff --git a/bio-formats-documentation b/bio-formats-documentation index 45b07e2b9f..acccb6a107 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 45b07e2b9f61023837667efdc154c714bd0f44a7 +Subproject commit acccb6a1071336e586214fe0c8b3fdf28c9711ac diff --git a/bio-formats-examples b/bio-formats-examples index 083f617c18..ca3ea03142 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 083f617c1886fa8244d463a93d5665a8a9235063 +Subproject commit ca3ea031422b58d0ba70b984ac68d18d6db67b69 diff --git a/bioformats b/bioformats index d566f70845..7ec9e7cd80 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit d566f70845be514ab9c88d910ae42ab7a5f0bac0 +Subproject commit 7ec9e7cd8032212f1d0289ab6c2d27db7f97f843 diff --git a/ome-codecs b/ome-codecs index 040c8b9850..7f459f2d2a 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit 040c8b985078417ce109d345eb2c446d793c6100 +Subproject commit 7f459f2d2a679a2b25322b67ffa6f6fda190facb diff --git a/ome-common-java b/ome-common-java index fa81e2b473..a445d12e19 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit fa81e2b473b1e70fdcd84838b5055f46449d54f5 +Subproject commit a445d12e198b2949ecb2cdcc7c134c61ef91f817 diff --git a/ome-jai b/ome-jai index 6b7e42168b..358a2c2d49 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit 6b7e42168be78f07918912ef5966a4a76ae4f9b2 +Subproject commit 358a2c2d49372ddfe275ee496d3636561e9d8cf5 diff --git a/ome-mdbtools b/ome-mdbtools index cdb35527df..77b10388e9 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit cdb35527df613b87b844def3c99faafdf1339cac +Subproject commit 77b10388e9c555494f0659b86179642b0312afbf diff --git a/ome-metakit b/ome-metakit index 8ead2f6150..47a279a3e6 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 8ead2f615004b1a01e4d759d63f25b66d623989f +Subproject commit 47a279a3e682f9fbc8f356ee88257560db9826b4 diff --git a/ome-model b/ome-model index 739022fb84..d73c48c092 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit 739022fb84f481a88f3eee5938e5e367d569f266 +Subproject commit d73c48c0927e32b525fa06a73c07659eceff57a0 diff --git a/ome-poi b/ome-poi index ba0d5d20f0..67571ad931 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit ba0d5d20f06786801c40d77e9b91346d485a17c8 +Subproject commit 67571ad931fdc917f8317fe43f309ac6cb0b2399 diff --git a/ome-stubs b/ome-stubs index a17529ef1a..83470ff22f 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit a17529ef1a31bd7a66231767f57cb14b2040a0dc +Subproject commit 83470ff22f97835a878299b1f3a3f8335da3d00a