From 75ccad1847b79856055808d8b18a2f8e3db9f0c9 Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Sun, 17 Dec 2023 00:05:14 +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 553 dependabot[bot] 'Bump bio-formats-documentation from `f4a4045` to `45b07e2`' Repository: ome/ZarrReader Excluded PRs: - PR 73 dgault 'Update ReadMe and Change Log' (status: failure) - 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' - PR 74 dgault 'JZarr: Add jackson.core and jackson-databind to exclsions' 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 4131 dgault 'VirtualImagePlus: Retain B&C settings for each slice' (status: failure) - 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#716 (https://snoopycrimecop-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/716/) --- .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..2f8b67a114 160000 --- a/ZarrReader +++ b/ZarrReader @@ -1 +1 @@ -Subproject commit 4deea8dc5017678ffb507503c249fb7d3c05802a +Subproject commit 2f8b67a1144f0fefe928815e64ef5d5bc787dece diff --git a/bio-formats-documentation b/bio-formats-documentation index 45b07e2b9f..c00101efb6 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 45b07e2b9f61023837667efdc154c714bd0f44a7 +Subproject commit c00101efb62f3c2d8e2103d01fc58bb681a13ba5 diff --git a/bio-formats-examples b/bio-formats-examples index 083f617c18..4b0ea17ea8 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 083f617c1886fa8244d463a93d5665a8a9235063 +Subproject commit 4b0ea17ea86da604243308fe5ad35ab672168691 diff --git a/bioformats b/bioformats index d566f70845..ad76c50615 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit d566f70845be514ab9c88d910ae42ab7a5f0bac0 +Subproject commit ad76c50615fce86eb4d2b63f8219f24dc31a1c42 diff --git a/ome-codecs b/ome-codecs index 040c8b9850..67fce6eb43 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit 040c8b985078417ce109d345eb2c446d793c6100 +Subproject commit 67fce6eb43bd0fb5b50fd794569d3af5278ac4c4 diff --git a/ome-common-java b/ome-common-java index fa81e2b473..b5bc215c00 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit fa81e2b473b1e70fdcd84838b5055f46449d54f5 +Subproject commit b5bc215c00fd5d66bb39a850fdad5c9582dc0570 diff --git a/ome-jai b/ome-jai index 6b7e42168b..cbc1d84ece 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit 6b7e42168be78f07918912ef5966a4a76ae4f9b2 +Subproject commit cbc1d84eceec4b43e17316b3d70a5fedd22e9062 diff --git a/ome-mdbtools b/ome-mdbtools index cdb35527df..b13ee9d34a 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit cdb35527df613b87b844def3c99faafdf1339cac +Subproject commit b13ee9d34addc5e653b237f1747f98c65bf791fd diff --git a/ome-metakit b/ome-metakit index 8ead2f6150..024762d95c 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit 8ead2f615004b1a01e4d759d63f25b66d623989f +Subproject commit 024762d95cdbec9bbdc79302cc84d8dcef3b530e diff --git a/ome-model b/ome-model index 739022fb84..49c8fdcadb 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit 739022fb84f481a88f3eee5938e5e367d569f266 +Subproject commit 49c8fdcadb3f9c9c544cbb3ab318f8e910d5fe83 diff --git a/ome-poi b/ome-poi index ba0d5d20f0..5b115906a1 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit ba0d5d20f06786801c40d77e9b91346d485a17c8 +Subproject commit 5b115906a1f3c068ca91e44b783677792a62b7a0 diff --git a/ome-stubs b/ome-stubs index a17529ef1a..72aa1d2821 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit a17529ef1a31bd7a66231767f57cb14b2040a0dc +Subproject commit 72aa1d28213d4b3ea2d5c76b3be4724e85f1a397