![[Jenkins]](/jenkins/static/b864b239/images/svgs/logo.svg){kind=logo}
Started by upstream project "Trigger" build number 54 originally caused by: Started by timer [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-build-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-build-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision be302339afbcb58c8fe5fb6ab3932873d847cd68 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-build-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-build.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-build.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-build.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Commit message: "Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f" > git rev-list --no-walk be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-model.url # timeout=10 > git config -f .gitmodules --get submodule.omero-model.path # timeout=10 > git config --get submodule.omero-common.url # timeout=10 > git config -f .gitmodules --get submodule.omero-common.path # timeout=10 > git config --get submodule.omero-romio.url # timeout=10 > git config -f .gitmodules --get submodule.omero-romio.path # timeout=10 > git config --get submodule.omero-renderer.url # timeout=10 > git config -f .gitmodules --get submodule.omero-renderer.path # timeout=10 > git config --get submodule.omero-server.url # timeout=10 > git config -f .gitmodules --get submodule.omero-server.path # timeout=10 > git config --get submodule.omero-blitz.url # timeout=10 > git config -f .gitmodules --get submodule.omero-blitz.path # timeout=10 > git config --get submodule.omero-gateway-java.url # timeout=10 > git config -f .gitmodules --get submodule.omero-gateway-java.path # timeout=10 > git submodule update --init --recursive omero-model # timeout=10 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-gradle-plugins-push" build number 47 [Pipeline] sh > git submodule update --init --recursive omero-common # timeout=10 > git submodule update --init --recursive omero-romio # timeout=10 > git submodule update --init --recursive omero-renderer # timeout=10 > git submodule update --init --recursive omero-server # timeout=10 > git submodule update --init --recursive omero-blitz # timeout=10 > 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-28 00:23:21,779 [ scc.config] DEBUG Found github.token 2024-04-28 00:23:21,782 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-28 00:23:22,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:23:22,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:23:22,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-28 00:23:22,853 [ scc.gh] DEBUG 4862 remaining from 5000 (Reset at 01:04 2024-04-28 00:23:22,854 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:22,860 [ scc.git] DEBUG Check current status 2024-04-28 00:23:22,860 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:22,864 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-28 00:23:22,865 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:22,911 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-28 00:23:22,915 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-28 00:23:22,919 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-28 00:23:22,923 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-28 00:23:22,927 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-28 00:23:22,931 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-28 00:23:22,954 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-28 00:23:22,960 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:23,391 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-28 00:23:23,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:24,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:24,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:25,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:25,119 [ scc.git] DEBUG Resetting... 2024-04-28 00:23:25,119 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-28 00:23:25,127 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-28 00:23:25,128 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-28 00:23:25,194 [ scc.git] DEBUG Check current status 2024-04-28 00:23:25,194 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:25,200 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-28 00:23:25,200 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:25,244 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-28 00:23:25,247 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-28 00:23:25,251 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-28 00:23:25,254 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-28 00:23:25,259 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-28 00:23:25,263 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-28 00:23:25,267 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-28 00:23:25,268 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-28 00:23:25,268 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-28 00:23:25,268 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-28 00:23:25,268 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-28 00:23:25,268 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-28 00:23:25,268 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:23:25,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-28 00:23:26,107 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-28 00:23:26,108 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-28 00:23:26,108 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-28 00:23:26,108 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:23:26,109 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:23:26,109 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:26,114 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:23:26,118 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:23:26,118 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:23:26,122 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:23:26,125 [ scc.git] DEBUG Already up to date. 2024-04-28 00:23:26,125 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-28 00:23:26,526 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-28 00:23:26,526 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-28 00:23:26,534 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:23:26,534 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:23:26,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:26,540 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-28 00:23:26,584 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:26,588 [ 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-28 00:23:26,600 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:23:26,602 [ scc.git] DEBUG omero-server | 2 +- 2024-04-28 00:23:26,602 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:23:26,769 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:23:26,771 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:23:27,440 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-28 00:23:27,441 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:23:27,442 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:27,448 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:23:27,860 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f78097eb550> has no local changes 2024-04-28 00:23:27,860 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:23:27,894 [ scc.git] DEBUG [detached HEAD 8574e0a] merge master -Dorg -Snone 2024-04-28 00:23:27,895 [ scc.merge] INFO Repository: ome/omero-build 2024-04-28 00:23:27,895 [ scc.merge] INFO Already up to date. 2024-04-28 00:23:27,895 [ scc.merge] INFO 2024-04-28 00:23:27,895 [ scc.merge] INFO Merged PRs: 2024-04-28 00:23:27,895 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-28 00:23:27,895 [ scc.merge] INFO 2024-04-28 00:23:27,895 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-28 00:23:27,895 [ scc.git] DEBUG Calling 'git remote' Synchronizing submodule url for 'omero-blitz' Synchronizing submodule url for 'omero-common' Synchronizing submodule url for 'omero-gateway-java' Synchronizing submodule url for 'omero-model' Synchronizing submodule url for 'omero-renderer' Synchronizing submodule url for 'omero-romio' Synchronizing submodule url for 'omero-server' Merge all submodules2024-04-28 00:23:31,260 [ scc.config] DEBUG Found github.token 2024-04-28 00:23:31,265 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-28 00:23:31,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:23:31,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:23:32,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-28 00:23:32,317 [ scc.gh] DEBUG 4852 remaining from 5000 (Reset at 01:04 2024-04-28 00:23:32,317 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:32,323 [ scc.git] DEBUG Check current status 2024-04-28 00:23:32,323 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:32,326 [ scc.git] DEBUG 8574e0a merge master -Dorg -Snone 2024-04-28 00:23:32,327 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:32,374 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-28 00:23:32,377 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-28 00:23:32,380 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-28 00:23:32,385 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-28 00:23:32,388 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-28 00:23:32,391 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-28 00:23:32,395 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-28 00:23:32,401 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:32,813 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-28 00:23:33,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:33,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:34,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:34,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:34,545 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:34,617 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-28 00:23:34,617 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:34,622 [ scc.git] DEBUG Check current status 2024-04-28 00:23:34,622 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:34,643 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-28 00:23:34,644 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:34,695 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:35,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-28 00:23:35,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:35,904 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:36,330 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:36,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:36,744 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:36,795 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:36,796 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-28 00:23:36,796 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:36,801 [ scc.git] DEBUG Check current status 2024-04-28 00:23:36,801 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:36,813 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-28 00:23:36,814 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:36,864 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:37,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-28 00:23:37,673 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:38,097 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:38,506 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:38,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:38,924 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:38,967 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:38,968 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-28 00:23:38,968 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:38,973 [ scc.git] DEBUG Check current status 2024-04-28 00:23:38,973 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:38,979 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-28 00:23:38,979 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:39,023 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:39,379 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-28 00:23:39,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:40,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:40,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:41,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:41,084 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:41,126 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:41,128 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-28 00:23:41,128 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:41,133 [ scc.git] DEBUG Check current status 2024-04-28 00:23:41,133 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:41,140 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-28 00:23:41,140 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:41,181 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:41,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-28 00:23:42,021 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:42,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:42,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:43,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:43,260 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:43,301 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:43,302 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-28 00:23:43,302 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:43,308 [ scc.git] DEBUG Check current status 2024-04-28 00:23:43,308 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:43,324 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-28 00:23:43,324 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:43,367 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:43,738 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-28 00:23:44,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:44,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:45,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:45,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:45,466 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:45,505 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:45,507 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-28 00:23:45,507 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:45,512 [ scc.git] DEBUG Check current status 2024-04-28 00:23:45,513 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:45,531 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-28 00:23:45,531 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:45,577 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:45,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-28 00:23:46,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:46,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:47,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:47,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:47,633 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:47,679 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:47,680 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-28 00:23:47,680 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-28 00:23:47,685 [ scc.git] DEBUG Check current status 2024-04-28 00:23:47,685 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:47,704 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-28 00:23:47,705 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:47,752 [ scc.config] DEBUG Found remote.origin.url 2024-04-28 00:23:48,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-28 00:23:48,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-28 00:23:48,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-28 00:23:49,410 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-28 00:23:49,814 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-28 00:23:49,816 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:23:49,869 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:23:49,869 [ scc.git] DEBUG Resetting... 2024-04-28 00:23:49,869 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-28 00:23:49,876 [ scc.git] DEBUG HEAD is now at 8574e0a merge master -Dorg -Snone 2024-04-28 00:23:49,876 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-28 00:23:49,941 [ scc.git] DEBUG Check current status 2024-04-28 00:23:49,942 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-28 00:23:49,948 [ scc.git] DEBUG 8574e0a merge master -Dorg -Snone 2024-04-28 00:23:49,948 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-28 00:23:49,994 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-28 00:23:49,998 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-28 00:23:50,002 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-28 00:23:50,006 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-28 00:23:50,009 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-28 00:23:50,013 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-28 00:23:50,016 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-28 00:23:50,017 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-28 00:23:50,018 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-28 00:23:50,018 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-28 00:23:50,018 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-28 00:23:50,018 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-28 00:23:50,018 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-28 00:23:50,018 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:23:50,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-28 00:23:50,785 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-28 00:23:50,787 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-28 00:23:51,289 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-28 00:23:51,742 [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-28 00:23:52,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-28 00:23:52,735 [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-28 00:23:52,737 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-28 00:23:52,737 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:23:52,737 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:23:52,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:52,744 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:23:52,749 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:23:52,749 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:23:52,755 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:23:52,760 [ scc.git] DEBUG Already up to date. 2024-04-28 00:23:52,760 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-28 00:23:53,141 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-28 00:23:53,141 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-28 00:23:53,147 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:23:53,148 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:23:53,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:53,152 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-28 00:23:53,158 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:53,163 [ 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-28 00:23:53,169 [ scc.git] DEBUG Already up to date. 2024-04-28 00:23:53,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:23:53,339 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:23:53,391 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:23:53,391 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:23:53,399 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:23:53,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-28 00:23:54,393 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-28 00:23:54,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None 2024-04-28 00:23:55,454 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-28 00:23:55,928 [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-28 00:23:56,417 [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-28 00:23:56,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-28 00:23:57,360 [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-28 00:23:57,361 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-28 00:23:57,825 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-28 00:23:58,343 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-28 00:23:58,828 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-28 00:23:59,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-28 00:23:59,792 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-28 00:24:00,263 [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-28 00:24:00,744 [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-28 00:24:01,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-28 00:24:01,700 [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-28 00:24:01,700 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-28 00:24:02,158 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-28 00:24:02,637 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-28 00:24:03,066 [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-28 00:24:03,509 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-28 00:24:03,934 [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-28 00:24:03,935 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:24:04,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-28 00:24:04,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-28 00:24:05,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-28 00:24:05,785 [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-28 00:24:06,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-28 00:24:06,710 [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-28 00:24:06,711 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-28 00:24:06,712 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:24:06,712 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-28 00:24:06,712 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:06,712 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:06,718 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:24:06,723 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:24:06,724 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:24:06,732 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:24:06,739 [ scc.git] DEBUG Already up to date. 2024-04-28 00:24:06,740 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-28 00:24:07,241 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-28 00:24:07,242 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-28 00:24:07,249 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-28 00:24:07,626 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-28 00:24:07,627 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-28 00:24:07,633 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-28 00:24:08,129 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-28 00:24:08,129 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-28 00:24:08,135 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-28 00:24:08,586 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-28 00:24:08,586 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-28 00:24:08,593 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:24:08,593 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:08,593 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:08,600 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-28 00:24:08,608 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:08,615 [ 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-28 00:24:08,646 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-28 00:24:08,648 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:08,653 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-28 00:24:08,653 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-28 00:24:08,816 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:08,818 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-28 00:24:08,826 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:08,831 [ 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-28 00:24:08,857 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:08,879 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:08,882 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:08,883 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:09,238 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:09,240 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-28 00:24:09,255 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:09,264 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-28 00:24:09,352 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:09,356 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-28 00:24:09,356 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:09,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:09,645 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-28 00:24:09,655 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:09,661 [ 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-28 00:24:09,691 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:09,695 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-28 00:24:09,695 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-28 00:24:10,059 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:10,060 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:24:10,101 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:10,101 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:10,106 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:24:10,149 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:24:10,159 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda817f1310> has no local changes 2024-04-28 00:24:10,160 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:24:10,172 [ scc.git] DEBUG [detached HEAD 670d325e] merge master -Dorg -Ssuccess-only 2024-04-28 00:24:10,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:24:10,173 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:24:10,657 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-28 00:24:11,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-28 00:24:11,570 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-28 00:24:12,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-28 00:24:12,559 [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-28 00:24:12,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-28 00:24:13,426 [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-28 00:24:13,427 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-28 00:24:13,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-28 00:24:14,361 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-28 00:24:14,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-28 00:24:15,354 [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-28 00:24:15,836 [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-28 00:24:16,311 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-28 00:24:16,736 [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-28 00:24:16,738 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-28 00:24:17,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-28 00:24:17,681 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-28 00:24:18,138 [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-28 00:24:18,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-28 00:24:19,002 [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-28 00:24:19,003 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:24:19,003 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:24:19,003 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-28 00:24:19,003 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:19,003 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:19,009 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:24:19,014 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:24:19,014 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:24:19,020 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:24:19,025 [ scc.git] DEBUG Already up to date. 2024-04-28 00:24:19,025 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-28 00:24:19,499 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-28 00:24:19,499 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-28 00:24:19,506 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-28 00:24:19,939 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-28 00:24:19,939 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-28 00:24:19,945 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-28 00:24:20,363 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-28 00:24:20,363 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-28 00:24:20,371 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:24:20,371 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:20,371 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:20,378 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-28 00:24:20,383 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:20,387 [ 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-28 00:24:20,414 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:20,415 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:20,419 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:20,419 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:20,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:20,574 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-28 00:24:20,581 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:20,586 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-28 00:24:20,600 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:20,603 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-28 00:24:20,603 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-28 00:24:20,978 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:20,980 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-28 00:24:20,988 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:20,994 [ 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-28 00:24:21,047 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:21,051 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-28 00:24:21,051 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-28 00:24:21,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:21,400 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:24:21,446 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:21,446 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:21,454 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:24:21,496 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:24:21,503 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda8074a640> has no local changes 2024-04-28 00:24:21,503 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:24:21,513 [ scc.git] DEBUG [detached HEAD cde0bb7] merge master -Dorg -Ssuccess-only 2024-04-28 00:24:21,513 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:24:21,514 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:24:21,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-28 00:24:22,398 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-28 00:24:22,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-28 00:24:23,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-28 00:24:23,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-28 00:24:24,291 [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-28 00:24:24,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-28 00:24:25,207 [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-28 00:24:25,209 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:24:25,669 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-28 00:24:26,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-28 00:24:26,156 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:24:26,157 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-28 00:24:26,157 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:26,157 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:26,162 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:24:26,166 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:24:26,167 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:24:26,177 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:24:26,182 [ scc.git] DEBUG Already up to date. 2024-04-28 00:24:26,183 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-28 00:24:26,568 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-28 00:24:26,568 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-28 00:24:26,575 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:24:26,575 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:26,575 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:26,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-28 00:24:26,586 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:26,591 [ 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-28 00:24:26,644 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:26,645 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:26,648 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:26,648 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:26,804 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:26,805 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:24:26,848 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:26,848 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:26,852 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:24:26,889 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:24:26,895 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda806dbaf0> has no local changes 2024-04-28 00:24:26,896 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:24:26,926 [ scc.git] DEBUG [detached HEAD 829b6f1] merge master -Dorg -Ssuccess-only 2024-04-28 00:24:26,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:24:26,927 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:24:27,337 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-28 00:24:27,807 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None 2024-04-28 00:24:28,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-28 00:24:28,793 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None 2024-04-28 00:24:29,283 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc/check-suites?app_id=15368 HTTP/1.1" 200 None 2024-04-28 00:24:29,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-28 00:24:30,233 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/9e284c2e5a7bbb845906c2799693af75ec42bebc?per_page=1 HTTP/1.1" 200 2 2024-04-28 00:24:30,234 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-28 00:24:30,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-28 00:24:31,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-28 00:24:31,679 [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-28 00:24:32,165 [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-28 00:24:32,643 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-28 00:24:33,057 [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-28 00:24:33,058 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-28 00:24:33,525 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-28 00:24:33,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-28 00:24:34,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-28 00:24:34,945 [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-28 00:24:35,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-28 00:24:35,818 [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-28 00:24:35,819 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:24:35,819 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:24:35,820 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-28 00:24:35,820 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:35,820 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:35,825 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:24:35,830 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:24:35,830 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:24:35,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:24:35,845 [ scc.git] DEBUG Already up to date. 2024-04-28 00:24:35,845 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-28 00:24:36,253 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-28 00:24:36,253 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-28 00:24:36,257 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-28 00:24:36,645 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-28 00:24:36,646 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-28 00:24:36,652 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-04-28 00:24:37,056 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-28 00:24:37,056 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-04-28 00:24:37,062 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:24:37,062 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:37,062 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:37,069 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-28 00:24:37,077 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:37,082 [ 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-28 00:24:37,134 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:37,135 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:37,138 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:37,139 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:37,305 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:37,307 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-28 00:24:37,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:37,333 [ 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-28 00:24:37,384 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:37,389 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-28 00:24:37,390 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-28 00:24:37,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:37,728 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-28 00:24:37,736 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:37,744 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Bump Bio-Formats to version 7.3.0) 9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-28 00:24:37,797 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:37,798 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:37,801 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:37,801 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:38,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:38,141 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:24:38,189 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:38,190 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:38,196 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:24:38,240 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:24:38,248 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda8178e6a0> has no local changes 2024-04-28 00:24:38,249 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-model Already up to date. Merged PRs: - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' Generated by OMERO-build-push#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:24:38,258 [ scc.git] DEBUG [detached HEAD a72ede6] merge master -Dorg -Ssuccess-only 2024-04-28 00:24:38,258 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:24:38,259 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:24:38,641 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-28 00:24:39,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-28 00:24:39,613 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-28 00:24:40,086 [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-28 00:24:40,517 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-28 00:24:40,937 [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-28 00:24:40,938 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:24:41,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-28 00:24:41,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-28 00:24:41,879 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-28 00:24:41,879 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:24:41,879 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-28 00:24:41,879 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:41,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:41,888 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:24:41,894 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:24:41,894 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:24:41,900 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:24:41,906 [ scc.git] DEBUG Already up to date. 2024-04-28 00:24:41,907 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-28 00:24:42,299 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-28 00:24:42,300 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-28 00:24:42,307 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:24:42,308 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:42,308 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:42,318 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-28 00:24:42,331 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:42,343 [ 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-28 00:24:42,395 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:42,396 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:42,401 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:42,401 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:42,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:42,565 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:24:42,630 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:42,631 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:42,638 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:24:42,702 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:24:42,713 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda81784b80> has no local changes 2024-04-28 00:24:42,713 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:24:42,726 [ scc.git] DEBUG [detached HEAD bb120db] merge master -Dorg -Ssuccess-only 2024-04-28 00:24:42,726 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:24:42,727 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:24:43,126 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-28 00:24:43,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-28 00:24:44,075 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-28 00:24:44,535 [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-28 00:24:45,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-28 00:24:45,451 [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-28 00:24:45,452 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:24:45,922 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-28 00:24:46,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-28 00:24:46,406 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:24:46,406 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-28 00:24:46,406 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:46,406 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:46,413 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:24:46,419 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:24:46,419 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:24:46,425 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:24:46,432 [ scc.git] DEBUG Already up to date. 2024-04-28 00:24:46,432 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-28 00:24:46,970 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-28 00:24:46,971 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-28 00:24:46,981 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:24:46,981 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:46,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:46,990 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-28 00:24:46,999 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:47,006 [ 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-28 00:24:47,112 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:24:47,113 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:24:47,116 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:24:47,117 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:24:47,280 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:24:47,282 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:24:47,335 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:24:47,335 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:24:47,343 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:24:47,397 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:24:47,406 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda817849d0> has no local changes 2024-04-28 00:24:47,407 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:24:47,422 [ scc.git] DEBUG [detached HEAD 7ce5562] merge master -Dorg -Ssuccess-only 2024-04-28 00:24:47,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:24:47,423 [ scc.repo] DEBUG ## PRs found: 2024-04-28 00:24:47,920 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-28 00:24:48,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-28 00:24:48,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-28 00:24:49,393 [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-28 00:24:49,870 [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-28 00:24:50,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-28 00:24:50,767 [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-28 00:24:50,769 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-28 00:24:51,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-28 00:24:51,766 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-28 00:24:52,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-28 00:24:52,749 [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-28 00:24:53,218 [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-28 00:24:53,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-28 00:24:54,097 [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-28 00:24:54,098 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-28 00:24:54,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-28 00:24:55,012 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-28 00:24:55,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-28 00:24:55,917 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-28 00:24:56,432 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-28 00:24:56,880 [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-28 00:24:57,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-28 00:24:57,788 [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-28 00:24:57,789 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-28 00:24:58,247 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-28 00:24:58,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-28 00:24:59,229 [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-28 00:24:59,743 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-28 00:25:00,153 [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-28 00:25:00,154 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:00,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-28 00:25:01,083 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-28 00:25:01,614 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-28 00:25:02,071 [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-28 00:25:02,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-28 00:25:02,999 [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-28 00:25:03,001 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-28 00:25:03,001 [ scc.repo] DEBUG ## Branches found: 2024-04-28 00:25:03,001 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-28 00:25:03,001 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:25:03,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:03,061 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-28 00:25:03,067 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-28 00:25:03,067 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-28 00:25:03,072 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-28 00:25:03,079 [ scc.git] DEBUG Already up to date. 2024-04-28 00:25:03,079 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-28 00:25:03,532 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-28 00:25:03,533 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-28 00:25:03,539 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-28 00:25:03,909 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-28 00:25:03,910 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-28 00:25:03,916 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-28 00:25:04,303 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-28 00:25:04,303 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-28 00:25:04,308 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-28 00:25:04,712 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-28 00:25:04,712 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-28 00:25:04,719 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-28 00:25:05,139 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-28 00:25:05,139 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-28 00:25:05,145 [ scc.git] DEBUG ## Unique users: [] 2024-04-28 00:25:05,146 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:25:05,146 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:05,153 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-28 00:25:05,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:05,168 [ 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-28 00:25:05,382 [ 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-28 00:25:05,382 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:25:05,382 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-28 00:25:05,383 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-28 00:25:05,383 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-28 00:25:05,392 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-28 00:25:05,403 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-28 00:25:05,560 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:05,562 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-28 00:25:05,570 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-28 00:25:05,578 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#47](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/consoleText) for more details. Possible conflicts: - Upstream changes - .travis.yml - build.gradle --conflicts 2024-04-28 00:25:05,584 [ scc.config] DEBUG Found github.token 2024-04-28 00:25:05,584 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-28 00:25:05,584 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-28 00:25:05,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:05,596 [ 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-28 00:25:05,680 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:25:05,684 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:25:05,688 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:25:05,688 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:25:05,960 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:05,961 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-28 00:25:05,968 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:05,973 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-28 00:25:06,040 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:25:06,042 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-28 00:25:06,042 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:25:06,366 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:06,368 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-28 00:25:06,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:06,382 [ 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-28 00:25:06,457 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-28 00:25:06,460 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:25:06,463 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-28 00:25:06,463 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-28 00:25:06,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:06,780 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-28 00:25:06,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:06,795 [ 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-28 00:25:06,829 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-28 00:25:06,832 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-28 00:25:06,832 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-28 00:25:07,194 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:07,196 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-28 00:25:07,239 [ scc.git] DEBUG Get sha1 of %s 2024-04-28 00:25:07,239 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-28 00:25:07,244 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:25:07,282 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:25:07,293 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda80731fd0> has no local changes 2024-04-28 00:25:07,293 [ 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#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:25:07,305 [ scc.git] DEBUG [detached HEAD 2e90c1a3] merge master -Dorg -Ssuccess-only 2024-04-28 00:25:07,305 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:07,305 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-28 00:25:07,366 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-28 00:25:07,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:07,619 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-28 00:25:07,625 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-28 00:25:08,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:08,028 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-28 00:25:08,032 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-28 00:25:08,420 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:08,433 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-28 00:25:08,438 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-28 00:25:08,836 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:08,847 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-28 00:25:08,851 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-28 00:25:09,249 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:09,259 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-28 00:25:09,262 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-28 00:25:09,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:09,671 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-28 00:25:09,676 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-28 00:25:10,063 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-28 00:25:10,074 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-28 00:25:10,075 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-28 00:25:10,139 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fda824d6550> has local changes 2024-04-28 00:25:10,139 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only Repository: ome/omero-build Already up to date. Merged PRs: - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' Repository: ome/omero-blitz Excluded PRs: - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) Already up to date. Merged PRs: - PR 119 dominikl 'Take Ice and omero sysenv variables into account' - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 132 jburel 'Fix javadoc warning' - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' Repository: ome/omero-common Excluded PRs: - PR 40 jburel 'set classifier' (exclude comment) - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) Already up to date. Merged PRs: - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 42 jburel 'include all' - PR 43 sbesson 'Mark omero.security.ignore_case as production property' Repository: ome/omero-gateway-java Excluded PRs: - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) - PR 30 jburel 'Import image' (exclude comment) Already up to date. Merged PRs: - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' Repository: ome/omero-model Already up to date. Merged PRs: - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' Repository: ome/omero-renderer Excluded PRs: - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) Already up to date. Merged PRs: - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' Repository: ome/omero-romio Excluded PRs: - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) Already up to date. Merged PRs: - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' Repository: ome/omero-server Excluded PRs: - PR 166 kkoz 'Experimenter group cache' (stage: draft) - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) Already up to date. Merged PRs: - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' - PR 152 jburel 'Set class in doc' - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' - PR 177 chris-allan 'Swap default min and background thread limits' Conflicting PRs (not included): - PR 61 joshmoore 'Pass user executor to rendering tasks' Generated by OMERO-build-push#47 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/47/)' 2024-04-28 00:25:10,150 [ scc.git] DEBUG [detached HEAD f831aa1] merge master -Dorg -Ssuccess-only 2024-04-28 00:25:10,150 [ scc.merge] INFO Repository: ome/omero-build 2024-04-28 00:25:10,151 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-28 00:25:10,151 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,151 [ scc.merge] INFO 2024-04-28 00:25:10,151 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-28 00:25:10,151 [ scc.merge] INFO 2024-04-28 00:25:10,151 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-28 00:25:10,151 [ scc.merge] INFO Excluded PRs: 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-28 00:25:10,151 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,151 [ scc.merge] INFO 2024-04-28 00:25:10,151 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-28 00:25:10,151 [ scc.merge] INFO 2024-04-28 00:25:10,151 [ scc.merge] INFO Repository: ome/omero-common 2024-04-28 00:25:10,151 [ scc.merge] INFO Excluded PRs: 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-28 00:25:10,151 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,151 [ scc.merge] INFO 2024-04-28 00:25:10,151 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-28 00:25:10,151 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-28 00:25:10,151 [ scc.merge] INFO 2024-04-28 00:25:10,151 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-28 00:25:10,151 [ scc.merge] INFO Excluded PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-28 00:25:10,152 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Repository: ome/omero-model 2024-04-28 00:25:10,152 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-28 00:25:10,152 [ scc.merge] INFO Excluded PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-28 00:25:10,152 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-28 00:25:10,152 [ scc.merge] INFO Excluded PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-28 00:25:10,152 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,152 [ scc.merge] INFO 2024-04-28 00:25:10,152 [ scc.merge] INFO Repository: ome/omero-server 2024-04-28 00:25:10,152 [ scc.merge] INFO Excluded PRs: 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-28 00:25:10,152 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-28 00:25:10,152 [ scc.merge] INFO Already up to date. 2024-04-28 00:25:10,153 [ scc.merge] INFO 2024-04-28 00:25:10,153 [ scc.merge] INFO Merged PRs: 2024-04-28 00:25:10,153 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-28 00:25:10,153 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-28 00:25:10,153 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-28 00:25:10,153 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-28 00:25:10,153 [ scc.merge] INFO 2024-04-28 00:25:10,153 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-28 00:25:10,153 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-28 00:25:10,153 [ scc.merge] INFO 2024-04-28 00:25:10,153 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-28 00:25:10,153 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,158 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-28 00:25:10,158 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,162 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:10,163 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-28 00:25:10,163 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:10,167 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-28 00:25:10,168 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:10,172 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-28 00:25:10,172 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:10,177 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-28 00:25:10,177 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,182 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:10,183 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-28 00:25:10,183 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-28 00:25:10,187 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-28 00:25:10,188 [ scc.git] DEBUG Calling 'git remote' 2024-04-28 00:25:10,192 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push Update component versions Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT Updating omero-server from 5.6.10 to 5.6.11-SNAPSHOT Updating omero-model from 5.6.13 to 5.6.14-SNAPSHOT Updating omero-blitz from 5.7.2 to 5.7.3-SNAPSHOT Updating formats-gpl from 7.3.0 to 8.0.0-SNAPSHOT Updating omero-romio from 5.7.5 to 5.7.6-SNAPSHOT Updating omero-common from 5.6.4 to 5.6.5-SNAPSHOT Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT Updating omero-renderer from 5.5.15 to 5.5.16-SNAPSHOT Commit all component version changes Entering 'omero-blitz' Entering 'omero-common' Entering 'omero-gateway-java' Entering 'omero-model' Entering 'omero-renderer' Entering 'omero-romio' Entering 'omero-server' Entering 'omero-blitz' [detached HEAD 5cf4c736] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD 2086c0b] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD 228e3f6] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD 77fa9b7] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD 96038f2] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD e47b2f5] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD 078cda61] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD cff83cd] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-28 00:25:46,056 [ 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