![[Jenkins]](/jenkins/static/4be69ed6/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 49 originally caused by: Started by user devspace [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 42 [Pipeline] sh + pushd build ~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - > 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 + 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-23 05:11:10,230 [ scc.config] DEBUG Found github.token 2024-04-23 05:11:10,236 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-23 05:11:10,477 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:10,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:11,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-23 05:11:11,332 [ scc.gh] DEBUG 4858 remaining from 5000 (Reset at 05:04 2024-04-23 05:11:11,333 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:11,338 [ scc.git] DEBUG Check current status 2024-04-23 05:11:11,338 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:11,343 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-23 05:11:11,344 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:11,394 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-23 05:11:11,413 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-23 05:11:11,416 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-23 05:11:11,420 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-23 05:11:11,424 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-23 05:11:11,428 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-23 05:11:11,457 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-23 05:11:11,462 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:11,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-23 05:11:12,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:12,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:13,130 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:13,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:13,566 [ scc.git] DEBUG Resetting... 2024-04-23 05:11:13,566 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-23 05:11:13,573 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-23 05:11:13,573 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-23 05:11:13,632 [ scc.git] DEBUG Check current status 2024-04-23 05:11:13,632 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:13,637 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-23 05:11:13,637 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:13,679 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-23 05:11:13,681 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-23 05:11:13,684 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-23 05:11:13,687 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-23 05:11:13,690 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-23 05:11:13,692 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-23 05:11:13,695 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-23 05:11:13,696 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-23 05:11:13,696 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-23 05:11:13,696 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-23 05:11:13,696 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-23 05:11:13,696 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-23 05:11:13,696 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:11:14,066 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-23 05:11:14,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-23 05:11:14,528 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-23 05:11:14,528 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-23 05:11:14,528 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:11:14,529 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:14,529 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:14,533 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:11:14,536 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:11:14,536 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:11:14,539 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:11:14,543 [ scc.git] DEBUG Already up to date. 2024-04-23 05:11:14,543 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-23 05:11:14,937 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-23 05:11:14,937 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-23 05:11:14,945 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:11:14,945 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:14,945 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:14,949 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-23 05:11:14,984 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:14,989 [ 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-23 05:11:15,023 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:11:15,026 [ scc.git] DEBUG omero-server | 2 +- 2024-04-23 05:11:15,026 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:11:15,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:15,194 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:11:15,333 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-23 05:11:15,334 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:15,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:15,339 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:11:15,648 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0c58519550> has no local changes 2024-04-23 05:11:15,648 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:11:15,686 [ scc.git] DEBUG [detached HEAD b1fab40] merge master -Dorg -Snone 2024-04-23 05:11:15,686 [ scc.merge] INFO Repository: ome/omero-build 2024-04-23 05:11:15,686 [ scc.merge] INFO Already up to date. 2024-04-23 05:11:15,686 [ scc.merge] INFO 2024-04-23 05:11:15,686 [ scc.merge] INFO Merged PRs: 2024-04-23 05:11:15,687 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-23 05:11:15,687 [ scc.merge] INFO 2024-04-23 05:11:15,687 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-23 05:11:15,687 [ 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-23 05:11:19,079 [ scc.config] DEBUG Found github.token 2024-04-23 05:11:19,083 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-23 05:11:19,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:19,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:20,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-23 05:11:20,105 [ scc.gh] DEBUG 4848 remaining from 5000 (Reset at 05:04 2024-04-23 05:11:20,106 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:20,111 [ scc.git] DEBUG Check current status 2024-04-23 05:11:20,111 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:20,118 [ scc.git] DEBUG b1fab40 merge master -Dorg -Snone 2024-04-23 05:11:20,118 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:20,170 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-23 05:11:20,174 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-23 05:11:20,178 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-23 05:11:20,183 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-23 05:11:20,186 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-23 05:11:20,190 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-23 05:11:20,193 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-23 05:11:20,199 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:20,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-23 05:11:21,023 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:21,440 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:21,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:22,277 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:22,279 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:22,342 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-23 05:11:22,343 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:22,347 [ scc.git] DEBUG Check current status 2024-04-23 05:11:22,347 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:22,369 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-23 05:11:22,370 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:22,424 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:22,759 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-23 05:11:23,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:23,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:24,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:24,459 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:24,461 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:24,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:24,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-23 05:11:24,507 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:24,512 [ scc.git] DEBUG Check current status 2024-04-23 05:11:24,512 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:24,532 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-23 05:11:24,533 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:24,575 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:24,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-23 05:11:25,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:25,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:26,252 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:26,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:26,673 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:26,716 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:26,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-23 05:11:26,718 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:26,723 [ scc.git] DEBUG Check current status 2024-04-23 05:11:26,723 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:26,729 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-23 05:11:26,730 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:26,786 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:27,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-23 05:11:27,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:28,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:28,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:28,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:28,856 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:28,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:28,902 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-23 05:11:28,902 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:28,906 [ scc.git] DEBUG Check current status 2024-04-23 05:11:28,906 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:28,914 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-23 05:11:28,915 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:28,963 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:29,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-23 05:11:29,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:30,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:30,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:31,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:31,043 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:31,090 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:31,091 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-23 05:11:31,091 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:31,096 [ scc.git] DEBUG Check current status 2024-04-23 05:11:31,096 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:31,114 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-23 05:11:31,114 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:31,174 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:31,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-23 05:11:32,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:32,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:32,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:33,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:33,289 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:33,336 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:33,337 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-23 05:11:33,337 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:33,343 [ scc.git] DEBUG Check current status 2024-04-23 05:11:33,343 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:33,366 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-23 05:11:33,366 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:33,429 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:33,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-23 05:11:34,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:34,655 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:35,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:35,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:35,503 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:35,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:35,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-23 05:11:35,570 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-23 05:11:35,576 [ scc.git] DEBUG Check current status 2024-04-23 05:11:35,576 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:35,589 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-23 05:11:35,589 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:35,652 [ scc.config] DEBUG Found remote.origin.url 2024-04-23 05:11:35,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-23 05:11:36,457 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-23 05:11:36,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-23 05:11:37,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-23 05:11:37,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-23 05:11:37,686 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:37,728 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:37,729 [ scc.git] DEBUG Resetting... 2024-04-23 05:11:37,729 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-23 05:11:37,736 [ scc.git] DEBUG HEAD is now at b1fab40 merge master -Dorg -Snone 2024-04-23 05:11:37,736 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-23 05:11:37,797 [ scc.git] DEBUG Check current status 2024-04-23 05:11:37,798 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-23 05:11:37,804 [ scc.git] DEBUG b1fab40 merge master -Dorg -Snone 2024-04-23 05:11:37,804 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-23 05:11:37,853 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-23 05:11:37,857 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-23 05:11:37,861 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-23 05:11:37,864 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-23 05:11:37,867 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-23 05:11:37,870 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-23 05:11:37,874 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-23 05:11:37,875 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-23 05:11:37,875 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-23 05:11:37,875 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-23 05:11:37,875 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-23 05:11:37,875 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-23 05:11:37,875 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-23 05:11:37,875 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:11:38,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-23 05:11:38,660 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-23 05:11:38,662 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-23 05:11:39,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-23 05:11:39,659 [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-23 05:11:40,192 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-23 05:11:40,601 [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-23 05:11:40,602 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-23 05:11:40,602 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:11:40,603 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:40,603 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:40,609 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:11:40,614 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:11:40,614 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:11:40,620 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:11:40,627 [ scc.git] DEBUG Already up to date. 2024-04-23 05:11:40,627 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-23 05:11:41,005 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-23 05:11:41,005 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-23 05:11:41,013 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:11:41,014 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:41,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:41,020 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-23 05:11:41,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:41,034 [ 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-23 05:11:41,041 [ scc.git] DEBUG Already up to date. 2024-04-23 05:11:41,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:41,207 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:11:41,278 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:41,279 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:41,286 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:11:41,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-23 05:11:42,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-23 05:11:42,722 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None 2024-04-23 05:11:43,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-23 05:11:43,692 [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-23 05:11:44,179 [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-23 05:11:44,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-23 05:11:45,053 [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-23 05:11:45,054 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-23 05:11:45,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-23 05:11:45,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-23 05:11:46,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-23 05:11:46,897 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-23 05:11:47,425 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-23 05:11:47,892 [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-23 05:11:48,338 [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-23 05:11:48,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-23 05:11:49,271 [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-23 05:11:49,272 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-23 05:11:49,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-23 05:11:50,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-23 05:11:50,698 [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-23 05:11:51,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-23 05:11:51,596 [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-23 05:11:51,597 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:11:52,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-23 05:11:52,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-23 05:11:53,011 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-23 05:11:53,446 [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-23 05:11:53,889 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-23 05:11:54,313 [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-23 05:11:54,314 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-23 05:11:54,314 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:11:54,314 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-23 05:11:54,314 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:54,314 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:54,351 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:11:54,356 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:11:54,356 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:11:54,362 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:11:54,367 [ scc.git] DEBUG Already up to date. 2024-04-23 05:11:54,367 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-23 05:11:54,829 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-23 05:11:54,829 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-23 05:11:54,835 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-23 05:11:55,217 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-23 05:11:55,218 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-23 05:11:55,223 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-23 05:11:55,667 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-23 05:11:55,668 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-23 05:11:55,673 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-23 05:11:56,138 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-23 05:11:56,138 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-23 05:11:56,143 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:11:56,143 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:56,143 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:56,150 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-23 05:11:56,155 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:56,159 [ 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-23 05:11:56,190 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-23 05:11:56,191 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:11:56,194 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-23 05:11:56,194 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-23 05:11:56,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:56,354 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-23 05:11:56,361 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:56,366 [ 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-23 05:11:56,383 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:11:56,385 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:11:56,391 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:11:56,391 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:11:56,768 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:56,770 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-23 05:11:56,777 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:56,782 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-23 05:11:56,855 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:11:56,858 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-23 05:11:56,858 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:11:57,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:57,181 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-23 05:11:57,192 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:57,200 [ 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-23 05:11:57,245 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:11:57,250 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-23 05:11:57,250 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-23 05:11:57,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:11:57,596 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:11:57,641 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:11:57,641 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:11:57,647 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:11:57,691 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:11:57,703 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc572bb1310> has no local changes 2024-04-23 05:11:57,704 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:11:57,719 [ scc.git] DEBUG [detached HEAD 153322fc] merge master -Dorg -Ssuccess-only 2024-04-23 05:11:57,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:11:57,720 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:11:58,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-23 05:11:58,652 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-23 05:11:59,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-23 05:11:59,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-23 05:12:00,059 [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-23 05:12:00,563 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-23 05:12:00,978 [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-23 05:12:00,979 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-23 05:12:01,433 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-23 05:12:01,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-23 05:12:02,428 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-23 05:12:02,895 [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-23 05:12:03,398 [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-23 05:12:03,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-23 05:12:04,305 [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-23 05:12:04,306 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-23 05:12:04,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-23 05:12:05,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-23 05:12:05,743 [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-23 05:12:06,236 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-23 05:12:06,657 [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-23 05:12:06,657 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:06,658 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:12:06,658 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-23 05:12:06,658 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:06,658 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:06,666 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:12:06,672 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:12:06,672 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:12:06,679 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:12:06,686 [ scc.git] DEBUG Already up to date. 2024-04-23 05:12:06,687 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-23 05:12:07,114 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-23 05:12:07,114 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-23 05:12:07,119 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-23 05:12:07,519 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-23 05:12:07,520 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-23 05:12:07,532 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-23 05:12:07,975 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-23 05:12:07,975 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-23 05:12:07,981 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:12:07,982 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:07,982 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:07,987 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-23 05:12:07,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:08,002 [ 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-23 05:12:08,032 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:08,046 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:08,050 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:08,050 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:08,205 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:08,207 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-23 05:12:08,214 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:08,219 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-23 05:12:08,243 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:08,246 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-23 05:12:08,247 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-23 05:12:08,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:08,622 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-23 05:12:08,630 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:08,637 [ 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-23 05:12:08,671 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:08,675 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-23 05:12:08,675 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-23 05:12:09,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:09,035 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:12:09,081 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:09,082 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:09,087 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:09,131 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:09,140 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc571b0a640> has no local changes 2024-04-23 05:12:09,140 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:09,151 [ scc.git] DEBUG [detached HEAD b112aa8] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:09,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:09,152 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:12:09,567 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-23 05:12:10,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-23 05:12:10,467 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-23 05:12:10,928 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-23 05:12:11,421 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-23 05:12:11,895 [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-23 05:12:12,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-23 05:12:12,804 [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-23 05:12:12,804 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:13,246 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-23 05:12:13,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-23 05:12:13,732 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:12:13,733 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-23 05:12:13,733 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:13,733 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:13,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:12:13,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:12:13,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:12:13,757 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:12:13,765 [ scc.git] DEBUG Already up to date. 2024-04-23 05:12:13,766 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-23 05:12:14,176 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-23 05:12:14,176 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-23 05:12:14,187 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:12:14,188 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:14,188 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:14,199 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-23 05:12:14,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:14,224 [ 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-23 05:12:14,279 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:14,280 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:14,284 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:14,285 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:14,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:14,439 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:12:14,530 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:14,530 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:14,538 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:14,608 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:14,620 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc570a98af0> has no local changes 2024-04-23 05:12:14,621 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:14,635 [ scc.git] DEBUG [detached HEAD 698056f] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:14,636 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:14,636 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:12:15,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-23 05:12:15,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None 2024-04-23 05:12:16,046 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-23 05:12:16,521 [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-23 05:12:16,997 [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-23 05:12:17,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-23 05:12:17,901 [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-23 05:12:17,902 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-23 05:12:18,365 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-23 05:12:18,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-23 05:12:19,394 [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-23 05:12:19,927 [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-23 05:12:20,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-23 05:12:20,800 [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-23 05:12:20,802 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-23 05:12:21,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-23 05:12:21,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-23 05:12:22,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-23 05:12:22,665 [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-23 05:12:23,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-23 05:12:23,598 [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-23 05:12:23,600 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:23,600 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:12:23,600 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-23 05:12:23,600 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:23,600 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:23,617 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:12:23,632 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:12:23,633 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:12:23,654 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:12:23,666 [ scc.git] DEBUG Already up to date. 2024-04-23 05:12:23,666 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-23 05:12:24,093 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-23 05:12:24,093 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-23 05:12:24,101 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-23 05:12:24,481 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-23 05:12:24,482 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-23 05:12:24,490 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-04-23 05:12:24,870 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-23 05:12:24,871 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-04-23 05:12:24,878 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:12:24,878 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:24,878 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:24,885 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-23 05:12:24,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:24,899 [ 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-23 05:12:24,933 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:24,934 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:24,939 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:24,939 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:25,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:25,107 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-23 05:12:25,126 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:25,136 [ 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-23 05:12:25,164 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:25,169 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-23 05:12:25,169 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-23 05:12:25,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:25,516 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-23 05:12:25,527 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:25,535 [ 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-23 05:12:25,697 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:25,700 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:25,704 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:25,705 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:25,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:25,926 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:12:25,970 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:25,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:25,976 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:26,022 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:26,032 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc572b4e6a0> has no local changes 2024-04-23 05:12:26,032 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:26,043 [ scc.git] DEBUG [detached HEAD a57fb6d] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:26,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:26,044 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:12:26,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-23 05:12:26,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-23 05:12:27,472 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-23 05:12:27,937 [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-23 05:12:28,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-23 05:12:28,802 [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-23 05:12:28,803 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:29,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-23 05:12:29,732 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-23 05:12:29,735 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-23 05:12:29,735 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:12:29,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-23 05:12:29,735 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:29,735 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:29,741 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:12:29,748 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:12:29,748 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:12:29,754 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:12:29,760 [ scc.git] DEBUG Already up to date. 2024-04-23 05:12:29,760 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-23 05:12:30,153 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-23 05:12:30,153 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-23 05:12:30,160 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:12:30,160 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:30,160 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:30,166 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-23 05:12:30,173 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:30,179 [ 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-23 05:12:30,204 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:30,206 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:30,209 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:30,209 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:30,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:30,367 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:12:30,412 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:30,412 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:30,418 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:30,459 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:30,467 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc571aeeb80> has no local changes 2024-04-23 05:12:30,467 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:30,477 [ scc.git] DEBUG [detached HEAD e4ea062] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:30,477 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:30,477 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:12:30,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-23 05:12:31,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-23 05:12:31,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-23 05:12:32,339 [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-23 05:12:32,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-23 05:12:33,271 [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-23 05:12:33,272 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:33,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-23 05:12:34,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-23 05:12:34,217 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:12:34,217 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-23 05:12:34,217 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:34,217 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:34,224 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:12:34,232 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:12:34,233 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:12:34,240 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:12:34,247 [ scc.git] DEBUG Already up to date. 2024-04-23 05:12:34,247 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-23 05:12:34,681 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-23 05:12:34,681 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-23 05:12:34,687 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:12:34,687 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:34,687 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:34,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-23 05:12:34,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:34,704 [ 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-23 05:12:34,713 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:34,713 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:34,716 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:34,716 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:34,872 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:34,873 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:12:34,912 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:34,912 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:34,917 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:34,954 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:34,959 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc571aee9d0> has no local changes 2024-04-23 05:12:34,960 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:34,967 [ scc.git] DEBUG [detached HEAD 894a108] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:34,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:34,968 [ scc.repo] DEBUG ## PRs found: 2024-04-23 05:12:35,529 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-23 05:12:35,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-23 05:12:36,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-23 05:12:36,942 [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-23 05:12:37,414 [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-23 05:12:37,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-23 05:12:38,315 [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-23 05:12:38,315 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-23 05:12:38,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-23 05:12:39,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-23 05:12:39,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-23 05:12:40,187 [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-23 05:12:40,664 [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-23 05:12:41,103 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-23 05:12:41,511 [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-23 05:12:41,512 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-23 05:12:42,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-23 05:12:42,468 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-23 05:12:42,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-23 05:12:43,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-23 05:12:43,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-23 05:12:44,359 [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-23 05:12:44,843 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-23 05:12:45,352 [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-23 05:12:45,353 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-23 05:12:45,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-23 05:12:46,290 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-23 05:12:46,722 [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-23 05:12:47,231 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-23 05:12:47,650 [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-23 05:12:47,651 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:48,099 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-23 05:12:48,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-23 05:12:49,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-23 05:12:49,498 [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-23 05:12:49,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-23 05:12:50,406 [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-23 05:12:50,407 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-23 05:12:50,407 [ scc.repo] DEBUG ## Branches found: 2024-04-23 05:12:50,407 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-23 05:12:50,408 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:50,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:50,413 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-23 05:12:50,418 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-23 05:12:50,418 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-23 05:12:50,424 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-23 05:12:50,429 [ scc.git] DEBUG Already up to date. 2024-04-23 05:12:50,429 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-23 05:12:51,052 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-23 05:12:51,053 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-23 05:12:51,057 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-23 05:12:51,437 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-23 05:12:51,437 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-23 05:12:51,442 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-23 05:12:51,913 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-23 05:12:51,914 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-23 05:12:51,920 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-23 05:12:52,644 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-23 05:12:52,645 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-23 05:12:52,653 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-23 05:12:53,052 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-23 05:12:53,052 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-23 05:12:53,058 [ scc.git] DEBUG ## Unique users: [] 2024-04-23 05:12:53,058 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:53,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:53,065 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-23 05:12:53,072 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:53,077 [ 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-23 05:12:53,164 [ 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-23 05:12:53,164 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:53,164 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-23 05:12:53,165 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-23 05:12:53,165 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-23 05:12:53,173 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-23 05:12:53,184 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-23 05:12:53,341 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:53,342 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-23 05:12:53,350 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-23 05:12:53,356 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#42](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/consoleText) for more details. Possible conflicts: - Upstream changes - build.gradle - .travis.yml --conflicts 2024-04-23 05:12:53,360 [ scc.config] DEBUG Found github.token 2024-04-23 05:12:53,360 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-23 05:12:53,360 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-23 05:12:53,365 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:53,370 [ 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-23 05:12:53,393 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:53,394 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:53,397 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:53,397 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:53,752 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:53,754 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-23 05:12:53,761 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:53,766 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-23 05:12:53,853 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:53,856 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-23 05:12:53,856 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:54,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:54,158 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-23 05:12:54,164 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:54,168 [ 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-23 05:12:54,204 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-23 05:12:54,205 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:54,208 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-23 05:12:54,208 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-23 05:12:54,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:54,569 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-23 05:12:54,576 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:54,580 [ 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-23 05:12:54,620 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-23 05:12:54,624 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-23 05:12:54,624 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-23 05:12:54,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:54,982 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-23 05:12:55,025 [ scc.git] DEBUG Get sha1 of %s 2024-04-23 05:12:55,026 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-23 05:12:55,032 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:55,072 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:55,082 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc571afafd0> has no local changes 2024-04-23 05:12:55,082 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:55,094 [ scc.git] DEBUG [detached HEAD 44f215e4] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:55,094 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:55,094 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-23 05:12:55,154 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-23 05:12:55,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:55,407 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-23 05:12:55,411 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-23 05:12:55,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:55,815 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-23 05:12:55,819 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-23 05:12:56,218 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:56,230 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-23 05:12:56,234 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-23 05:12:56,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:56,641 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-23 05:12:56,645 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-23 05:12:57,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:57,043 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-23 05:12:57,047 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-23 05:12:57,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:57,452 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-23 05:12:57,456 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-23 05:12:57,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-23 05:12:57,857 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-23 05:12:57,857 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-23 05:12:57,901 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc5738b5550> has local changes 2024-04-23 05:12:57,901 [ 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#42 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/42/)' 2024-04-23 05:12:57,912 [ scc.git] DEBUG [detached HEAD 32441b3] merge master -Dorg -Ssuccess-only 2024-04-23 05:12:57,912 [ scc.merge] INFO Repository: ome/omero-build 2024-04-23 05:12:57,912 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-23 05:12:57,912 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,912 [ scc.merge] INFO 2024-04-23 05:12:57,912 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,912 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-23 05:12:57,912 [ scc.merge] INFO 2024-04-23 05:12:57,912 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-23 05:12:57,912 [ scc.merge] INFO Excluded PRs: 2024-04-23 05:12:57,912 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-23 05:12:57,912 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,912 [ scc.merge] INFO 2024-04-23 05:12:57,912 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,912 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-23 05:12:57,912 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,912 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Repository: ome/omero-common 2024-04-23 05:12:57,913 [ scc.merge] INFO Excluded PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-23 05:12:57,913 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-23 05:12:57,913 [ scc.merge] INFO Excluded PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-23 05:12:57,913 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Repository: ome/omero-model 2024-04-23 05:12:57,913 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-23 05:12:57,913 [ scc.merge] INFO Excluded PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-23 05:12:57,913 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,913 [ scc.merge] INFO 2024-04-23 05:12:57,913 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,913 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,914 [ scc.merge] INFO 2024-04-23 05:12:57,914 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-23 05:12:57,914 [ scc.merge] INFO Excluded PRs: 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-23 05:12:57,914 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,914 [ scc.merge] INFO 2024-04-23 05:12:57,914 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,914 [ scc.merge] INFO 2024-04-23 05:12:57,914 [ scc.merge] INFO Repository: ome/omero-server 2024-04-23 05:12:57,914 [ scc.merge] INFO Excluded PRs: 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-23 05:12:57,914 [ scc.merge] INFO Already up to date. 2024-04-23 05:12:57,914 [ scc.merge] INFO 2024-04-23 05:12:57,914 [ scc.merge] INFO Merged PRs: 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-23 05:12:57,914 [ scc.merge] INFO 2024-04-23 05:12:57,914 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-23 05:12:57,914 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-23 05:12:57,914 [ scc.merge] INFO 2024-04-23 05:12:57,914 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-23 05:12:57,914 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,919 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-23 05:12:57,919 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,923 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:57,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-23 05:12:57,924 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:57,928 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-23 05:12:57,928 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:57,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-23 05:12:57,932 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,936 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:57,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-23 05:12:57,937 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:57,941 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-23 05:12:57,942 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-23 05:12:57,946 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-23 05:12:57,946 [ scc.git] DEBUG Calling 'git remote' 2024-04-23 05:12:57,951 [ 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 cf85110d] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD d2493a4] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD df4b18f] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD 47d6ec6] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD 84aef1c] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD b5332c7] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD eb16bb0a] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD ad46dfe] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-23 05:13:33,990 [ 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