From f2e51b21d8fb25201566f62a9be08de2f869b72a Mon Sep 17 00:00:00 2001 From: Snoopy Crime Cop Date: Wed, 23 Dec 2020 00:04:45 +0000 Subject: [PATCH] merge master -Dorg -Ssuccess-only Repository: ome/bio-formats-build Already up-to-date. Repository: ome/bio-formats-documentation Already up-to-date. Merged PRs: - PR 168 dgault 'Temporarily add imagej.net to link check ignore list' Repository: ome/bio-formats-examples Already up-to-date. Merged PRs: - PR 56 jburel 'add ij macro example' - PR 69 dgault 'Add macro examples from OME 2020 NGFF workshop' Repository: openmicroscopy/bioformats Excluded PRs: - PR 3634 sbesson 'FileStitcher: add reader.close() statement when setting the class list' (state: failure) - PR 3618 dgault 'Memoizer: Persist caching to sub readers' (label: breaking) - PR 3572 dependabot[bot] 'Bump xercesImpl from 2.8.1 to 2.12.0 in /components/formats-bsd' (label: exclude) - PR 3563 dgault 'CZI: Parse TimeSpan Default Units' (label: exclude) - PR 3562 dgault 'SCN: No color correction for SCN400' (label: exclude) - PR 3524 RainerHeintzmann 'Added bfopen5D.m and modified bfsave.m.' (user: RainerHeintzmann) - PR 3402 dgault 'BDV: Verify timepoints' (label: exclude) - PR 3347 melissalinkert 'Add FormatTools methods for creating well names' (label: exclude) - PR 3311 melissalinkert 'OME-TIFF: use blank planes when UUID cannot be resolved to a filename' (label: exclude) - PR 3168 dgault 'ND2 - Improve parsing of acq times' (label: exclude) - PR 3056 dgault 'PCI: Don't modify the width when binning is used' (exclude comment) - PR 3032 dgault 'MetaMorph ND - Use version number to generate fileset' (label: breaking) - PR 3009 dgault 'ND2 - Support multipoint global metadata' (label: breaking) Already up-to-date. Merged PRs: - PR 3383 melissalinkert 'InCell 1000/2000: don't trust the plane count in the "Images" element' - PR 3435 dgault 'AmiraParameters: Use warning for empty key' - PR 3537 dgault 'Flex: Merge IDR changes and add new group plate option' - PR 3652 melissalinkert 'MetaXpress/CellWorX: ignore case when checking for thumbnail paths' Repository: ome/ome-codecs Excluded PRs: - PR 11 melissalinkert 'ZLIB: use ByteArrayHandle instead of ByteVector for decompressing' (label: exclude) Already up-to-date. Merged PRs: - PR 18 melissalinkert 'Fix decompression in Base64Codec' 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 129 rleigh-codelibre 'Add gradle build' (exclude comment) Already up-to-date. Merged PRs: - PR 128 rleigh-codelibre 'ome-xml: java: Don't report unhandled links prematurely' - PR 131 rleigh-codelibre 'MetadataConverter: Fix dropping of WellAnnotationRefs during conversion' - PR 133 rleigh-codelibre 'OMEXMLModelEnumHandler template: Correct type evaluation order' - PR 134 rleigh-codelibre 'OMEXMLModelEnum template: Correct exception handling' - PR 135 rleigh-codelibre 'Static analysis code remediation: xsd-fu Java templates' - PR 136 rleigh-codelibre 'Static analysis code remediation: ome-xml and specification Java sources' Repository: ome/ome-poi Already up-to-date. Repository: ome/ome-stubs Already up-to-date. Generated by BIOFORMATS-push#691 (https://merge-ci.openmicroscopy.org/jenkins/job/BIOFORMATS-push/691/) --- .gitmodules | 44 +++++++++++++++++++-------------------- 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 +- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3402784710..f0b1b28395 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,44 +1,44 @@ [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 diff --git a/bio-formats-documentation b/bio-formats-documentation index 62b84b1d4f..699aa9bc24 160000 --- a/bio-formats-documentation +++ b/bio-formats-documentation @@ -1 +1 @@ -Subproject commit 62b84b1d4fa08436bc67329ae1a3b03adcf05e34 +Subproject commit 699aa9bc24805bca7926ec78751349b286f73863 diff --git a/bio-formats-examples b/bio-formats-examples index 436cfe7da6..0190de0a84 160000 --- a/bio-formats-examples +++ b/bio-formats-examples @@ -1 +1 @@ -Subproject commit 436cfe7da62ff673754970256e2f21aaabfb1015 +Subproject commit 0190de0a84c6a29135a4a64a26d9146d73e50375 diff --git a/bioformats b/bioformats index b838003be2..6542777f14 160000 --- a/bioformats +++ b/bioformats @@ -1 +1 @@ -Subproject commit b838003be2a39a1ff97de0cae5cbec011977ae29 +Subproject commit 6542777f141ec1214fa71a519a5a749a3c14dbf5 diff --git a/ome-codecs b/ome-codecs index 28d698743c..267e2734a1 160000 --- a/ome-codecs +++ b/ome-codecs @@ -1 +1 @@ -Subproject commit 28d698743cc56c1db3637d7358d02cc0d66d183d +Subproject commit 267e2734a1e3c5d7e69f6ce9579e1faaf8ad131c diff --git a/ome-common-java b/ome-common-java index 9685c5d2f6..6a29e58409 160000 --- a/ome-common-java +++ b/ome-common-java @@ -1 +1 @@ -Subproject commit 9685c5d2f6a7d05ee6a100987fe34c0d573f54a5 +Subproject commit 6a29e58409692198011b1eb00a632c27e0441aab diff --git a/ome-jai b/ome-jai index 15b2b34d4c..b4234b4fea 160000 --- a/ome-jai +++ b/ome-jai @@ -1 +1 @@ -Subproject commit 15b2b34d4c2e05bfec6e5749d6a7745f7caacc20 +Subproject commit b4234b4fea03376abba50a34bd97d5c8fda7f4f0 diff --git a/ome-mdbtools b/ome-mdbtools index 3696e5e6ad..0a3899a070 160000 --- a/ome-mdbtools +++ b/ome-mdbtools @@ -1 +1 @@ -Subproject commit 3696e5e6adb14f1d6193b0dda2286f7ee0603a3a +Subproject commit 0a3899a07098d322606b51e6b5fc1ec9f707b2ab diff --git a/ome-metakit b/ome-metakit index ffad16227c..bf85fe8a49 160000 --- a/ome-metakit +++ b/ome-metakit @@ -1 +1 @@ -Subproject commit ffad16227cb0f385d254fd982d0e8a64109960d3 +Subproject commit bf85fe8a49a233c39393ed42eac8485c424fc5b6 diff --git a/ome-model b/ome-model index 9f1fb5647f..8c634ee81d 160000 --- a/ome-model +++ b/ome-model @@ -1 +1 @@ -Subproject commit 9f1fb5647f3c76473747643808ddb044b7d5ab45 +Subproject commit 8c634ee81d8af260607ca33dde2fb51d9da62b6b diff --git a/ome-poi b/ome-poi index ad80d0d2a2..b278849901 160000 --- a/ome-poi +++ b/ome-poi @@ -1 +1 @@ -Subproject commit ad80d0d2a20e5b427fb088136fa32ae9c6916de7 +Subproject commit b278849901671469484dffc55f744ef0a0bc383c diff --git a/ome-stubs b/ome-stubs index 4775c4f53f..fda6ec0864 160000 --- a/ome-stubs +++ b/ome-stubs @@ -1 +1 @@ -Subproject commit 4775c4f53fb33cb71644dac38450b5802a2343ca +Subproject commit fda6ec0864b5991d3d28b78c9865ba6208255aed