Skip to content

Commit

Permalink
merge master -Dorg -Ssuccess-only
Browse files Browse the repository at this point in the history
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/)
  • Loading branch information
snoopycrimecop committed Dec 23, 2020
1 parent 8853a9f commit f2e51b2
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 33 deletions.
44 changes: 22 additions & 22 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion bio-formats-documentation
2 changes: 1 addition & 1 deletion ome-codecs
2 changes: 1 addition & 1 deletion ome-common-java
Submodule ome-common-java updated 0 files
2 changes: 1 addition & 1 deletion ome-jai
Submodule ome-jai updated 0 files
2 changes: 1 addition & 1 deletion ome-mdbtools
Submodule ome-mdbtools updated 0 files
2 changes: 1 addition & 1 deletion ome-metakit
Submodule ome-metakit updated 0 files
2 changes: 1 addition & 1 deletion ome-model
Submodule ome-model updated 37 files
+18 −22 ome-xml/src/main/java/ome/specification/XMLMockObjects.java
+2 −1 ome-xml/src/main/java/ome/specification/XMLWriter.java
+11 −10 ome-xml/src/main/java/ome/units/UNITS.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Angle.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/ElectricPotential.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Frequency.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Length.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Power.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Pressure.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Temperature.java
+8 −10 ome-xml/src/main/java/ome/units/quantity/Time.java
+10 −11 ome-xml/src/main/java/ome/units/unit/Unit.java
+1,614 −1,597 ome-xml/src/main/java/ome/xml/meta/MetadataConverter.java
+10 −1 ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java
+4 −5 ome-xml/src/main/java/ome/xml/model/MapPair.java
+2 −0 ome-xml/src/main/java/ome/xml/model/OMEModel.java
+5 −9 ome-xml/src/main/java/ome/xml/model/OMEModelImpl.java
+1 −1 ome-xml/src/main/java/ome/xml/model/ReferenceList.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeFloat.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeInteger.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeLong.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/PercentFraction.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/PositiveFloat.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/PositiveInteger.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/PositiveLong.java
+1 −1 ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveNumber.java
+3 −8 specification/src/main/java/ome/specification/OmeValidator.java
+18 −18 specification/src/main/java/ome/specification/SchemaResolver.java
+3 −3 xsd-fu/python/ome/modeltools/property.py
+32 −63 xsd-fu/templates/java/AggregateMetadata.template
+2 −2 xsd-fu/templates/java/FilterMetadata.template
+0 −1 xsd-fu/templates/java/MetadataRetrieve.template
+2 −2 xsd-fu/templates/java/OMEXMLMetadataImpl.template
+20 −16 xsd-fu/templates/java/OMEXMLModelEnum.template
+29 −24 xsd-fu/templates/java/OMEXMLModelEnumHandler.template
+49 −35 xsd-fu/templates/java/OMEXMLModelObject.template
+1 −1 xsd-fu/templates/java/OMEXMLModelObject_XMLAnnotation_asXMLElement_Value.template
2 changes: 1 addition & 1 deletion ome-poi
Submodule ome-poi updated 0 files
2 changes: 1 addition & 1 deletion ome-stubs
Submodule ome-stubs updated 0 files

0 comments on commit f2e51b2

Please sign in to comment.