From 9c3e32d82f89f33047f1d6064758b129a1158495 Mon Sep 17 00:00:00 2001
From: Snoopy Crime Cop <snoopycrimecop@gmail.com>
Date: Tue, 11 Jul 2023 23:56:14 +0000
Subject: [PATCH] merge develop -Dnone -Ihotfix -Ssuccess-only

Repository: openmicroscopy/openmicroscopy
Excluded PRs:
  - PR 6350 sbesson 'Histogram tests: fix tests and cover more pixel types' (user: sbesson)
  - PR 6349 sbesson 'Map contributors to use canonical real names and email addresses #482' (user: sbesson)
  - PR 6348 sbesson 'logback.xml/logback-indexing.xml: add default scanPeriod of 1 minute' (user: sbesson)
  - PR 6347 sbesson 'Upgrade Ivy to 2.5.1' (user: sbesson)
  - PR 6346 sbesson 'Remove no-op services.jar from being generated by the build system' (user: sbesson)
  - PR 6319 dominikl 'Add integration test for joining session' (user: dominikl)
  - PR 6309 jburel 'add try block' (user: jburel)
  - PR 6301 jburel 'Use the copy' (user: jburel)
  - PR 6275 joshmoore 'Add OMERO5.4__1 for omero-model#71' (user: joshmoore)
  - PR 6212 jburel 'add test to import images' (user: jburel)
  - PR 6086 manics 'Alternative JSON configuration system for OMERO.web' (user: manics)
Already up-to-date.

Generated by OMERO-push#1440 (https://latest-ci.openmicroscopy.org/jenkins/job/OMERO-push/1440/)