Started by upstream project "Trigger" build number 51 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 44 [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-25 00:24:12,960 [ scc.config] DEBUG Found github.token 2024-04-25 00:24:12,963 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-25 00:24:13,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:13,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:14,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-25 00:24:14,038 [ scc.gh] DEBUG 4998 remaining from 5000 (Reset at 01:04 2024-04-25 00:24:14,038 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:14,042 [ scc.git] DEBUG Check current status 2024-04-25 00:24:14,043 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:14,048 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-25 00:24:14,048 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:14,099 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-25 00:24:14,114 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-25 00:24:14,118 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-25 00:24:14,122 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-25 00:24:14,127 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-25 00:24:14,130 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-25 00:24:14,147 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-25 00:24:14,155 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:14,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-25 00:24:14,988 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:15,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:15,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:16,296 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:16,298 [ scc.git] DEBUG Resetting... 2024-04-25 00:24:16,298 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-25 00:24:16,306 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-25 00:24:16,306 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-25 00:24:16,365 [ scc.git] DEBUG Check current status 2024-04-25 00:24:16,366 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:16,370 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-25 00:24:16,370 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:16,413 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-25 00:24:16,417 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-25 00:24:16,422 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-25 00:24:16,426 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-25 00:24:16,431 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-25 00:24:16,434 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-25 00:24:16,438 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-25 00:24:16,439 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-25 00:24:16,439 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-25 00:24:16,439 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-25 00:24:16,439 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-25 00:24:16,439 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-25 00:24:16,439 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:24:16,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-25 00:24:17,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-25 00:24:17,267 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:24:17,267 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-25 00:24:17,267 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:24:17,268 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:17,268 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:17,273 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:24:17,278 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:24:17,278 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:24:17,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:24:17,288 [ scc.git] DEBUG Already up to date. 2024-04-25 00:24:17,288 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-25 00:24:17,708 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-25 00:24:17,709 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-25 00:24:17,718 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:24:17,718 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:17,719 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:17,725 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-25 00:24:17,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:17,760 [ 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-25 00:24:17,789 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:24:17,792 [ scc.git] DEBUG omero-server | 2 +- 2024-04-25 00:24:17,792 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:24:17,942 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:17,943 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:24:18,102 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-25 00:24:18,102 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:18,103 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:18,107 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:24:18,340 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fbdf754efd0> has no local changes 2024-04-25 00:24:18,341 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:24:18,382 [ scc.git] DEBUG [detached HEAD 81482a9] merge master -Dorg -Snone 2024-04-25 00:24:18,383 [ scc.merge] INFO Repository: ome/omero-build 2024-04-25 00:24:18,383 [ scc.merge] INFO Already up to date. 2024-04-25 00:24:18,383 [ scc.merge] INFO 2024-04-25 00:24:18,383 [ scc.merge] INFO Merged PRs: 2024-04-25 00:24:18,383 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-25 00:24:18,383 [ scc.merge] INFO 2024-04-25 00:24:18,383 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-25 00:24:18,383 [ 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-25 00:24:21,951 [ scc.config] DEBUG Found github.token 2024-04-25 00:24:21,956 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-25 00:24:22,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:22,628 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:23,039 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-25 00:24:23,040 [ scc.gh] DEBUG 4988 remaining from 5000 (Reset at 01:04 2024-04-25 00:24:23,041 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:23,047 [ scc.git] DEBUG Check current status 2024-04-25 00:24:23,047 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:23,051 [ scc.git] DEBUG 81482a9 merge master -Dorg -Snone 2024-04-25 00:24:23,052 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:23,116 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-25 00:24:23,120 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-25 00:24:23,124 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-25 00:24:23,129 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-25 00:24:23,136 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-25 00:24:23,142 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-25 00:24:23,150 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-25 00:24:23,156 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:23,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-25 00:24:24,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:24,478 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:24,893 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:25,304 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:25,306 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:25,391 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-25 00:24:25,392 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:25,400 [ scc.git] DEBUG Check current status 2024-04-25 00:24:25,401 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:25,409 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-25 00:24:25,410 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:25,474 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:25,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-25 00:24:26,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:26,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:27,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:27,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:27,500 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:27,551 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:27,552 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-25 00:24:27,552 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:27,558 [ scc.git] DEBUG Check current status 2024-04-25 00:24:27,558 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:27,577 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-25 00:24:27,578 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:27,637 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:28,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-25 00:24:28,460 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:28,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:29,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:29,810 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:29,812 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:29,856 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:29,857 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-25 00:24:29,857 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:29,862 [ scc.git] DEBUG Check current status 2024-04-25 00:24:29,862 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:29,866 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-25 00:24:29,867 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:29,912 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:30,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-25 00:24:30,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:31,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:31,629 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:32,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:32,055 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:32,093 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:32,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-25 00:24:32,094 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:32,098 [ scc.git] DEBUG Check current status 2024-04-25 00:24:32,098 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:32,104 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-25 00:24:32,104 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:32,150 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:32,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-25 00:24:32,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:33,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:33,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:34,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:34,252 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:34,313 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:34,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-25 00:24:34,315 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:34,321 [ scc.git] DEBUG Check current status 2024-04-25 00:24:34,322 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:34,329 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-25 00:24:34,329 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:34,404 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:34,757 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-25 00:24:35,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:35,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:36,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:36,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:36,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:36,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:36,512 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-25 00:24:36,512 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:36,519 [ scc.git] DEBUG Check current status 2024-04-25 00:24:36,519 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:36,537 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-25 00:24:36,537 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:36,598 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:36,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-25 00:24:37,357 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:37,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:38,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:38,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:38,610 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:38,659 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:38,660 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-25 00:24:38,660 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-25 00:24:38,666 [ scc.git] DEBUG Check current status 2024-04-25 00:24:38,666 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:38,672 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-25 00:24:38,672 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:38,729 [ scc.config] DEBUG Found remote.origin.url 2024-04-25 00:24:39,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-25 00:24:39,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-25 00:24:39,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-25 00:24:40,418 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-25 00:24:40,833 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-25 00:24:40,835 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:24:40,878 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:24:40,879 [ scc.git] DEBUG Resetting... 2024-04-25 00:24:40,879 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-25 00:24:40,887 [ scc.git] DEBUG HEAD is now at 81482a9 merge master -Dorg -Snone 2024-04-25 00:24:40,887 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-25 00:24:40,949 [ scc.git] DEBUG Check current status 2024-04-25 00:24:40,950 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-25 00:24:40,955 [ scc.git] DEBUG 81482a9 merge master -Dorg -Snone 2024-04-25 00:24:40,956 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-25 00:24:41,000 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-25 00:24:41,002 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-25 00:24:41,005 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-25 00:24:41,008 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-25 00:24:41,011 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-25 00:24:41,014 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-25 00:24:41,017 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-25 00:24:41,018 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-25 00:24:41,019 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-25 00:24:41,019 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-25 00:24:41,019 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-25 00:24:41,019 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-25 00:24:41,019 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-25 00:24:41,019 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:24:41,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-25 00:24:41,786 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-25 00:24:41,788 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-25 00:24:42,321 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-25 00:24:42,759 [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-25 00:24:43,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-25 00:24:43,760 [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-25 00:24:43,761 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-25 00:24:43,762 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:24:43,762 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:43,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:43,767 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:24:43,771 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:24:43,771 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:24:43,776 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:24:43,782 [ scc.git] DEBUG Already up to date. 2024-04-25 00:24:43,782 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-25 00:24:44,182 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-25 00:24:44,182 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-25 00:24:44,188 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:24:44,188 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:44,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:44,193 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-25 00:24:44,199 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:44,204 [ 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-25 00:24:44,210 [ scc.git] DEBUG Already up to date. 2024-04-25 00:24:44,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:44,372 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:24:44,417 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:44,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:44,423 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:24:44,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-25 00:24:45,390 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-25 00:24:45,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None 2024-04-25 00:24:46,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-25 00:24:46,850 [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-25 00:24:47,354 [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-25 00:24:47,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-25 00:24:48,214 [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-25 00:24:48,215 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-25 00:24:48,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-25 00:24:49,141 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-25 00:24:49,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-25 00:24:50,060 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-25 00:24:50,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-25 00:24:51,084 [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-25 00:24:51,568 [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-25 00:24:52,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-25 00:24:52,494 [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-25 00:24:52,494 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-25 00:24:52,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-25 00:24:53,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-25 00:24:53,961 [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-25 00:24:54,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-25 00:24:54,832 [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-25 00:24:54,832 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:24:55,306 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-25 00:24:55,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-25 00:24:56,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-25 00:24:56,687 [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-25 00:24:57,169 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-25 00:24:57,592 [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-25 00:24:57,593 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-25 00:24:57,593 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:24:57,593 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-25 00:24:57,594 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:57,594 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:57,601 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:24:57,606 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:24:57,607 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:24:57,613 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:24:57,621 [ scc.git] DEBUG Already up to date. 2024-04-25 00:24:57,622 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-25 00:24:58,046 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-25 00:24:58,046 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-25 00:24:58,053 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-25 00:24:58,438 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-25 00:24:58,438 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-25 00:24:58,443 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-25 00:24:58,891 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-25 00:24:58,891 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-25 00:24:58,898 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-25 00:24:59,464 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-25 00:24:59,464 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-25 00:24:59,470 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:24:59,470 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:24:59,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:59,476 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-25 00:24:59,482 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:59,487 [ 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-25 00:24:59,526 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-25 00:24:59,527 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:24:59,530 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-25 00:24:59,531 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-25 00:24:59,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:24:59,694 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-25 00:24:59,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:24:59,706 [ 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-25 00:24:59,728 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:24:59,730 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:24:59,733 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:24:59,733 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:00,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:00,101 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-25 00:25:00,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:00,113 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-25 00:25:00,175 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:00,178 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-25 00:25:00,178 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:00,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:00,505 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-25 00:25:00,512 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:00,516 [ 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-25 00:25:00,539 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:00,542 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-25 00:25:00,542 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-25 00:25:00,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:00,924 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:00,963 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:00,963 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:00,967 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:01,004 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:01,014 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352f8ebbe0> has no local changes 2024-04-25 00:25:01,014 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:01,026 [ scc.git] DEBUG [detached HEAD 2fa2a560] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:01,026 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:01,026 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:25:01,521 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-25 00:25:01,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-25 00:25:02,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-25 00:25:02,969 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-25 00:25:03,410 [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-25 00:25:03,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-25 00:25:04,283 [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-25 00:25:04,284 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-25 00:25:04,749 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-25 00:25:05,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-25 00:25:05,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-25 00:25:06,155 [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-25 00:25:06,616 [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-25 00:25:07,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-25 00:25:07,551 [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-25 00:25:07,552 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-25 00:25:08,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-25 00:25:08,502 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-25 00:25:08,968 [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-25 00:25:09,465 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-25 00:25:09,879 [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-25 00:25:09,880 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:25:09,880 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:25:09,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-25 00:25:09,881 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:09,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:09,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:25:09,897 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:25:09,898 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:25:09,906 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:25:09,913 [ scc.git] DEBUG Already up to date. 2024-04-25 00:25:09,914 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-25 00:25:10,312 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-25 00:25:10,312 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-25 00:25:10,319 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-25 00:25:10,716 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-25 00:25:10,716 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-25 00:25:10,721 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-25 00:25:11,130 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-25 00:25:11,130 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-25 00:25:11,137 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:25:11,137 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:11,137 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:11,146 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-25 00:25:11,156 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:11,164 [ 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-25 00:25:11,192 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:11,193 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:11,197 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:11,197 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:11,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:11,361 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-25 00:25:11,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:11,371 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-25 00:25:11,385 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:11,388 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-25 00:25:11,388 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-25 00:25:11,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:11,765 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-25 00:25:11,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:11,784 [ 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-25 00:25:11,828 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:11,833 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-25 00:25:11,833 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-25 00:25:12,171 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:12,173 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:12,232 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:12,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:12,239 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:12,288 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:12,295 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352e844640> has no local changes 2024-04-25 00:25:12,296 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:12,307 [ scc.git] DEBUG [detached HEAD 8cb1185] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:12,307 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:12,308 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:25:12,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-25 00:25:13,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-25 00:25:13,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-25 00:25:14,134 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-25 00:25:14,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-25 00:25:15,097 [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-25 00:25:15,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-25 00:25:16,023 [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-25 00:25:16,023 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:25:16,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-25 00:25:16,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-25 00:25:16,993 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:25:16,993 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-25 00:25:16,993 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:16,993 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:16,999 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:25:17,008 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:25:17,009 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:25:17,017 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:25:17,025 [ scc.git] DEBUG Already up to date. 2024-04-25 00:25:17,026 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-25 00:25:17,449 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-25 00:25:17,450 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-25 00:25:17,456 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:25:17,456 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:17,456 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:17,463 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-25 00:25:17,470 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:17,475 [ 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-25 00:25:17,564 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:17,565 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:17,568 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:17,568 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:17,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:17,728 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:17,781 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:17,782 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:17,788 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:17,844 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:17,855 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352d7d2af0> has no local changes 2024-04-25 00:25:17,855 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:17,869 [ scc.git] DEBUG [detached HEAD 2b57033] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:17,870 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:17,870 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:25:18,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-25 00:25:18,781 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None 2024-04-25 00:25:19,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-25 00:25:19,771 [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-25 00:25:20,267 [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-25 00:25:20,708 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-25 00:25:21,135 [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-25 00:25:21,136 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-25 00:25:21,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-25 00:25:22,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-25 00:25:22,563 [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-25 00:25:23,036 [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-25 00:25:23,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-25 00:25:23,965 [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-25 00:25:23,966 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-25 00:25:24,430 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-25 00:25:25,862 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-25 00:25:26,355 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-25 00:25:26,804 [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-25 00:25:27,333 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-25 00:25:27,742 [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-25 00:25:27,742 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:25:27,742 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:25:27,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-25 00:25:27,743 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:27,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:27,748 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:25:27,753 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:25:27,754 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:25:27,760 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:25:27,766 [ scc.git] DEBUG Already up to date. 2024-04-25 00:25:27,766 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-25 00:25:28,186 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-25 00:25:28,187 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-25 00:25:28,193 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-25 00:25:28,621 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-25 00:25:28,622 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-25 00:25:28,629 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-04-25 00:25:29,046 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-25 00:25:29,046 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-04-25 00:25:29,052 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:25:29,052 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:29,052 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:29,058 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-25 00:25:29,065 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:29,071 [ 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-25 00:25:29,111 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:29,112 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:29,116 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:29,116 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:29,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:29,264 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-25 00:25:29,278 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:29,285 [ 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-25 00:25:29,333 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:29,337 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-25 00:25:29,337 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-25 00:25:29,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:29,680 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-25 00:25:29,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:29,693 [ 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-25 00:25:29,750 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:29,752 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:29,755 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:29,755 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:30,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:30,099 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:30,142 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:30,142 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:30,147 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:30,186 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:30,193 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352f8886a0> has no local changes 2024-04-25 00:25:30,193 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:30,202 [ scc.git] DEBUG [detached HEAD e10dd42] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:30,202 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:30,203 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:25:30,662 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-25 00:25:31,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-25 00:25:31,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-25 00:25:32,125 [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-25 00:25:32,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-25 00:25:33,069 [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-25 00:25:33,070 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:25:33,537 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-25 00:25:34,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-25 00:25:34,025 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-25 00:25:34,025 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:25:34,025 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-25 00:25:34,025 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:34,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:34,032 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:25:34,036 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:25:34,036 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:25:34,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:25:34,045 [ scc.git] DEBUG Already up to date. 2024-04-25 00:25:34,045 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-25 00:25:34,422 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-25 00:25:34,422 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-25 00:25:34,427 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:25:34,427 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:34,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:34,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-25 00:25:34,436 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:34,440 [ 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-25 00:25:34,457 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:34,458 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:34,460 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:34,461 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:34,623 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:34,624 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:34,675 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:34,676 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:34,681 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:34,725 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:34,732 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352e828b80> has no local changes 2024-04-25 00:25:34,732 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:34,741 [ scc.git] DEBUG [detached HEAD 2971102] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:34,741 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:34,742 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:25:35,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-25 00:25:35,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-25 00:25:36,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-25 00:25:36,607 [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-25 00:25:37,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-25 00:25:37,513 [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-25 00:25:37,514 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:25:37,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-25 00:25:38,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-25 00:25:38,466 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:25:38,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-25 00:25:38,467 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:38,467 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:38,473 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:25:38,480 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:25:38,481 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:25:38,488 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:25:38,495 [ scc.git] DEBUG Already up to date. 2024-04-25 00:25:38,496 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-25 00:25:38,932 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-25 00:25:38,932 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-25 00:25:38,942 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:25:38,942 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:38,942 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:38,947 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-25 00:25:38,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:38,955 [ 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-25 00:25:38,984 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:38,985 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:38,989 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:38,989 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:39,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:39,153 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:39,200 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:39,201 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:39,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:39,252 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:39,260 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352e8289d0> has no local changes 2024-04-25 00:25:39,260 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:39,270 [ scc.git] DEBUG [detached HEAD 958b709] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:39,271 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:39,271 [ scc.repo] DEBUG ## PRs found: 2024-04-25 00:25:39,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-25 00:25:40,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-25 00:25:40,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-25 00:25:41,315 [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-25 00:25:41,786 [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-25 00:25:42,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-25 00:25:42,650 [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-25 00:25:42,651 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-25 00:25:43,120 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-25 00:25:43,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-25 00:25:44,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-25 00:25:44,655 [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-25 00:25:45,129 [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-25 00:25:45,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-25 00:25:46,041 [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-25 00:25:46,042 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-25 00:25:46,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-25 00:25:46,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-25 00:25:47,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-25 00:25:47,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-25 00:25:48,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-25 00:25:48,828 [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-25 00:25:49,349 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-25 00:25:49,759 [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-25 00:25:49,759 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-25 00:25:50,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-25 00:25:50,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-25 00:25:51,174 [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-25 00:25:51,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-25 00:25:52,079 [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-25 00:25:52,080 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:25:52,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-25 00:25:53,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-25 00:25:53,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-25 00:25:54,002 [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-25 00:25:54,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-25 00:25:54,964 [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-25 00:25:54,964 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-25 00:25:54,965 [ scc.repo] DEBUG ## Branches found: 2024-04-25 00:25:54,965 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-25 00:25:54,965 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:54,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:54,972 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-25 00:25:54,978 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-25 00:25:54,978 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-25 00:25:54,985 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-25 00:25:54,994 [ scc.git] DEBUG Already up to date. 2024-04-25 00:25:54,995 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-25 00:25:55,452 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-25 00:25:55,452 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-25 00:25:55,458 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-25 00:25:55,868 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-25 00:25:55,869 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-25 00:25:55,877 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-25 00:25:56,288 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-25 00:25:56,288 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-25 00:25:56,294 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-25 00:25:56,740 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-25 00:25:56,740 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-25 00:25:56,746 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-25 00:25:57,163 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-25 00:25:57,163 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-25 00:25:57,169 [ scc.git] DEBUG ## Unique users: [] 2024-04-25 00:25:57,169 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:57,169 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:57,175 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-25 00:25:57,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:57,190 [ 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-25 00:25:57,282 [ 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-25 00:25:57,283 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:57,283 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-25 00:25:57,283 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-25 00:25:57,284 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-25 00:25:57,296 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-25 00:25:57,308 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-25 00:25:57,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:57,477 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-25 00:25:57,486 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-25 00:25:57,493 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#44](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/consoleText) for more details. Possible conflicts: - Upstream changes - .travis.yml - build.gradle --conflicts 2024-04-25 00:25:57,497 [ scc.config] DEBUG Found github.token 2024-04-25 00:25:57,498 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-25 00:25:57,498 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-25 00:25:57,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:57,514 [ 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-25 00:25:57,547 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:57,550 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:57,554 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:57,554 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:57,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:57,889 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-25 00:25:57,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:57,900 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-25 00:25:57,945 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:57,949 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-25 00:25:57,949 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:58,303 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:58,305 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-25 00:25:58,312 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:58,319 [ 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-25 00:25:58,371 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-25 00:25:58,373 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:58,376 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-25 00:25:58,376 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-25 00:25:58,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:58,723 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-25 00:25:58,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:58,737 [ 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-25 00:25:58,774 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-25 00:25:58,777 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-25 00:25:58,777 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-25 00:25:59,127 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:59,129 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-25 00:25:59,175 [ scc.git] DEBUG Get sha1 of %s 2024-04-25 00:25:59,175 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-25 00:25:59,180 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:59,223 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:25:59,233 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f352e839fd0> has no local changes 2024-04-25 00:25:59,233 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:25:59,244 [ scc.git] DEBUG [detached HEAD 5be3f037] merge master -Dorg -Ssuccess-only 2024-04-25 00:25:59,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:25:59,245 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-25 00:25:59,300 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-25 00:25:59,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:59,560 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-25 00:25:59,566 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-25 00:25:59,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:25:59,978 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-25 00:25:59,984 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-25 00:26:00,378 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:26:00,392 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-25 00:26:00,397 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-25 00:26:00,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:26:00,800 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-25 00:26:00,805 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-25 00:26:01,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:26:01,216 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-25 00:26:01,221 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-25 00:26:01,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:26:01,629 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-25 00:26:01,634 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-25 00:26:02,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-25 00:26:02,041 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-25 00:26:02,041 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-25 00:26:02,088 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f3531c9b490> has local changes 2024-04-25 00:26:02,088 [ 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#44 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/44/)' 2024-04-25 00:26:02,116 [ scc.git] DEBUG [detached HEAD 52599e1] merge master -Dorg -Ssuccess-only 2024-04-25 00:26:02,117 [ scc.merge] INFO Repository: ome/omero-build 2024-04-25 00:26:02,117 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-25 00:26:02,117 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,117 [ scc.merge] INFO 2024-04-25 00:26:02,117 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,117 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-25 00:26:02,117 [ scc.merge] INFO 2024-04-25 00:26:02,118 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-25 00:26:02,118 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:26:02,118 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-25 00:26:02,118 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,118 [ scc.merge] INFO 2024-04-25 00:26:02,118 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,118 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-25 00:26:02,118 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,118 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-25 00:26:02,118 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-25 00:26:02,118 [ scc.merge] INFO 2024-04-25 00:26:02,119 [ scc.merge] INFO Repository: ome/omero-common 2024-04-25 00:26:02,119 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:26:02,119 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-25 00:26:02,119 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-25 00:26:02,119 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,119 [ scc.merge] INFO 2024-04-25 00:26:02,119 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,119 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,119 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-25 00:26:02,119 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-25 00:26:02,119 [ scc.merge] INFO 2024-04-25 00:26:02,120 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-25 00:26:02,120 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:26:02,120 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-25 00:26:02,120 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-25 00:26:02,120 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,120 [ scc.merge] INFO 2024-04-25 00:26:02,120 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,120 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,120 [ scc.merge] INFO 2024-04-25 00:26:02,120 [ scc.merge] INFO Repository: ome/omero-model 2024-04-25 00:26:02,120 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,121 [ scc.merge] INFO 2024-04-25 00:26:02,121 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,121 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,121 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-25 00:26:02,121 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-25 00:26:02,121 [ scc.merge] INFO 2024-04-25 00:26:02,121 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-25 00:26:02,121 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:26:02,121 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-25 00:26:02,121 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,121 [ scc.merge] INFO 2024-04-25 00:26:02,122 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,122 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,122 [ scc.merge] INFO 2024-04-25 00:26:02,122 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-25 00:26:02,122 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:26:02,122 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-25 00:26:02,122 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,122 [ scc.merge] INFO 2024-04-25 00:26:02,122 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,122 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,122 [ scc.merge] INFO 2024-04-25 00:26:02,123 [ scc.merge] INFO Repository: ome/omero-server 2024-04-25 00:26:02,123 [ scc.merge] INFO Excluded PRs: 2024-04-25 00:26:02,123 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-25 00:26:02,123 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-25 00:26:02,123 [ scc.merge] INFO Already up to date. 2024-04-25 00:26:02,123 [ scc.merge] INFO 2024-04-25 00:26:02,123 [ scc.merge] INFO Merged PRs: 2024-04-25 00:26:02,123 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-25 00:26:02,123 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-25 00:26:02,123 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-25 00:26:02,123 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-25 00:26:02,124 [ scc.merge] INFO 2024-04-25 00:26:02,124 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-25 00:26:02,124 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-25 00:26:02,124 [ scc.merge] INFO 2024-04-25 00:26:02,124 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-25 00:26:02,124 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,132 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-25 00:26:02,132 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,138 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:26:02,139 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-25 00:26:02,139 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:26:02,147 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-25 00:26:02,147 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:26:02,155 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-25 00:26:02,155 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,164 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:26:02,165 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-25 00:26:02,165 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,174 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:26:02,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-25 00:26:02,175 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-25 00:26:02,185 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-25 00:26:02,185 [ scc.git] DEBUG Calling 'git remote' 2024-04-25 00:26:02,194 [ 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 b0dfc36d] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD 5e7db2c] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD 0796527] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD e55023e] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD a8786fa] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD f7987c4] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD 87d18ca8] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD 36ea746] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-25 00:26:39,059 [ 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