![[Jenkins]](/jenkins/static/f6f303f9/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 39 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) Commit message: "Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f" > 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 > git rev-list --no-walk be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-model.url # timeout=10 > git config -f .gitmodules --get submodule.omero-model.path # timeout=10 > git config --get submodule.omero-common.url # timeout=10 > git config -f .gitmodules --get submodule.omero-common.path # timeout=10 > git config --get submodule.omero-romio.url # timeout=10 > git config -f .gitmodules --get submodule.omero-romio.path # timeout=10 > git config --get submodule.omero-renderer.url # timeout=10 > git config -f .gitmodules --get submodule.omero-renderer.path # timeout=10 > git config --get submodule.omero-server.url # timeout=10 > git config -f .gitmodules --get submodule.omero-server.path # timeout=10 > git config --get submodule.omero-blitz.url # timeout=10 > git config -f .gitmodules --get submodule.omero-blitz.path # timeout=10 > git config --get submodule.omero-gateway-java.url # timeout=10 > git config -f .gitmodules --get submodule.omero-gateway-java.path # timeout=10 > git submodule update --init --recursive omero-model # timeout=10 > git submodule update --init --recursive omero-common # timeout=10 > git submodule update --init --recursive omero-romio # timeout=10 > git submodule update --init --recursive omero-renderer # timeout=10 > git submodule update --init --recursive omero-server # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-gradle-plugins-push" build number 35 [Pipeline] sh > git submodule update --init --recursive omero-blitz # timeout=10 > git submodule update --init --recursive omero-gateway-java # timeout=10 + pushd build ~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + 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-15 11:09:21,711 [ scc.config] DEBUG Found github.token 2024-04-15 11:09:21,716 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-15 11:09:21,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:09:22,407 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:09:22,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-15 11:09:22,810 [ scc.gh] DEBUG 4598 remaining from 5000 (Reset at 11:04 2024-04-15 11:09:22,811 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:22,816 [ scc.git] DEBUG Check current status 2024-04-15 11:09:22,816 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:22,820 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-15 11:09:22,820 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:22,885 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-15 11:09:22,889 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-15 11:09:22,894 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-15 11:09:22,898 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-15 11:09:22,902 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-15 11:09:22,905 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-15 11:09:22,934 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-15 11:09:22,942 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:23,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-15 11:09:23,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:24,168 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:24,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:25,057 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:25,059 [ scc.git] DEBUG Resetting... 2024-04-15 11:09:25,059 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-15 11:09:25,068 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-15 11:09:25,069 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-15 11:09:25,144 [ scc.git] DEBUG Check current status 2024-04-15 11:09:25,144 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:25,150 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-15 11:09:25,150 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:25,202 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-15 11:09:25,205 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-15 11:09:25,209 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-15 11:09:25,213 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-15 11:09:25,216 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-15 11:09:25,220 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-15 11:09:25,224 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-15 11:09:25,225 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-15 11:09:25,225 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-15 11:09:25,225 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-15 11:09:25,225 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-15 11:09:25,225 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-15 11:09:25,226 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:09:25,539 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-15 11:09:26,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-15 11:09:26,023 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-15 11:09:26,023 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-15 11:09:26,023 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:09:26,023 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:09:26,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:26,029 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:09:26,033 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:09:26,033 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:09:26,040 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:09:26,045 [ scc.git] DEBUG Already up to date. 2024-04-15 11:09:26,046 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-15 11:09:26,423 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-15 11:09:26,424 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-15 11:09:26,430 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:09:26,430 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:09:26,430 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:26,437 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-15 11:09:26,454 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:26,459 [ 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-15 11:09:26,472 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:09:26,475 [ scc.git] DEBUG omero-server | 2 +- 2024-04-15 11:09:26,475 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:09:26,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:09:26,644 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:09:26,792 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-15 11:09:26,793 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:09:26,793 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:26,799 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:09:26,961 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fcac4ccf550> has no local changes 2024-04-15 11:09:26,962 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:09:27,019 [ scc.merge] INFO Repository: ome/omero-build 2024-04-15 11:09:27,019 [ scc.merge] INFO Already up to date. 2024-04-15 11:09:27,019 [ scc.merge] INFO 2024-04-15 11:09:27,019 [ scc.merge] INFO Merged PRs: 2024-04-15 11:09:27,019 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-15 11:09:27,019 [ scc.merge] INFO 2024-04-15 11:09:27,020 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-15 11:09:27,020 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:09:27,020 [ scc.git] DEBUG [detached HEAD caf6b2d] merge master -Dorg -Snone 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-15 11:09:30,379 [ scc.config] DEBUG Found github.token 2024-04-15 11:09:30,382 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-15 11:09:30,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:09:31,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:09:31,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-15 11:09:31,420 [ scc.gh] DEBUG 4588 remaining from 5000 (Reset at 11:04 2024-04-15 11:09:31,421 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:31,425 [ scc.git] DEBUG Check current status 2024-04-15 11:09:31,425 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:31,429 [ scc.git] DEBUG caf6b2d merge master -Dorg -Snone 2024-04-15 11:09:31,429 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:31,473 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-15 11:09:31,476 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-15 11:09:31,480 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-15 11:09:31,483 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-15 11:09:31,486 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-15 11:09:31,491 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-15 11:09:31,494 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-15 11:09:31,500 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:31,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-15 11:09:32,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:32,796 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:33,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:33,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:33,660 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:33,724 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-15 11:09:33,724 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:33,729 [ scc.git] DEBUG Check current status 2024-04-15 11:09:33,729 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:33,735 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-15 11:09:33,736 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:33,802 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:34,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-15 11:09:34,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:35,162 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:35,571 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:35,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:35,997 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:36,052 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:36,054 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-15 11:09:36,055 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:36,062 [ scc.git] DEBUG Check current status 2024-04-15 11:09:36,062 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:36,070 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-15 11:09:36,071 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:36,128 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:36,471 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-15 11:09:36,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:37,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:37,741 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:38,163 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:38,165 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:38,218 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:38,219 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-15 11:09:38,219 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:38,225 [ scc.git] DEBUG Check current status 2024-04-15 11:09:38,225 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:38,230 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-15 11:09:38,231 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:38,288 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:38,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-15 11:09:39,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:39,498 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:39,912 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:40,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:40,325 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:40,378 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:40,379 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-15 11:09:40,379 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:40,385 [ scc.git] DEBUG Check current status 2024-04-15 11:09:40,385 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:40,390 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-15 11:09:40,391 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:40,449 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:40,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-15 11:09:41,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:41,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:42,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:42,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:42,510 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:42,556 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:42,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-15 11:09:42,558 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:42,564 [ scc.git] DEBUG Check current status 2024-04-15 11:09:42,564 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:42,570 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-15 11:09:42,570 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:42,624 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:42,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-15 11:09:43,423 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:43,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:44,262 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:44,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:44,700 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:44,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:44,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-15 11:09:44,773 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:44,779 [ scc.git] DEBUG Check current status 2024-04-15 11:09:44,779 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:44,784 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-15 11:09:44,785 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:44,849 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:45,195 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-15 11:09:45,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:46,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:46,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:46,950 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:46,952 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:46,991 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:46,992 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-15 11:09:46,992 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-15 11:09:46,997 [ scc.git] DEBUG Check current status 2024-04-15 11:09:46,997 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:47,002 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-15 11:09:47,002 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:47,044 [ scc.config] DEBUG Found remote.origin.url 2024-04-15 11:09:47,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-15 11:09:47,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-15 11:09:48,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-15 11:09:48,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-15 11:09:49,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-15 11:09:49,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:09:49,226 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:09:49,226 [ scc.git] DEBUG Resetting... 2024-04-15 11:09:49,226 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-15 11:09:49,237 [ scc.git] DEBUG HEAD is now at caf6b2d merge master -Dorg -Snone 2024-04-15 11:09:49,238 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-15 11:09:49,339 [ scc.git] DEBUG Check current status 2024-04-15 11:09:49,340 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-15 11:09:49,349 [ scc.git] DEBUG caf6b2d merge master -Dorg -Snone 2024-04-15 11:09:49,349 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-15 11:09:49,419 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-15 11:09:49,423 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-15 11:09:49,427 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-15 11:09:49,432 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-15 11:09:49,436 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-15 11:09:49,440 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-15 11:09:49,444 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-15 11:09:49,445 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-15 11:09:49,446 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-15 11:09:49,446 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-15 11:09:49,446 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-15 11:09:49,446 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-15 11:09:49,446 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-15 11:09:49,446 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:09:49,677 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-15 11:09:50,136 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-15 11:09:50,137 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-15 11:09:50,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-15 11:09:51,121 [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-15 11:09:51,672 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-15 11:09:52,085 [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-15 11:09:52,086 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-15 11:09:52,086 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:09:52,086 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:09:52,086 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:52,092 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:09:52,097 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:09:52,097 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:09:52,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:09:52,108 [ scc.git] DEBUG Already up to date. 2024-04-15 11:09:52,108 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-15 11:09:52,500 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-15 11:09:52,501 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-15 11:09:52,507 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:09:52,507 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:09:52,507 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:52,512 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-15 11:09:52,518 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:52,524 [ 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-15 11:09:52,529 [ scc.git] DEBUG Already up to date. 2024-04-15 11:09:52,684 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:09:52,685 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:09:52,743 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:09:52,743 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:09:52,747 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:09:53,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-15 11:09:53,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-15 11:09:54,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-15 11:09:54,708 [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-15 11:09:55,144 [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-15 11:09:55,664 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-15 11:09:56,097 [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-15 11:09:56,098 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-15 11:09:56,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-15 11:09:57,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-15 11:09:57,545 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-15 11:09:58,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-15 11:09:58,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-15 11:09:58,983 [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-15 11:09:59,479 [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-15 11:10:00,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-15 11:10:00,429 [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-15 11:10:00,430 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-15 11:10:00,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-15 11:10:01,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-15 11:10:01,830 [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-15 11:10:02,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-15 11:10:02,730 [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-15 11:10:02,731 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:03,221 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-15 11:10:03,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-15 11:10:04,196 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-15 11:10:04,665 [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-15 11:10:05,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-15 11:10:05,518 [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-15 11:10:05,519 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-15 11:10:05,519 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:05,519 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-15 11:10:05,519 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:05,519 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:05,524 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:05,528 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:05,529 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:05,533 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:05,539 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:05,539 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-15 11:10:06,000 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-15 11:10:06,000 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-15 11:10:06,011 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-15 11:10:06,419 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-15 11:10:06,420 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-15 11:10:06,424 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-15 11:10:07,061 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-15 11:10:07,062 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-15 11:10:07,068 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-15 11:10:07,539 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-15 11:10:07,540 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-15 11:10:07,546 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:10:07,546 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:07,547 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:07,554 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-15 11:10:07,562 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:07,572 [ 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-15 11:10:07,591 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-15 11:10:07,593 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:07,597 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-15 11:10:07,597 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-15 11:10:07,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:07,749 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-15 11:10:07,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:07,761 [ 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-15 11:10:07,795 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:10:07,797 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:07,800 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:10:07,800 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:08,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:08,173 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-15 11:10:08,183 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:08,190 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-15 11:10:08,236 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:08,239 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-15 11:10:08,239 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:08,581 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:08,582 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-15 11:10:08,588 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:08,593 [ 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-15 11:10:08,771 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:08,774 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-15 11:10:08,774 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-15 11:10:09,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:09,005 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:10:09,051 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:09,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:09,059 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:10:09,118 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:10:09,130 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa001bb1310> has no local changes 2024-04-15 11:10:09,130 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:10:09,143 [ scc.git] DEBUG [detached HEAD 737c1743] merge master -Dorg -Ssuccess-only 2024-04-15 11:10:09,144 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:10:09,144 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:10:09,606 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-15 11:10:10,053 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-15 11:10:10,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-15 11:10:10,980 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-15 11:10:11,422 [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-15 11:10:11,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-15 11:10:12,369 [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-15 11:10:12,370 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-15 11:10:12,832 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-15 11:10:13,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-15 11:10:13,842 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-15 11:10:14,320 [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-15 11:10:14,850 [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-15 11:10:15,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-15 11:10:15,762 [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-15 11:10:15,763 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-15 11:10:16,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-15 11:10:16,719 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-15 11:10:17,169 [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-15 11:10:17,647 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-15 11:10:18,081 [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-15 11:10:18,082 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:18,083 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:18,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-15 11:10:18,084 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:18,084 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:18,090 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:18,095 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:18,096 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:18,102 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:18,108 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:18,108 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-15 11:10:18,542 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-15 11:10:18,542 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-15 11:10:18,547 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-15 11:10:18,980 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-15 11:10:18,980 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-15 11:10:19,000 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-15 11:10:19,445 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-15 11:10:19,446 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-15 11:10:19,451 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:10:19,451 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:19,451 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:19,458 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-15 11:10:19,464 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:19,469 [ 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-15 11:10:19,497 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:10:19,497 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:19,501 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:10:19,502 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:19,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:19,659 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-15 11:10:19,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:19,670 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-15 11:10:19,681 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:19,684 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-15 11:10:19,684 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-15 11:10:20,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:20,064 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-15 11:10:20,110 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:20,115 [ 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-15 11:10:20,131 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:20,134 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-15 11:10:20,134 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-15 11:10:20,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:20,471 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:10:20,540 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:20,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:20,548 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:10:20,604 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:10:20,612 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa000b0a640> has no local changes 2024-04-15 11:10:20,613 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:10:20,623 [ scc.git] DEBUG [detached HEAD 4d38d6c] merge master -Dorg -Ssuccess-only 2024-04-15 11:10:20,623 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:10:20,623 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:10:21,014 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-15 11:10:21,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-15 11:10:21,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-15 11:10:22,422 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-15 11:10:22,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-15 11:10:23,381 [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-15 11:10:23,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-15 11:10:24,295 [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-15 11:10:24,296 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:24,762 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-15 11:10:25,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-15 11:10:25,240 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:25,240 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-15 11:10:25,240 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:25,240 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:25,248 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:25,254 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:25,254 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:25,261 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:25,268 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:25,269 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-15 11:10:25,742 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-15 11:10:25,742 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-15 11:10:25,748 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:10:25,748 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:25,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:25,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-15 11:10:25,766 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:25,773 [ 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-15 11:10:25,787 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:10:25,788 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:25,791 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:10:25,791 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:25,953 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:25,955 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:10:26,007 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:26,008 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:26,013 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:10:26,055 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:10:26,062 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa000299af0> has no local changes 2024-04-15 11:10:26,062 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:10:26,071 [ scc.git] DEBUG [detached HEAD 4fedd70] merge master -Dorg -Ssuccess-only 2024-04-15 11:10:26,071 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:10:26,072 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:10:26,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-15 11:10:27,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-15 11:10:27,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-15 11:10:27,986 [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-15 11:10:28,478 [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-15 11:10:29,008 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-15 11:10:29,425 [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-15 11:10:29,429 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-15 11:10:29,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-15 11:10:30,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-15 11:10:30,881 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-15 11:10:31,338 [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-15 11:10:31,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-15 11:10:32,293 [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-15 11:10:32,294 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:32,294 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:32,295 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-15 11:10:32,295 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:32,295 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:32,303 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:32,315 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:32,316 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:32,327 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:32,334 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:32,334 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-15 11:10:32,843 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-15 11:10:32,843 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-15 11:10:32,855 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-15 11:10:33,294 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-15 11:10:33,294 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-15 11:10:33,301 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:10:33,302 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:33,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:33,311 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-15 11:10:33,321 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:33,327 [ 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-15 11:10:33,392 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:10:33,393 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:33,397 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:10:33,397 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:33,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:33,569 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-15 11:10:33,595 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:33,601 [ 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-15 11:10:33,612 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:33,615 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-15 11:10:33,616 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-15 11:10:33,986 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:33,987 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:10:34,025 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:34,025 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:34,031 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:10:34,142 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:10:34,149 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa001b356a0> has no local changes 2024-04-15 11:10:34,149 [ 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' Generated by OMERO-build-push#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:10:34,158 [ scc.git] DEBUG [detached HEAD 377fb2b] merge master -Dorg -Ssuccess-only 2024-04-15 11:10:34,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:10:34,158 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:10:34,547 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-15 11:10:35,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-15 11:10:35,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-15 11:10:35,985 [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-15 11:10:36,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-15 11:10:36,908 [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-15 11:10:36,910 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:37,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-15 11:10:37,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-15 11:10:37,860 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-15 11:10:37,861 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:37,861 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-15 11:10:37,861 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:37,861 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:37,875 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:37,895 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:37,896 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:37,914 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:37,936 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:37,937 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-15 11:10:38,407 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-15 11:10:38,407 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-15 11:10:38,412 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:10:38,413 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:38,413 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:38,420 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-15 11:10:38,427 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:38,431 [ 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-15 11:10:38,454 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:10:38,455 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:38,457 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:10:38,458 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:38,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:38,632 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:10:38,680 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:38,681 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:38,685 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:10:38,721 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:10:38,729 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa000adcb80> has no local changes 2024-04-15 11:10:38,730 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:10:38,737 [ scc.git] DEBUG [detached HEAD a7f251c] merge master -Dorg -Ssuccess-only 2024-04-15 11:10:38,737 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:10:38,738 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:10:39,182 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-15 11:10:39,650 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-15 11:10:40,172 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-15 11:10:40,643 [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-15 11:10:41,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-15 11:10:41,549 [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-15 11:10:41,550 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:42,027 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-15 11:10:42,533 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-15 11:10:42,535 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:42,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-15 11:10:42,535 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:42,535 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:42,541 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:42,546 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:42,546 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:42,553 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:42,560 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:42,560 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-15 11:10:42,972 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-15 11:10:42,972 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-15 11:10:42,978 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:10:42,978 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:42,978 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:42,985 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-15 11:10:42,995 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:43,012 [ 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-15 11:10:43,051 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:10:43,052 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:10:43,055 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:10:43,055 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:10:43,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:10:43,223 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:10:43,276 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:43,277 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:43,282 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:10:43,334 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:10:43,342 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa000adc9d0> has no local changes 2024-04-15 11:10:43,343 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:10:43,352 [ scc.git] DEBUG [detached HEAD f344887] merge master -Dorg -Ssuccess-only 2024-04-15 11:10:43,353 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:10:43,353 [ scc.repo] DEBUG ## PRs found: 2024-04-15 11:10:43,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-15 11:10:44,372 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-15 11:10:44,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-15 11:10:45,358 [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-15 11:10:45,937 [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-15 11:10:46,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-15 11:10:46,885 [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-15 11:10:46,886 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-15 11:10:47,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-15 11:10:48,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-15 11:10:48,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-15 11:10:49,010 [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-15 11:10:49,484 [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-15 11:10:49,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-15 11:10:50,344 [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-15 11:10:50,349 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-15 11:10:50,824 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-15 11:10:51,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-15 11:10:51,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-15 11:10:52,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-15 11:10:52,720 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-15 11:10:53,189 [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-15 11:10:53,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-15 11:10:54,083 [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-15 11:10:54,084 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-15 11:10:54,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-15 11:10:55,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-15 11:10:55,488 [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-15 11:10:56,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-15 11:10:56,578 [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-15 11:10:56,579 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:10:57,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-15 11:10:57,532 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-15 11:10:58,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-15 11:10:58,497 [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-15 11:10:59,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-15 11:10:59,445 [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-15 11:10:59,446 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-15 11:10:59,447 [ scc.repo] DEBUG ## Branches found: 2024-04-15 11:10:59,447 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-15 11:10:59,447 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:10:59,447 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:10:59,454 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-15 11:10:59,460 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-15 11:10:59,460 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-15 11:10:59,467 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-15 11:10:59,475 [ scc.git] DEBUG Already up to date. 2024-04-15 11:10:59,476 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-15 11:10:59,910 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-15 11:10:59,910 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-15 11:10:59,917 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-15 11:11:00,331 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-15 11:11:00,331 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-15 11:11:00,336 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-15 11:11:00,713 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-15 11:11:00,714 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-15 11:11:00,719 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-15 11:11:01,236 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-15 11:11:01,236 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-15 11:11:01,242 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-15 11:11:01,694 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-15 11:11:01,695 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-15 11:11:01,701 [ scc.git] DEBUG ## Unique users: [] 2024-04-15 11:11:01,701 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:11:01,701 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:01,713 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-15 11:11:01,724 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:01,730 [ 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-15 11:11:02,067 [ 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-15 11:11:02,067 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:11:02,067 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-15 11:11:02,068 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-15 11:11:02,069 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-15 11:11:02,077 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-15 11:11:02,088 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-15 11:11:02,251 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:02,253 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-15 11:11:02,262 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-15 11:11:02,270 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#35](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/consoleText) for more details. Possible conflicts: - Upstream changes - .travis.yml - build.gradle --conflicts 2024-04-15 11:11:02,276 [ scc.config] DEBUG Found github.token 2024-04-15 11:11:02,276 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-15 11:11:02,276 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-15 11:11:02,283 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:02,289 [ 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-15 11:11:02,319 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:11:02,320 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:11:02,323 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:11:02,324 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:11:02,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:02,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-15 11:11:02,677 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:02,681 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-15 11:11:02,803 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:11:02,807 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-15 11:11:02,807 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:11:03,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:03,126 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-15 11:11:03,133 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:03,139 [ 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-15 11:11:03,224 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-15 11:11:03,226 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:11:03,229 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-15 11:11:03,230 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-15 11:11:03,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:03,542 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-15 11:11:03,552 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:03,556 [ 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-15 11:11:03,587 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-15 11:11:03,590 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-15 11:11:03,590 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-15 11:11:03,959 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:03,961 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-15 11:11:04,014 [ scc.git] DEBUG Get sha1 of %s 2024-04-15 11:11:04,014 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-15 11:11:04,020 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:11:04,059 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:11:04,069 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa000af0a30> has no local changes 2024-04-15 11:11:04,070 [ 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:11:04,081 [ scc.git] DEBUG [detached HEAD 1890c2d6] merge master -Dorg -Ssuccess-only 2024-04-15 11:11:04,081 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:04,081 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-15 11:11:04,133 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-15 11:11:04,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:04,389 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-15 11:11:04,395 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-15 11:11:04,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:04,802 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-15 11:11:04,808 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-15 11:11:05,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:05,218 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-15 11:11:05,224 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-15 11:11:05,618 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:05,629 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-15 11:11:05,635 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-15 11:11:06,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:06,047 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-15 11:11:06,053 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-15 11:11:06,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:06,465 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-15 11:11:06,469 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-15 11:11:06,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-15 11:11:06,873 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-15 11:11:06,873 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-15 11:11:06,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa0028b5550> has local changes 2024-04-15 11:11:06,915 [ 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' 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#35 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/35/)' 2024-04-15 11:11:06,927 [ scc.git] DEBUG [detached HEAD efc34f9] merge master -Dorg -Ssuccess-only 2024-04-15 11:11:06,927 [ scc.merge] INFO Repository: ome/omero-build 2024-04-15 11:11:06,928 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-15 11:11:06,928 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,928 [ scc.merge] INFO 2024-04-15 11:11:06,928 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,928 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-15 11:11:06,928 [ scc.merge] INFO 2024-04-15 11:11:06,928 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-15 11:11:06,928 [ scc.merge] INFO Excluded PRs: 2024-04-15 11:11:06,928 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-15 11:11:06,928 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,928 [ scc.merge] INFO 2024-04-15 11:11:06,928 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,928 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-15 11:11:06,928 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,928 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-15 11:11:06,928 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-15 11:11:06,929 [ scc.merge] INFO 2024-04-15 11:11:06,929 [ scc.merge] INFO Repository: ome/omero-common 2024-04-15 11:11:06,929 [ scc.merge] INFO Excluded PRs: 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-15 11:11:06,929 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,929 [ scc.merge] INFO 2024-04-15 11:11:06,929 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-15 11:11:06,929 [ scc.merge] INFO 2024-04-15 11:11:06,929 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-15 11:11:06,929 [ scc.merge] INFO Excluded PRs: 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-15 11:11:06,929 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,929 [ scc.merge] INFO 2024-04-15 11:11:06,929 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,929 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,929 [ scc.merge] INFO 2024-04-15 11:11:06,929 [ scc.merge] INFO Repository: ome/omero-model 2024-04-15 11:11:06,930 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,930 [ scc.merge] INFO 2024-04-15 11:11:06,930 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,930 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,930 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-15 11:11:06,930 [ scc.merge] INFO 2024-04-15 11:11:06,930 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-15 11:11:06,930 [ scc.merge] INFO Excluded PRs: 2024-04-15 11:11:06,930 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-15 11:11:06,930 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,930 [ scc.merge] INFO 2024-04-15 11:11:06,930 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,930 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,930 [ scc.merge] INFO 2024-04-15 11:11:06,930 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-15 11:11:06,930 [ scc.merge] INFO Excluded PRs: 2024-04-15 11:11:06,930 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-15 11:11:06,930 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,930 [ scc.merge] INFO 2024-04-15 11:11:06,930 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,930 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,930 [ scc.merge] INFO 2024-04-15 11:11:06,930 [ scc.merge] INFO Repository: ome/omero-server 2024-04-15 11:11:06,930 [ scc.merge] INFO Excluded PRs: 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-15 11:11:06,931 [ scc.merge] INFO Already up to date. 2024-04-15 11:11:06,931 [ scc.merge] INFO 2024-04-15 11:11:06,931 [ scc.merge] INFO Merged PRs: 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-15 11:11:06,931 [ scc.merge] INFO 2024-04-15 11:11:06,931 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-15 11:11:06,931 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-15 11:11:06,931 [ scc.merge] INFO 2024-04-15 11:11:06,931 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-15 11:11:06,931 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-15 11:11:06,938 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:06,944 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-15 11:11:06,944 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:06,949 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-15 11:11:06,949 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,954 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:06,955 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-15 11:11:06,955 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:06,960 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-15 11:11:06,960 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:06,966 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-15 11:11:06,966 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-15 11:11:06,972 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-15 11:11:06,972 [ scc.git] DEBUG Calling 'git remote' 2024-04-15 11:11:06,978 [ 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.2.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 07c3f952] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD 1d0a657] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD 088fd05] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD 427e228] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD 44585f2] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD 816da7d] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD 5f519548] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD a802cd5] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-15 11:11:45,138 [ 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