![[Jenkins]](/jenkins/static/d0200910/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 52 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 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-gradle-plugins-push" build number 45 [Pipeline] sh > 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 > git submodule update --init --recursive omero-gateway-java # timeout=10 + pushd build ~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push + tar -zxf - + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + popd ~/workspace/OMERO-build-push + python3 -m venv build/venv + . 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-26 00:24:31,236 [ scc.config] DEBUG Found github.token 2024-04-26 00:24:31,239 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-26 00:24:31,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:24:31,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:24:32,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-26 00:24:32,285 [ scc.gh] DEBUG 4534 remaining from 5000 (Reset at 00:04 2024-04-26 00:24:32,286 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:32,291 [ scc.git] DEBUG Check current status 2024-04-26 00:24:32,291 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:32,295 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-26 00:24:32,295 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:32,353 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-26 00:24:32,365 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-26 00:24:32,369 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-26 00:24:32,384 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-26 00:24:32,389 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-26 00:24:32,394 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-26 00:24:32,437 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-26 00:24:32,444 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:32,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-26 00:24:33,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:33,675 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:34,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:34,544 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:34,546 [ scc.git] DEBUG Resetting... 2024-04-26 00:24:34,546 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-26 00:24:34,558 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-26 00:24:34,559 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-26 00:24:34,641 [ scc.git] DEBUG Check current status 2024-04-26 00:24:34,642 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:34,647 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-26 00:24:34,647 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:34,696 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-26 00:24:34,699 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-26 00:24:34,703 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-26 00:24:34,707 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-26 00:24:34,710 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-26 00:24:34,714 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-26 00:24:34,718 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-26 00:24:34,719 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-26 00:24:34,719 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-26 00:24:34,719 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-26 00:24:34,719 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-26 00:24:34,720 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-26 00:24:34,720 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:24:35,073 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-26 00:24:35,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-26 00:24:35,542 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-26 00:24:35,542 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-26 00:24:35,542 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:24:35,542 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:24:35,542 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:24:35,549 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:24:35,556 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:24:35,556 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:24:35,562 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:24:35,570 [ scc.git] DEBUG Already up to date. 2024-04-26 00:24:35,571 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-26 00:24:35,952 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-26 00:24:35,952 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-26 00:24:35,959 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:24:35,960 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:24:35,960 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:24:35,967 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-26 00:24:36,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:24:36,044 [ 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-26 00:24:36,060 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:24:36,063 [ scc.git] DEBUG omero-server | 2 +- 2024-04-26 00:24:36,063 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:24:36,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:24:36,231 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:24:36,376 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-26 00:24:36,377 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:24:36,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:24:36,384 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:24:36,652 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f2cb505d490> has no local changes 2024-04-26 00:24:36,652 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:24:36,685 [ scc.git] DEBUG [detached HEAD f291491] merge master -Dorg -Snone 2024-04-26 00:24:36,685 [ scc.merge] INFO Repository: ome/omero-build 2024-04-26 00:24:36,685 [ scc.merge] INFO Already up to date. 2024-04-26 00:24:36,686 [ scc.merge] INFO 2024-04-26 00:24:36,686 [ scc.merge] INFO Merged PRs: 2024-04-26 00:24:36,686 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-26 00:24:36,686 [ scc.merge] INFO 2024-04-26 00:24:36,686 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-26 00:24:36,686 [ 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-26 00:24:40,260 [ scc.config] DEBUG Found github.token 2024-04-26 00:24:40,266 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-26 00:24:40,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:24:40,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:24:41,310 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-26 00:24:41,312 [ scc.gh] DEBUG 4524 remaining from 5000 (Reset at 00:04 2024-04-26 00:24:41,313 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:41,320 [ scc.git] DEBUG Check current status 2024-04-26 00:24:41,320 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:41,326 [ scc.git] DEBUG f291491 merge master -Dorg -Snone 2024-04-26 00:24:41,326 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:41,375 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-26 00:24:41,378 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-26 00:24:41,382 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-26 00:24:41,386 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-26 00:24:41,389 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-26 00:24:41,392 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-26 00:24:41,395 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-26 00:24:41,402 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:41,791 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-26 00:24:42,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:42,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:43,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:43,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:43,520 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:43,619 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-26 00:24:43,619 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:43,625 [ scc.git] DEBUG Check current status 2024-04-26 00:24:43,625 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:43,633 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-26 00:24:43,633 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:43,696 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:44,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-26 00:24:44,452 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:44,864 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:45,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:45,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:45,699 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:45,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:45,756 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-26 00:24:45,756 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:45,763 [ scc.git] DEBUG Check current status 2024-04-26 00:24:45,763 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:45,783 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-26 00:24:45,783 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:45,849 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:46,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-26 00:24:46,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:47,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:47,444 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:47,848 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:47,850 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:47,909 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:47,911 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-26 00:24:47,911 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:47,918 [ scc.git] DEBUG Check current status 2024-04-26 00:24:47,918 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:47,926 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-26 00:24:47,927 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:48,002 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:48,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-26 00:24:48,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:49,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:49,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:50,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:50,068 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:50,115 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:50,116 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-26 00:24:50,117 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:50,122 [ scc.git] DEBUG Check current status 2024-04-26 00:24:50,122 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:50,141 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-26 00:24:50,141 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:50,189 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:50,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-26 00:24:51,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:51,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:51,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:52,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:52,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:52,322 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:52,324 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-26 00:24:52,324 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:52,329 [ scc.git] DEBUG Check current status 2024-04-26 00:24:52,329 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:52,335 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-26 00:24:52,335 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:52,380 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:52,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-26 00:24:53,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:53,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:54,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:54,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:54,484 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:54,559 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:54,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-26 00:24:54,560 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:54,566 [ scc.git] DEBUG Check current status 2024-04-26 00:24:54,566 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:54,583 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-26 00:24:54,583 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:54,638 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:54,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-26 00:24:55,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:55,826 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:57,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:57,670 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:57,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:57,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:57,729 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-26 00:24:57,729 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-26 00:24:57,735 [ scc.git] DEBUG Check current status 2024-04-26 00:24:57,736 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:24:57,756 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-26 00:24:57,756 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:24:57,810 [ scc.config] DEBUG Found remote.origin.url 2024-04-26 00:24:58,131 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-26 00:24:58,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-26 00:24:59,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-26 00:24:59,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-26 00:24:59,901 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-26 00:24:59,903 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:24:59,956 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:24:59,956 [ scc.git] DEBUG Resetting... 2024-04-26 00:24:59,956 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-26 00:24:59,964 [ scc.git] DEBUG HEAD is now at f291491 merge master -Dorg -Snone 2024-04-26 00:24:59,965 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-26 00:25:00,062 [ scc.git] DEBUG Check current status 2024-04-26 00:25:00,062 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-26 00:25:00,068 [ scc.git] DEBUG f291491 merge master -Dorg -Snone 2024-04-26 00:25:00,069 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-26 00:25:00,123 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-26 00:25:00,127 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-26 00:25:00,131 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-26 00:25:00,134 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-26 00:25:00,137 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-26 00:25:00,140 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-26 00:25:00,144 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-26 00:25:00,145 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-26 00:25:00,145 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-26 00:25:00,145 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-26 00:25:00,145 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-26 00:25:00,145 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-26 00:25:00,145 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-26 00:25:00,145 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:00,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-26 00:25:00,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-26 00:25:00,862 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-26 00:25:01,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-26 00:25:01,900 [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-26 00:25:02,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-26 00:25:02,855 [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-26 00:25:02,856 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-26 00:25:02,856 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:02,856 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:02,856 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:02,861 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:02,865 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:02,865 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:02,870 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:02,875 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:02,875 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-26 00:25:03,254 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-26 00:25:03,254 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-26 00:25:03,262 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:03,262 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:03,262 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:03,266 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-26 00:25:03,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:03,278 [ 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-26 00:25:03,283 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:03,447 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:03,448 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:03,498 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:03,498 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:03,504 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:04,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-26 00:25:04,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-26 00:25:04,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None 2024-04-26 00:25:05,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-26 00:25:06,006 [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-26 00:25:06,466 [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-26 00:25:06,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-26 00:25:07,403 [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-26 00:25:07,404 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-26 00:25:07,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-26 00:25:08,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-26 00:25:08,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-26 00:25:09,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-26 00:25:09,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-26 00:25:10,237 [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-26 00:25:10,724 [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-26 00:25:11,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-26 00:25:11,576 [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-26 00:25:11,577 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-26 00:25:12,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-26 00:25:12,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-26 00:25:12,969 [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-26 00:25:13,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-26 00:25:13,813 [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-26 00:25:13,814 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:25:14,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-26 00:25:14,723 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-26 00:25:15,208 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-26 00:25:15,642 [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-26 00:25:16,142 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-26 00:25:16,553 [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-26 00:25:16,553 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-26 00:25:16,554 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:16,554 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-26 00:25:16,554 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:16,554 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:16,559 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:16,562 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:16,563 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:16,568 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:16,574 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:16,574 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-26 00:25:17,026 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-26 00:25:17,026 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-26 00:25:17,032 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-26 00:25:17,472 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-26 00:25:17,473 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-26 00:25:17,478 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-26 00:25:17,943 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-26 00:25:17,944 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-26 00:25:17,950 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-26 00:25:18,449 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-26 00:25:18,450 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-26 00:25:18,458 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:18,459 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:18,459 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:18,468 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-26 00:25:18,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:18,486 [ 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-26 00:25:18,530 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-26 00:25:18,531 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:18,535 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-26 00:25:18,535 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-26 00:25:18,693 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:18,695 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-26 00:25:18,708 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:18,715 [ 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-26 00:25:18,745 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:18,748 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:18,753 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:18,753 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:19,096 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:19,097 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-26 00:25:19,106 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:19,112 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-26 00:25:19,206 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:19,211 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-26 00:25:19,211 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:19,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:19,504 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-26 00:25:19,513 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:19,517 [ 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-26 00:25:19,565 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:19,569 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-26 00:25:19,569 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-26 00:25:19,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:19,906 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:19,981 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:19,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:19,989 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:25:20,039 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:25:20,050 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678995fbe0> has no local changes 2024-04-26 00:25:20,051 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:25:20,063 [ scc.git] DEBUG [detached HEAD 7094c8bd] merge master -Dorg -Ssuccess-only 2024-04-26 00:25:20,063 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:25:20,064 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:20,458 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-26 00:25:20,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-26 00:25:21,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-26 00:25:21,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-26 00:25:22,315 [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-26 00:25:22,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-26 00:25:23,240 [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-26 00:25:23,241 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-26 00:25:23,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-26 00:25:24,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-26 00:25:24,619 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-26 00:25:25,128 [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-26 00:25:25,584 [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-26 00:25:26,077 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-26 00:25:26,497 [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-26 00:25:26,498 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-26 00:25:26,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-26 00:25:27,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-26 00:25:27,923 [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-26 00:25:28,411 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-26 00:25:28,821 [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-26 00:25:28,822 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:25:28,822 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:28,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-26 00:25:28,822 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:28,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:28,828 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:28,832 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:28,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:28,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:28,841 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:28,841 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-26 00:25:29,256 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-26 00:25:29,256 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-26 00:25:29,262 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-26 00:25:29,667 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-26 00:25:29,667 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-26 00:25:29,672 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-26 00:25:30,079 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-26 00:25:30,079 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-26 00:25:30,085 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:30,085 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:30,085 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:30,091 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-26 00:25:30,096 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:30,100 [ 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-26 00:25:30,117 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:30,117 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:30,120 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:30,120 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:30,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:30,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-26 00:25:30,285 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:30,289 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-26 00:25:30,316 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:30,318 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-26 00:25:30,318 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-26 00:25:30,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:30,697 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-26 00:25:30,703 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:30,709 [ 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-26 00:25:30,747 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:30,750 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-26 00:25:30,750 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-26 00:25:31,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:31,101 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:31,148 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:31,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:31,152 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:25:31,201 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:25:31,211 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67888b8640> has no local changes 2024-04-26 00:25:31,212 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:25:31,225 [ scc.git] DEBUG [detached HEAD 5fee9ca] merge master -Dorg -Ssuccess-only 2024-04-26 00:25:31,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:25:31,226 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:31,642 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-26 00:25:32,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-26 00:25:32,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-26 00:25:33,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-26 00:25:33,549 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-26 00:25:34,064 [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-26 00:25:34,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-26 00:25:35,002 [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-26 00:25:35,003 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:25:35,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-26 00:25:35,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-26 00:25:35,946 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:35,947 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-26 00:25:35,947 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:35,947 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:35,956 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:35,964 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:35,964 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:35,976 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:35,987 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:35,988 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-26 00:25:36,413 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-26 00:25:36,413 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-26 00:25:36,422 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:36,422 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:36,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:36,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-26 00:25:36,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:36,445 [ 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-26 00:25:36,506 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:36,507 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:36,510 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:36,510 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:36,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:36,661 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:36,721 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:36,722 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:36,728 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:25:36,774 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:25:36,782 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6788047af0> has no local changes 2024-04-26 00:25:36,783 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:25:36,793 [ scc.git] DEBUG [detached HEAD 955763d] merge master -Dorg -Ssuccess-only 2024-04-26 00:25:36,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:25:36,793 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:37,184 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-26 00:25:37,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None 2024-04-26 00:25:38,153 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-26 00:25:38,617 [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-26 00:25:39,094 [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-26 00:25:39,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-26 00:25:40,001 [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-26 00:25:40,002 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-26 00:25:40,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-26 00:25:40,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-26 00:25:41,423 [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-26 00:25:41,913 [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-26 00:25:42,369 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-26 00:25:42,786 [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-26 00:25:42,787 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-26 00:25:43,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-26 00:25:43,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-26 00:25:44,174 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-26 00:25:44,629 [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-26 00:25:45,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-26 00:25:45,465 [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-26 00:25:45,466 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:25:45,466 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:45,466 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-26 00:25:45,466 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:45,466 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:45,473 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:45,477 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:45,477 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:45,483 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:45,488 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:45,488 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-26 00:25:45,877 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-26 00:25:45,877 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-26 00:25:45,884 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-26 00:25:46,271 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-26 00:25:46,271 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-26 00:25:46,278 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-04-26 00:25:46,721 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-26 00:25:46,721 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-04-26 00:25:46,727 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:46,727 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:46,727 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:46,732 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-26 00:25:46,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:46,742 [ 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-26 00:25:46,762 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:46,763 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:46,768 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:46,768 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:46,921 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:46,923 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-26 00:25:46,950 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:46,957 [ 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-26 00:25:46,990 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:46,994 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-26 00:25:46,994 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-26 00:25:47,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:47,358 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-26 00:25:47,366 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:47,373 [ 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-26 00:25:47,690 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:47,691 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:47,695 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:47,695 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:47,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:47,861 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:47,911 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:47,911 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:47,916 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:25:47,954 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:25:47,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67898fc6a0> has no local changes 2024-04-26 00:25:47,962 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:25:47,970 [ scc.git] DEBUG [detached HEAD 2234b4e] merge master -Dorg -Ssuccess-only 2024-04-26 00:25:47,970 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:25:47,971 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:48,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-26 00:25:48,869 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-26 00:25:49,412 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-26 00:25:49,867 [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-26 00:25:50,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-26 00:25:50,809 [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-26 00:25:50,810 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:25:51,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-26 00:25:51,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-26 00:25:51,750 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-26 00:25:51,750 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:51,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-26 00:25:51,750 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:51,751 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:51,758 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:51,765 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:51,765 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:51,773 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:51,782 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:51,782 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-26 00:25:52,166 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-26 00:25:52,167 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-26 00:25:52,173 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:52,173 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:52,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:52,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-26 00:25:52,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:52,195 [ 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-26 00:25:52,264 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:52,265 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:52,269 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:52,269 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:52,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:52,428 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:52,469 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:52,469 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:52,474 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:25:52,519 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:25:52,530 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f6788890b80> has no local changes 2024-04-26 00:25:52,530 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:25:52,543 [ scc.git] DEBUG [detached HEAD f896996] merge master -Dorg -Ssuccess-only 2024-04-26 00:25:52,544 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:25:52,544 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:52,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-26 00:25:53,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-26 00:25:53,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-26 00:25:54,346 [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-26 00:25:54,770 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-26 00:25:55,195 [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-26 00:25:55,196 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:25:55,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-26 00:25:56,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-26 00:25:56,111 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:25:56,112 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-26 00:25:56,112 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:56,112 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:56,120 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:25:56,126 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:25:56,126 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:25:56,132 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:25:56,139 [ scc.git] DEBUG Already up to date. 2024-04-26 00:25:56,139 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-26 00:25:56,552 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-26 00:25:56,553 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-26 00:25:56,560 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:25:56,560 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:56,560 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:56,571 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-26 00:25:56,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:56,589 [ 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-26 00:25:56,625 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:25:56,626 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:25:56,630 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:25:56,633 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:25:56,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:25:56,786 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:25:56,843 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:25:56,843 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:25:56,848 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:25:56,890 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:25:56,896 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67888909d0> has no local changes 2024-04-26 00:25:56,896 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:25:56,903 [ scc.git] DEBUG [detached HEAD 4151837] merge master -Dorg -Ssuccess-only 2024-04-26 00:25:56,903 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:25:56,904 [ scc.repo] DEBUG ## PRs found: 2024-04-26 00:25:57,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-26 00:25:57,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-26 00:25:58,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-26 00:25:58,901 [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-26 00:25:59,383 [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-26 00:25:59,909 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-26 00:26:00,334 [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-26 00:26:00,337 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-26 00:26:00,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-26 00:26:01,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-26 00:26:01,751 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-26 00:26:02,241 [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-26 00:26:02,713 [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-26 00:26:03,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-26 00:26:03,561 [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-26 00:26:03,562 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-26 00:26:04,002 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-26 00:26:04,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-26 00:26:04,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-26 00:26:05,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-26 00:26:05,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-26 00:26:06,298 [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-26 00:26:06,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-26 00:26:07,201 [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-26 00:26:07,201 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-26 00:26:07,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-26 00:26:08,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-26 00:26:08,640 [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-26 00:26:09,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-26 00:26:09,509 [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-26 00:26:09,510 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:09,965 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-26 00:26:10,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-26 00:26:10,908 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-26 00:26:11,359 [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-26 00:26:11,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-26 00:26:12,221 [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-26 00:26:12,222 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-26 00:26:12,222 [ scc.repo] DEBUG ## Branches found: 2024-04-26 00:26:12,222 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-26 00:26:12,223 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:26:12,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:12,229 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-26 00:26:12,235 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-26 00:26:12,235 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-26 00:26:12,241 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-26 00:26:12,247 [ scc.git] DEBUG Already up to date. 2024-04-26 00:26:12,247 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-26 00:26:12,707 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-26 00:26:12,707 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-26 00:26:12,714 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-26 00:26:13,135 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-26 00:26:13,135 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-26 00:26:13,141 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-26 00:26:13,536 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-26 00:26:13,537 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-26 00:26:13,547 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-26 00:26:13,972 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-26 00:26:13,972 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-26 00:26:13,978 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-26 00:26:14,361 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-26 00:26:14,362 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-26 00:26:14,367 [ scc.git] DEBUG ## Unique users: [] 2024-04-26 00:26:14,367 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:26:14,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:14,377 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-26 00:26:14,390 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:14,400 [ 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-26 00:26:14,553 [ 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-26 00:26:14,553 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:26:14,553 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-26 00:26:14,554 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-26 00:26:14,555 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-26 00:26:14,563 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-26 00:26:14,573 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-26 00:26:14,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:14,731 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-26 00:26:14,741 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-26 00:26:14,756 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#45](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/consoleText) for more details. Possible conflicts: - Upstream changes - build.gradle - .travis.yml --conflicts 2024-04-26 00:26:14,761 [ scc.config] DEBUG Found github.token 2024-04-26 00:26:14,761 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-26 00:26:14,761 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-26 00:26:14,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:14,771 [ 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-26 00:26:14,797 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:26:14,799 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:26:14,802 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:26:14,802 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:26:15,144 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:15,145 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-26 00:26:15,153 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:15,161 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-26 00:26:15,245 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:26:15,248 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-26 00:26:15,248 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:26:15,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:15,557 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-26 00:26:15,566 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:15,571 [ 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-26 00:26:15,635 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-26 00:26:15,637 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:26:15,641 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-26 00:26:15,641 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-26 00:26:15,962 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:15,964 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-26 00:26:15,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:15,980 [ 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-26 00:26:16,020 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-26 00:26:16,023 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-26 00:26:16,023 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-26 00:26:16,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:16,368 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-26 00:26:16,444 [ scc.git] DEBUG Get sha1 of %s 2024-04-26 00:26:16,445 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-26 00:26:16,450 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:26:16,489 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:26:16,500 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f67888adfd0> has no local changes 2024-04-26 00:26:16,501 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:26:16,514 [ scc.git] DEBUG [detached HEAD 935a5800] merge master -Dorg -Ssuccess-only 2024-04-26 00:26:16,515 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:16,515 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-26 00:26:16,572 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-26 00:26:16,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:16,777 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-26 00:26:16,781 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-26 00:26:17,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:17,186 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-26 00:26:17,190 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-26 00:26:17,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:17,636 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-26 00:26:17,669 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-26 00:26:18,007 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:18,019 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-26 00:26:18,023 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-26 00:26:18,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:18,427 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-26 00:26:18,431 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-26 00:26:18,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:18,835 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-26 00:26:18,840 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-26 00:26:19,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-26 00:26:19,246 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-26 00:26:19,246 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-26 00:26:19,324 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f678bd10490> has local changes 2024-04-26 00:26:19,325 [ 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#45 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/45/)' 2024-04-26 00:26:19,351 [ scc.git] DEBUG [detached HEAD 4254f30] merge master -Dorg -Ssuccess-only 2024-04-26 00:26:19,351 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-26 00:26:19,352 [ scc.merge] INFO Repository: ome/omero-build 2024-04-26 00:26:19,352 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,352 [ scc.merge] INFO 2024-04-26 00:26:19,352 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,352 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-26 00:26:19,352 [ scc.merge] INFO 2024-04-26 00:26:19,352 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-26 00:26:19,352 [ scc.merge] INFO Excluded PRs: 2024-04-26 00:26:19,352 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-26 00:26:19,352 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,352 [ scc.merge] INFO 2024-04-26 00:26:19,352 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,352 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-26 00:26:19,352 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-26 00:26:19,353 [ scc.merge] INFO 2024-04-26 00:26:19,353 [ scc.merge] INFO Repository: ome/omero-common 2024-04-26 00:26:19,353 [ scc.merge] INFO Excluded PRs: 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-26 00:26:19,353 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,353 [ scc.merge] INFO 2024-04-26 00:26:19,353 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-26 00:26:19,353 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-26 00:26:19,353 [ scc.merge] INFO 2024-04-26 00:26:19,353 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-26 00:26:19,354 [ scc.merge] INFO Excluded PRs: 2024-04-26 00:26:19,354 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-26 00:26:19,354 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-26 00:26:19,354 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,354 [ scc.merge] INFO 2024-04-26 00:26:19,354 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,354 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,354 [ scc.merge] INFO 2024-04-26 00:26:19,354 [ scc.merge] INFO Repository: ome/omero-model 2024-04-26 00:26:19,354 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,354 [ scc.merge] INFO 2024-04-26 00:26:19,354 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,354 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,354 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-26 00:26:19,354 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-26 00:26:19,354 [ scc.merge] INFO 2024-04-26 00:26:19,355 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-26 00:26:19,355 [ scc.merge] INFO Excluded PRs: 2024-04-26 00:26:19,355 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-26 00:26:19,355 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,355 [ scc.merge] INFO 2024-04-26 00:26:19,355 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,355 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,355 [ scc.merge] INFO 2024-04-26 00:26:19,355 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-26 00:26:19,355 [ scc.merge] INFO Excluded PRs: 2024-04-26 00:26:19,355 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-26 00:26:19,355 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,355 [ scc.merge] INFO 2024-04-26 00:26:19,355 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,355 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,356 [ scc.merge] INFO 2024-04-26 00:26:19,356 [ scc.merge] INFO Repository: ome/omero-server 2024-04-26 00:26:19,356 [ scc.merge] INFO Excluded PRs: 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-26 00:26:19,356 [ scc.merge] INFO Already up to date. 2024-04-26 00:26:19,356 [ scc.merge] INFO 2024-04-26 00:26:19,356 [ scc.merge] INFO Merged PRs: 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-26 00:26:19,356 [ scc.merge] INFO 2024-04-26 00:26:19,356 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-26 00:26:19,356 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-26 00:26:19,357 [ scc.merge] INFO 2024-04-26 00:26:19,357 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-26 00:26:19,357 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,366 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-26 00:26:19,366 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:19,374 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-26 00:26:19,374 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,381 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:19,382 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-26 00:26:19,382 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,389 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:19,390 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-26 00:26:19,390 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:19,397 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-26 00:26:19,397 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:19,402 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-26 00:26:19,402 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-26 00:26:19,408 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-26 00:26:19,408 [ scc.git] DEBUG Calling 'git remote' 2024-04-26 00:26:19,414 [ 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 36e1162f] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD efe13f1] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD cde51a2] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD 5bbc814] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD 07019cd] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD b41a9f9] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD eba29986] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD 18b6074] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-26 00:26:55,878 [ 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