![[Jenkins]](/jenkins/static/b63a1141/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 53 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-build-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-build-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision be302339afbcb58c8fe5fb6ab3932873d847cd68 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-build-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-build.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-build.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-build.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Commit message: "Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f" > git rev-list --no-walk be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-model.url # timeout=10 > git config -f .gitmodules --get submodule.omero-model.path # timeout=10 > git config --get submodule.omero-common.url # timeout=10 > git config -f .gitmodules --get submodule.omero-common.path # timeout=10 > git config --get submodule.omero-romio.url # timeout=10 > git config -f .gitmodules --get submodule.omero-romio.path # timeout=10 > git config --get submodule.omero-renderer.url # timeout=10 > git config -f .gitmodules --get submodule.omero-renderer.path # timeout=10 > git config --get submodule.omero-server.url # timeout=10 > git config -f .gitmodules --get submodule.omero-server.path # timeout=10 > git config --get submodule.omero-blitz.url # timeout=10 > git config -f .gitmodules --get submodule.omero-blitz.path # timeout=10 > git config --get submodule.omero-gateway-java.url # timeout=10 > git config -f .gitmodules --get submodule.omero-gateway-java.path # timeout=10 > git submodule update --init --recursive omero-model # timeout=10 > git submodule update --init --recursive omero-common # timeout=10 > git submodule update --init --recursive omero-romio # timeout=10 > git submodule update --init --recursive omero-renderer # timeout=10 > git submodule update --init --recursive omero-server # timeout=10 > git submodule update --init --recursive omero-blitz # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-gradle-plugins-push" build number 46 [Pipeline] sh + pushd build ~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + popd ~/workspace/OMERO-build-push + python3 -m venv build/venv > git submodule update --init --recursive omero-gateway-java # timeout=10 + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-build-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + python3 -m pip install -U pip Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3) Collecting pip Using cached pip-24.0-py3-none-any.whl (2.1 MB) Installing collected packages: pip Attempting uninstall: pip Found existing installation: pip 21.2.3 Uninstalling pip-21.2.3: Successfully uninstalled pip-21.2.3 Successfully installed pip-24.0 + python3 -m pip install scc Collecting scc Using cached scc-0.19.1-py3-none-any.whl.metadata (3.6 kB) Collecting PyGithub>=1.54 (from scc) Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB) Collecting PyYAML>=5.1 (from scc) Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB) Collecting future (from scc) Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB) Collecting ruamel.yaml (from scc) Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB) Collecting ruamel.yaml.jinja2 (from scc) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB) Collecting six (from scc) Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB) Collecting urllib3<2 (from scc) Using cached urllib3-1.26.18-py2.py3-none-any.whl.metadata (48 kB) Collecting yaclifw<0.3,>=0.2.0 (from scc) Using cached yaclifw-0.2.0-py3-none-any.whl Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB) Collecting requests>=2.14.0 (from PyGithub>=1.54->scc) Using cached requests-2.31.0-py3-none-any.whl.metadata (4.6 kB) Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB) Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc) Using cached typing_extensions-4.11.0-py3-none-any.whl.metadata (3.0 kB) Collecting Deprecated (from PyGithub>=1.54->scc) Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB) Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB) Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc) Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.3 kB) Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB) Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB) Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB) Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc) Using cached certifi-2024.2.2-py3-none-any.whl.metadata (2.2 kB) Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc) Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB) Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc) Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes) Using cached scc-0.19.1-py3-none-any.whl (48 kB) Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB) Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB) Using cached urllib3-1.26.18-py2.py3-none-any.whl (143 kB) Using cached future-1.0.0-py3-none-any.whl (491 kB) Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB) Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB) Using cached six-1.16.0-py2.py3-none-any.whl (11 kB) Using cached PyJWT-2.8.0-py3-none-any.whl (22 kB) Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB) Using cached requests-2.31.0-py3-none-any.whl (62 kB) Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB) Using cached typing_extensions-4.11.0-py3-none-any.whl (34 kB) Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB) Using cached certifi-2024.2.2-py3-none-any.whl (163 kB) Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB) Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB) Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl (4.6 MB) Using cached idna-3.7-py3-none-any.whl (66 kB) Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB) Using cached pycparser-2.22-py3-none-any.whl (117 kB) Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.2.2 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-42.0.5 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.31.0 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.19.1 six-1.16.0 typing-extensions-4.11.0 urllib3-1.26.18 wrapt-1.16.0 yaclifw-0.2.0 [Pipeline] sh + export BASE_REPO=omero-build.git + BASE_REPO=omero-build.git + export BASE_BRANCH=master + BASE_BRANCH=master + export VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv + VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv + . build/venv/bin/activate ++ deactivate nondestructive ++ '[' -n '' ']' ++ '[' -n '' ']' ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r ++ '[' -n '' ']' ++ unset VIRTUAL_ENV ++ '[' '!' nondestructive = nondestructive ']' ++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-push/build/venv ++ export VIRTUAL_ENV ++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ PATH=/home/omero/workspace/OMERO-build-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin ++ export PATH ++ '[' -n '' ']' ++ '[' -z '' ']' ++ _OLD_VIRTUAL_PS1= ++ PS1='(venv) ' ++ export PS1 ++ '[' -n /bin/bash -o -n '' ']' ++ hash -r + '[' merge_ci '!=' null ']' + export PUSH_BRANCH=merge_ci + PUSH_BRANCH=merge_ci + '[' null '!=' null ']' + export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment' + STATUS=success-only + MERGE_OPTIONS='-vvv --no-ask --reset --comment' + bash build/build-infra-master/recursive-merge Merge base repository (no submodule updates) 2024-04-27 00:23:50,437 [ scc.config] DEBUG Found github.token 2024-04-27 00:23:50,439 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-27 00:23:50,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:23:51,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:23:51,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-27 00:23:51,539 [ scc.gh] DEBUG 4568 remaining from 5000 (Reset at 01:04 2024-04-27 00:23:51,541 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:23:51,546 [ scc.git] DEBUG Check current status 2024-04-27 00:23:51,546 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:23:51,550 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-27 00:23:51,550 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:23:51,593 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-27 00:23:51,613 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-27 00:23:51,616 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-27 00:23:51,626 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-27 00:23:51,630 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-27 00:23:51,633 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-27 00:23:51,658 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-27 00:23:51,664 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:23:52,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-27 00:23:52,491 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:23:52,910 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:23:53,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:23:53,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:23:53,755 [ scc.git] DEBUG Resetting... 2024-04-27 00:23:53,755 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-27 00:23:53,765 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-27 00:23:53,766 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-27 00:23:53,830 [ scc.git] DEBUG Check current status 2024-04-27 00:23:53,830 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:23:53,835 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-27 00:23:53,835 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:23:53,885 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-27 00:23:53,888 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-27 00:23:53,893 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-27 00:23:53,897 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-27 00:23:53,900 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-27 00:23:53,904 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-27 00:23:53,909 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-27 00:23:53,910 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-27 00:23:53,910 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-27 00:23:53,910 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-27 00:23:53,910 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-27 00:23:53,910 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-27 00:23:53,910 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:23:54,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-27 00:23:54,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-27 00:23:54,731 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-27 00:23:54,731 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-27 00:23:54,731 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:23:54,731 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:23:54,731 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:23:54,735 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:23:54,740 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:23:54,740 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:23:54,746 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:23:54,752 [ scc.git] DEBUG Already up to date. 2024-04-27 00:23:54,753 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-27 00:23:55,145 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-27 00:23:55,145 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-27 00:23:55,153 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:23:55,153 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:23:55,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:23:55,157 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-27 00:23:55,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:23:55,178 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 185 (Bump omero-server from `82d598f` to `f67fdb6`) a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-27 00:23:55,200 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:23:55,203 [ scc.git] DEBUG omero-server | 2 +- 2024-04-27 00:23:55,203 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:23:55,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:23:55,358 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:23:55,537 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-27 00:23:55,539 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:23:55,539 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:23:55,544 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:23:55,827 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fca862be490> has no local changes 2024-04-27 00:23:55,827 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone Repository: ome/omero-build Already up to date. Merged PRs: - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:23:55,866 [ scc.git] DEBUG [detached HEAD e8fa073] merge master -Dorg -Snone 2024-04-27 00:23:55,866 [ scc.merge] INFO Repository: ome/omero-build 2024-04-27 00:23:55,866 [ scc.merge] INFO Already up to date. 2024-04-27 00:23:55,866 [ scc.merge] INFO 2024-04-27 00:23:55,866 [ scc.merge] INFO Merged PRs: 2024-04-27 00:23:55,866 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-27 00:23:55,866 [ scc.merge] INFO 2024-04-27 00:23:55,866 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-27 00:23:55,867 [ scc.git] DEBUG Calling 'git remote' Synchronizing submodule url for 'omero-blitz' Synchronizing submodule url for 'omero-common' Synchronizing submodule url for 'omero-gateway-java' Synchronizing submodule url for 'omero-model' Synchronizing submodule url for 'omero-renderer' Synchronizing submodule url for 'omero-romio' Synchronizing submodule url for 'omero-server' Merge all submodules2024-04-27 00:23:59,267 [ scc.config] DEBUG Found github.token 2024-04-27 00:23:59,270 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-27 00:23:59,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:23:59,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:00,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-27 00:24:00,334 [ scc.gh] DEBUG 4558 remaining from 5000 (Reset at 01:04 2024-04-27 00:24:00,335 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:00,339 [ scc.git] DEBUG Check current status 2024-04-27 00:24:00,340 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:00,343 [ scc.git] DEBUG e8fa073 merge master -Dorg -Snone 2024-04-27 00:24:00,344 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:00,384 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-27 00:24:00,387 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-27 00:24:00,390 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-27 00:24:00,393 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-27 00:24:00,396 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-27 00:24:00,399 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-27 00:24:00,402 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-27 00:24:00,406 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:00,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-27 00:24:01,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:01,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:02,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:02,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:02,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:02,704 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-27 00:24:02,704 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:02,710 [ scc.git] DEBUG Check current status 2024-04-27 00:24:02,710 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:02,727 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-27 00:24:02,728 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:02,775 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:03,124 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-27 00:24:03,575 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:03,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:04,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:04,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:04,830 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:04,875 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:04,876 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-27 00:24:04,876 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:04,881 [ scc.git] DEBUG Check current status 2024-04-27 00:24:04,882 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:04,916 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-27 00:24:04,916 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:04,960 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:05,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-27 00:24:05,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:06,179 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:06,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:07,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:07,025 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:07,072 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:07,073 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-27 00:24:07,073 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:07,078 [ scc.git] DEBUG Check current status 2024-04-27 00:24:07,079 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:07,089 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-27 00:24:07,090 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:07,143 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:07,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-27 00:24:07,951 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:08,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:08,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:09,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:09,230 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:09,273 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:09,274 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-27 00:24:09,274 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:09,280 [ scc.git] DEBUG Check current status 2024-04-27 00:24:09,281 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:09,299 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-27 00:24:09,300 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:09,351 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:09,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-27 00:24:10,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:10,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:11,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:11,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:11,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:11,616 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:11,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-27 00:24:11,617 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:11,622 [ scc.git] DEBUG Check current status 2024-04-27 00:24:11,623 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:11,641 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-27 00:24:11,642 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:11,695 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:12,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-27 00:24:12,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:12,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:13,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:13,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:13,812 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:13,853 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:13,854 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-27 00:24:13,854 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:13,859 [ scc.git] DEBUG Check current status 2024-04-27 00:24:13,859 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:13,874 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-27 00:24:13,874 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:13,926 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:14,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-27 00:24:14,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:15,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:15,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:16,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:16,030 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:16,074 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:16,075 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-27 00:24:16,075 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-27 00:24:16,081 [ scc.git] DEBUG Check current status 2024-04-27 00:24:16,081 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:16,096 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-27 00:24:16,097 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:16,149 [ scc.config] DEBUG Found remote.origin.url 2024-04-27 00:24:16,496 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-27 00:24:16,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-27 00:24:17,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-27 00:24:17,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-27 00:24:18,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-27 00:24:18,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:18,287 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:18,287 [ scc.git] DEBUG Resetting... 2024-04-27 00:24:18,287 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-27 00:24:18,294 [ scc.git] DEBUG HEAD is now at e8fa073 merge master -Dorg -Snone 2024-04-27 00:24:18,295 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-27 00:24:18,353 [ scc.git] DEBUG Check current status 2024-04-27 00:24:18,353 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-27 00:24:18,358 [ scc.git] DEBUG e8fa073 merge master -Dorg -Snone 2024-04-27 00:24:18,358 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-27 00:24:18,395 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-27 00:24:18,398 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-27 00:24:18,401 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-27 00:24:18,404 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-27 00:24:18,406 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-27 00:24:18,410 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-27 00:24:18,412 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-27 00:24:18,414 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-27 00:24:18,414 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-27 00:24:18,414 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-27 00:24:18,414 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-27 00:24:18,414 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-27 00:24:18,414 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-27 00:24:18,414 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:24:18,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-27 00:24:19,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-27 00:24:19,213 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-27 00:24:19,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-27 00:24:20,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:20,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-27 00:24:21,261 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/statuses/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:21,262 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-27 00:24:21,262 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:24:21,262 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:21,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:21,268 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:24:21,272 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:24:21,272 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:24:21,277 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:24:21,281 [ scc.git] DEBUG Already up to date. 2024-04-27 00:24:21,281 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-27 00:24:21,667 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-27 00:24:21,667 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-27 00:24:21,673 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:24:21,673 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:21,673 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:21,679 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-27 00:24:21,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:21,693 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 185 (Bump omero-server from `82d598f` to `f67fdb6`) a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-27 00:24:21,700 [ scc.git] DEBUG Already up to date. 2024-04-27 00:24:21,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:21,860 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:24:21,908 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:21,908 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:21,912 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:24:22,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-27 00:24:22,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-27 00:24:23,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None 2024-04-27 00:24:23,914 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-27 00:24:24,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:24,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:24:25,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-27 00:24:25,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:25,841 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-27 00:24:26,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-27 00:24:26,760 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-27 00:24:27,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-27 00:24:27,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-27 00:24:28,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-27 00:24:28,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:29,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:24:29,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-27 00:24:30,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/6d887b53b85d244eed855703effd0e470c83bab9?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:30,141 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-27 00:24:30,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-27 00:24:31,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-27 00:24:31,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:32,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-27 00:24:32,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/112d3abc997c6cda0078483bb91786e37a3f1f87?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:32,573 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:24:33,055 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-27 00:24:33,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-27 00:24:33,992 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-27 00:24:34,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:34,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-27 00:24:35,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/4ef8809efaee231eb83e45e64a852a9808bc4723?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:35,309 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-27 00:24:35,309 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:24:35,309 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-27 00:24:35,310 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:35,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:35,316 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:24:35,322 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:24:35,323 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:24:35,331 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:24:35,341 [ scc.git] DEBUG Already up to date. 2024-04-27 00:24:35,341 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-27 00:24:35,913 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-27 00:24:35,914 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-27 00:24:35,919 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-27 00:24:36,304 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-27 00:24:36,304 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-27 00:24:36,312 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-27 00:24:36,958 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-27 00:24:36,958 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-27 00:24:36,964 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-27 00:24:37,396 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-27 00:24:37,396 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-27 00:24:37,402 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:24:37,403 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:37,403 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:37,407 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-27 00:24:37,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:37,417 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 119 (Take Ice and omero sysenv variables into account) 4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-27 00:24:37,458 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-27 00:24:37,459 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:37,463 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-27 00:24:37,463 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-27 00:24:37,622 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:37,623 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-27 00:24:37,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:37,635 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 131 (bump org.openmicroscopy.project 5.6.0) 112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-27 00:24:37,663 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:24:37,664 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:37,667 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:24:37,667 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:24:38,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:38,037 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-27 00:24:38,044 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:38,050 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-27 00:24:38,130 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:38,134 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-27 00:24:38,134 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:24:38,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:38,449 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-27 00:24:38,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:38,462 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 148 (Fix ordering of OriginalFile objects registered in saveFileset()) e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-27 00:24:38,501 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:38,505 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-27 00:24:38,505 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-27 00:24:38,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:38,869 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:24:38,922 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:38,922 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:38,928 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:38,974 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:24:38,985 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb3d12be0> has no local changes 2024-04-27 00:24:38,985 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-blitz Excluded PRs: - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) Already up to date. Merged PRs: - PR 119 dominikl 'Take Ice and omero sysenv variables into account' - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 132 jburel 'Fix javadoc warning' - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:24:38,997 [ scc.git] DEBUG [detached HEAD 33a96e04] merge master -Dorg -Ssuccess-only 2024-04-27 00:24:38,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:38,998 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:24:39,775 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-27 00:24:40,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-27 00:24:40,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-27 00:24:41,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-27 00:24:41,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:42,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-27 00:24:42,645 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/38d376c831b5d3ea1b8806c5791df403555fc170?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:42,647 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-27 00:24:43,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-27 00:24:43,569 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-27 00:24:44,067 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-27 00:24:44,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:45,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:24:45,566 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-27 00:24:45,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/92e4d3ee9bd655e531156415863a1defa7d0ab39?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:45,986 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-27 00:24:46,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-27 00:24:46,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-27 00:24:47,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:47,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-27 00:24:48,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/4a9d6c24778791d07f2c42951a5c1a6e3c711007?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:48,309 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:24:48,310 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:24:48,310 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-27 00:24:48,310 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:48,310 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:48,315 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:24:48,319 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:24:48,319 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:24:48,324 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:24:48,329 [ scc.git] DEBUG Already up to date. 2024-04-27 00:24:48,329 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-27 00:24:48,729 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-27 00:24:48,729 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-27 00:24:48,735 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-27 00:24:49,157 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-27 00:24:49,158 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-27 00:24:49,165 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-27 00:24:49,576 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-27 00:24:49,576 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-27 00:24:49,581 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:24:49,582 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:49,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:49,588 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-27 00:24:49,596 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:49,603 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 39 (bump org.openmicroscopy.project 5.6.0) 4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-27 00:24:49,633 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:24:49,635 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:49,639 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:24:49,639 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:24:49,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:49,805 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-27 00:24:49,812 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:49,817 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-27 00:24:49,828 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:49,830 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-27 00:24:49,831 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-27 00:24:50,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:50,224 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-27 00:24:50,230 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:50,235 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 43 (Mark omero.security.ignore_case as production property) 38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-27 00:24:50,314 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:50,318 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-27 00:24:50,318 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-27 00:24:50,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:50,632 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:24:50,674 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:50,674 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:50,679 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:50,715 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:24:50,722 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb2c6b640> has no local changes 2024-04-27 00:24:50,722 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-common Excluded PRs: - PR 40 jburel 'set classifier' (exclude comment) - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) Already up to date. Merged PRs: - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 42 jburel 'include all' - PR 43 sbesson 'Mark omero.security.ignore_case as production property' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:24:50,730 [ scc.git] DEBUG [detached HEAD 26a00a0] merge master -Dorg -Ssuccess-only 2024-04-27 00:24:50,731 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:50,731 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:24:51,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-27 00:24:51,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-27 00:24:52,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-27 00:24:52,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-27 00:24:53,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-27 00:24:53,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:54,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-27 00:24:54,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/statuses/91d77158637953fa8fd1bdcd6a6a738b064b536c?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:54,614 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:24:55,079 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-27 00:24:55,553 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-27 00:24:55,555 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:24:55,555 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-27 00:24:55,555 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:55,555 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:55,560 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:24:55,565 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:24:55,566 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:24:55,571 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:24:55,576 [ scc.git] DEBUG Already up to date. 2024-04-27 00:24:55,577 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-27 00:24:55,967 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-27 00:24:55,967 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-27 00:24:55,974 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:24:55,974 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:55,974 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:55,979 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-27 00:24:55,986 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:55,990 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 69 (bump org.openmicroscopy.project 5.6.0) 91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-27 00:24:56,047 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:24:56,048 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:24:56,051 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:24:56,052 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:24:56,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:24:56,214 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:24:56,254 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:24:56,254 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:24:56,259 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:24:56,298 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:24:56,305 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb1bf9af0> has no local changes 2024-04-27 00:24:56,305 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-gateway-java Excluded PRs: - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) - PR 30 jburel 'Import image' (exclude comment) Already up to date. Merged PRs: - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:24:56,315 [ scc.git] DEBUG [detached HEAD dfede9c] merge master -Dorg -Ssuccess-only 2024-04-27 00:24:56,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:24:56,316 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:24:56,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-27 00:24:57,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None 2024-04-27 00:24:57,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-27 00:24:58,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:24:58,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:24:59,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-27 00:24:59,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/9e284c2e5a7bbb845906c2799693af75ec42bebc?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:24:59,511 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-27 00:24:59,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-27 00:25:00,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-27 00:25:00,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:01,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:25:01,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-27 00:25:02,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:02,332 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-27 00:25:02,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-27 00:25:03,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-27 00:25:03,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-27 00:25:04,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:04,758 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-27 00:25:05,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:05,175 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:05,176 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:25:05,176 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-27 00:25:05,176 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:05,176 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:05,185 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:25:05,193 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:25:05,193 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:25:05,202 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:25:05,212 [ scc.git] DEBUG Already up to date. 2024-04-27 00:25:05,213 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-27 00:25:05,629 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-27 00:25:05,629 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-27 00:25:05,637 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-27 00:25:06,057 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-27 00:25:06,058 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-27 00:25:06,065 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-04-27 00:25:06,455 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-27 00:25:06,455 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-04-27 00:25:06,463 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:25:06,463 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:06,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:06,469 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-27 00:25:06,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:06,481 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 90 (bump org.openmicroscopy.project 5.6.0) 3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-27 00:25:06,512 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:06,513 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:06,516 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:25:06,516 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:06,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:06,683 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-27 00:25:06,699 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:06,705 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 99 (PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata) 63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-27 00:25:06,729 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:06,733 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-27 00:25:06,733 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-27 00:25:07,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:07,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-27 00:25:07,107 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:07,114 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Bump Bio-Formats to version 7.3.0) 9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-27 00:25:07,156 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:07,157 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:07,161 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:25:07,161 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:07,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:07,511 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:25:07,566 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:07,567 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:07,574 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:25:07,638 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:25:07,647 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb3caf6a0> has no local changes 2024-04-27 00:25:07,647 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-model Already up to date. Merged PRs: - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:25:07,660 [ scc.git] DEBUG [detached HEAD 582b147] merge master -Dorg -Ssuccess-only 2024-04-27 00:25:07,661 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:07,661 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:25:08,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-27 00:25:08,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-27 00:25:09,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-27 00:25:09,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:10,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-27 00:25:10,490 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/statuses/4431628b7553af56df3e6dceb1241be4b2e6a751?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:10,491 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:11,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-27 00:25:11,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-27 00:25:11,543 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-27 00:25:11,544 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:25:11,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-27 00:25:11,544 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:11,544 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:11,555 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:25:11,564 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:25:11,564 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:25:11,573 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:25:11,581 [ scc.git] DEBUG Already up to date. 2024-04-27 00:25:11,582 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-27 00:25:11,963 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-27 00:25:11,963 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-27 00:25:11,972 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:25:11,972 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:11,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:11,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-27 00:25:11,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:11,998 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 23 (bump org.openmicroscopy.project 5.6.0) 4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-27 00:25:12,101 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:12,102 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:12,109 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:25:12,109 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:12,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:12,274 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:25:12,342 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:12,343 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:12,355 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:25:12,437 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:25:12,450 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb2c4fb80> has no local changes 2024-04-27 00:25:12,450 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-renderer Excluded PRs: - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) Already up to date. Merged PRs: - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:25:12,463 [ scc.git] DEBUG [detached HEAD da20c09] merge master -Dorg -Ssuccess-only 2024-04-27 00:25:12,464 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:12,464 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:25:12,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-27 00:25:13,382 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-27 00:25:13,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-27 00:25:14,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:14,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-27 00:25:15,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/statuses/3e957802ff410901610d23f11c9f2a7db50fa19d?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:15,319 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:15,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-27 00:25:16,253 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-27 00:25:16,255 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:25:16,255 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-27 00:25:16,255 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:16,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:16,263 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:25:16,271 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:25:16,271 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:25:16,279 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:25:16,286 [ scc.git] DEBUG Already up to date. 2024-04-27 00:25:16,287 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-27 00:25:16,714 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-27 00:25:16,715 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-27 00:25:16,723 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:25:16,723 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:16,723 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:16,731 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-27 00:25:16,739 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:16,747 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 41 (bump org.openmicroscopy.project 5.6.0) 3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-27 00:25:16,768 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:16,784 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:16,788 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:25:16,788 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:16,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:16,992 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:25:17,037 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:17,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:17,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:25:17,115 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:25:17,128 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb2c4f9d0> has no local changes 2024-04-27 00:25:17,128 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-romio Excluded PRs: - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) Already up to date. Merged PRs: - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:25:17,144 [ scc.git] DEBUG [detached HEAD 892de87] merge master -Dorg -Ssuccess-only 2024-04-27 00:25:17,145 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:17,146 [ scc.repo] DEBUG ## PRs found: 2024-04-27 00:25:17,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-27 00:25:18,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-27 00:25:18,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-27 00:25:19,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:19,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:25:20,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-27 00:25:20,578 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:20,579 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-27 00:25:21,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-27 00:25:21,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-27 00:25:22,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-27 00:25:22,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:23,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-27 00:25:23,564 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-27 00:25:23,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:23,997 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-27 00:25:24,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-27 00:25:24,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-27 00:25:25,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-27 00:25:25,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-27 00:25:26,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-27 00:25:26,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:27,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-27 00:25:27,626 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/3e65b9de901fc160c380da602def943206fe9b1d?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:27,627 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-27 00:25:28,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-27 00:25:28,592 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-27 00:25:29,025 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:29,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-27 00:25:29,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:29,879 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:30,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-27 00:25:30,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-27 00:25:31,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-27 00:25:31,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-27 00:25:32,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-27 00:25:32,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf?per_page=1 HTTP/1.1" 200 2 2024-04-27 00:25:32,893 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-27 00:25:32,894 [ scc.repo] DEBUG ## Branches found: 2024-04-27 00:25:32,894 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-27 00:25:32,894 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:32,894 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:32,901 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-27 00:25:32,907 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-27 00:25:32,907 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-27 00:25:32,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-27 00:25:32,922 [ scc.git] DEBUG Already up to date. 2024-04-27 00:25:32,922 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-27 00:25:33,383 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-27 00:25:33,383 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-27 00:25:33,389 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-27 00:25:33,764 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-27 00:25:33,765 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-27 00:25:33,771 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-27 00:25:34,182 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-27 00:25:34,182 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-27 00:25:34,189 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-27 00:25:34,678 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-27 00:25:34,678 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-27 00:25:34,684 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-27 00:25:35,073 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-27 00:25:35,073 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-27 00:25:35,079 [ scc.git] DEBUG ## Unique users: [] 2024-04-27 00:25:35,080 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:35,080 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:35,085 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-27 00:25:35,093 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:35,098 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 61 (Pass user executor to rendering tasks) 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-27 00:25:35,177 [ scc.git] DEBUG CONFLICT (modify/delete): .travis.yml deleted in HEAD and modified in 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf. Version 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf of .travis.yml left in tree. 2024-04-27 00:25:35,178 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:35,178 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-27 00:25:35,178 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-27 00:25:35,179 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-27 00:25:35,189 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-27 00:25:35,202 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-27 00:25:35,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:35,415 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-27 00:25:35,423 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-27 00:25:35,430 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#46](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/consoleText) for more details. Possible conflicts: - Upstream changes - .travis.yml - build.gradle --conflicts 2024-04-27 00:25:35,436 [ scc.config] DEBUG Found github.token 2024-04-27 00:25:35,436 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-27 00:25:35,436 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-27 00:25:35,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:35,448 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 151 (bump org.openmicroscopy.project 5.6.0) f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-27 00:25:35,497 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:35,499 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:35,502 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:25:35,502 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:35,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:35,895 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-27 00:25:35,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:35,908 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-27 00:25:35,962 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:35,965 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-27 00:25:35,965 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:36,313 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:36,314 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-27 00:25:36,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:36,326 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 175 (Bump org.postgresql:postgresql to version 42.2.28) b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-27 00:25:36,374 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-27 00:25:36,377 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:36,380 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-27 00:25:36,380 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-27 00:25:36,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:36,739 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-27 00:25:36,747 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:36,752 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 177 (Swap default min and background thread limits) cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-27 00:25:36,778 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-27 00:25:36,782 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-27 00:25:36,782 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-27 00:25:37,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:37,196 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-27 00:25:37,240 [ scc.git] DEBUG Get sha1 of %s 2024-04-27 00:25:37,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-27 00:25:37,246 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:25:37,290 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:25:37,301 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb2c5ffd0> has no local changes 2024-04-27 00:25:37,302 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-server Excluded PRs: - PR 166 kkoz 'Experimenter group cache' (stage: draft) - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) Already up to date. Merged PRs: - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 152 jburel 'Set class in doc' - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' - PR 177 chris-allan 'Swap default min and background thread limits' Conflicting PRs (not included): - PR 61 joshmoore 'Pass user executor to rendering tasks' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:25:37,314 [ scc.git] DEBUG [detached HEAD be22cda4] merge master -Dorg -Ssuccess-only 2024-04-27 00:25:37,315 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:37,315 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-27 00:25:37,377 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-27 00:25:37,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:37,621 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-27 00:25:37,625 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-27 00:25:38,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:38,049 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-27 00:25:38,052 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-27 00:25:38,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:38,518 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-27 00:25:38,523 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-27 00:25:38,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:38,924 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-27 00:25:38,930 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-27 00:25:39,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:39,434 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-27 00:25:39,438 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-27 00:25:39,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:39,855 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-27 00:25:39,859 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-27 00:25:40,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-27 00:25:40,348 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-27 00:25:40,348 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-27 00:25:40,390 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7effb60c0490> has local changes 2024-04-27 00:25:40,390 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-build Already up to date. Merged PRs: - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' Repository: ome/omero-blitz Excluded PRs: - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) Already up to date. Merged PRs: - PR 119 dominikl 'Take Ice and omero sysenv variables into account' - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 132 jburel 'Fix javadoc warning' - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' Repository: ome/omero-common Excluded PRs: - PR 40 jburel 'set classifier' (exclude comment) - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) Already up to date. Merged PRs: - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 42 jburel 'include all' - PR 43 sbesson 'Mark omero.security.ignore_case as production property' Repository: ome/omero-gateway-java Excluded PRs: - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) - PR 30 jburel 'Import image' (exclude comment) Already up to date. Merged PRs: - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' Repository: ome/omero-model Already up to date. Merged PRs: - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' Repository: ome/omero-renderer Excluded PRs: - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) Already up to date. Merged PRs: - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' Repository: ome/omero-romio Excluded PRs: - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) Already up to date. Merged PRs: - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' Repository: ome/omero-server Excluded PRs: - PR 166 kkoz 'Experimenter group cache' (stage: draft) - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) Already up to date. Merged PRs: - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 152 jburel 'Set class in doc' - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' - PR 177 chris-allan 'Swap default min and background thread limits' Conflicting PRs (not included): - PR 61 joshmoore 'Pass user executor to rendering tasks' Generated by OMERO-build-push#46 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/46/)' 2024-04-27 00:25:40,402 [ scc.git] DEBUG [detached HEAD d3634ea] merge master -Dorg -Ssuccess-only 2024-04-27 00:25:40,402 [ scc.merge] INFO Repository: ome/omero-build 2024-04-27 00:25:40,403 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-27 00:25:40,403 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,403 [ scc.merge] INFO 2024-04-27 00:25:40,403 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-27 00:25:40,403 [ scc.merge] INFO 2024-04-27 00:25:40,403 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-27 00:25:40,403 [ scc.merge] INFO Excluded PRs: 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-27 00:25:40,403 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,403 [ scc.merge] INFO 2024-04-27 00:25:40,403 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-27 00:25:40,403 [ scc.merge] INFO 2024-04-27 00:25:40,403 [ scc.merge] INFO Repository: ome/omero-common 2024-04-27 00:25:40,403 [ scc.merge] INFO Excluded PRs: 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-27 00:25:40,403 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-27 00:25:40,404 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-27 00:25:40,404 [ scc.merge] INFO Excluded PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-27 00:25:40,404 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Repository: ome/omero-model 2024-04-27 00:25:40,404 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-27 00:25:40,404 [ scc.merge] INFO Excluded PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-27 00:25:40,404 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,404 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-27 00:25:40,404 [ scc.merge] INFO Excluded PRs: 2024-04-27 00:25:40,404 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-27 00:25:40,404 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,404 [ scc.merge] INFO 2024-04-27 00:25:40,405 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,405 [ scc.merge] INFO 2024-04-27 00:25:40,405 [ scc.merge] INFO Repository: ome/omero-server 2024-04-27 00:25:40,405 [ scc.merge] INFO Excluded PRs: 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-27 00:25:40,405 [ scc.merge] INFO Already up to date. 2024-04-27 00:25:40,405 [ scc.merge] INFO 2024-04-27 00:25:40,405 [ scc.merge] INFO Merged PRs: 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-27 00:25:40,405 [ scc.merge] INFO 2024-04-27 00:25:40,405 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-27 00:25:40,405 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-27 00:25:40,405 [ scc.merge] INFO 2024-04-27 00:25:40,405 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-27 00:25:40,405 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,412 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-27 00:25:40,412 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,418 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:40,419 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-27 00:25:40,419 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:40,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-27 00:25:40,424 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,430 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:40,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-27 00:25:40,431 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,437 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:40,438 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-27 00:25:40,438 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:40,444 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-27 00:25:40,444 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-27 00:25:40,452 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-27 00:25:40,452 [ scc.git] DEBUG Calling 'git remote' 2024-04-27 00:25:40,457 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push Update component versions Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT Updating omero-server from 5.6.10 to 5.6.11-SNAPSHOT Updating omero-model from 5.6.13 to 5.6.14-SNAPSHOT Updating omero-blitz from 5.7.2 to 5.7.3-SNAPSHOT Updating formats-gpl from 7.3.0 to 8.0.0-SNAPSHOT Updating omero-romio from 5.7.5 to 5.7.6-SNAPSHOT Updating omero-common from 5.6.4 to 5.6.5-SNAPSHOT Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT Updating omero-renderer from 5.5.15 to 5.5.16-SNAPSHOT Commit all component version changes Entering 'omero-blitz' Entering 'omero-common' Entering 'omero-gateway-java' Entering 'omero-model' Entering 'omero-renderer' Entering 'omero-romio' Entering 'omero-server' Entering 'omero-blitz' [detached HEAD d34c5ae3] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD 1be20f8] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD 1652a5c] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD 64fa801] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD bcca954] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD e386587] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD 07a7b75c] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD bf6bb88] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-27 00:26:21,159 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-build/tree/merge_ci [Pipeline] archiveArtifacts Archiving artifacts [Pipeline] } [Pipeline] // node [Pipeline] End of Pipeline Finished: SUCCESS