Started by upstream project "Trigger" build number 44 originally caused by: Started by user devspace [Pipeline] Start of Pipeline [Pipeline] node Running on testintegration in /home/omero/workspace/OMERO-build-push [Pipeline] { [Pipeline] library Loading library recursiveMerge@master Attempting to resolve master from remote references... > git --version # timeout=10 > git --version # 'git version 2.39.2' > git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf The recommended git tool is: NONE No credentials specified > git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-build-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10 Fetching changes from the remote Git repository > git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10 Fetching without tags Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git > git --version # timeout=10 > git --version # 'git version 2.39.2' > git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10 Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master) > git config core.sparsecheckout # timeout=10 > git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 Commit message: "Merge pull request #17 from jburel/python3" > git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10 [Pipeline] checkout The recommended git tool is: NONE No credentials specified Fetching changes from the remote Git repository Checking out Revision be302339afbcb58c8fe5fb6ab3932873d847cd68 (refs/remotes/origin/master) > git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-build-push/.git # timeout=10 > git config remote.origin.url https://github.com/ome/omero-build.git # timeout=10 Fetching upstream changes from https://github.com/ome/omero-build.git > git --version # timeout=10 > git --version # 'git version 2.39.3' > git fetch --tags --force --progress -- https://github.com/ome/omero-build.git +refs/heads/*:refs/remotes/origin/* # timeout=10 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10 > git config core.sparsecheckout # timeout=10 > git checkout -f be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Commit message: "Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f" > git rev-list --no-walk be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 Resetting working tree > git reset --hard # timeout=10 > git clean -fdx # timeout=10 > git submodule foreach --recursive git reset --hard # timeout=10 > git submodule foreach --recursive git clean -fdx # timeout=10 > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule init # timeout=10 > git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10 > git config --get submodule.omero-model.url # timeout=10 > git config -f .gitmodules --get submodule.omero-model.path # timeout=10 > git config --get submodule.omero-common.url # timeout=10 > git config -f .gitmodules --get submodule.omero-common.path # timeout=10 > git config --get submodule.omero-romio.url # timeout=10 > git config -f .gitmodules --get submodule.omero-romio.path # timeout=10 > git config --get submodule.omero-renderer.url # timeout=10 > git config -f .gitmodules --get submodule.omero-renderer.path # timeout=10 > git config --get submodule.omero-server.url # timeout=10 > git config -f .gitmodules --get submodule.omero-server.path # timeout=10 > git config --get submodule.omero-blitz.url # timeout=10 > git config -f .gitmodules --get submodule.omero-blitz.path # timeout=10 > git config --get submodule.omero-gateway-java.url # timeout=10 > git config -f .gitmodules --get submodule.omero-gateway-java.path # timeout=10 > git submodule update --init --recursive omero-model # timeout=10 > git submodule update --init --recursive omero-common # timeout=10 > 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 [Pipeline] pwd [Pipeline] copyArtifacts Copied 1 artifact from "OMERO-gradle-plugins-push" build number 38 [Pipeline] sh + pushd build ~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push + curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz + tar -zxf - + popd ~/workspace/OMERO-build-push + python3 -m venv build/venv + . 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-19 08:08:37,305 [ scc.config] DEBUG Found github.token 2024-04-19 08:08:37,311 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-19 08:08:37,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:08:37,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:08:38,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-19 08:08:38,396 [ scc.gh] DEBUG 4611 remaining from 5000 (Reset at 08:04 2024-04-19 08:08:38,398 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:38,407 [ scc.git] DEBUG Check current status 2024-04-19 08:08:38,407 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:38,414 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-19 08:08:38,416 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:38,487 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-19 08:08:38,491 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-19 08:08:38,496 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-19 08:08:38,509 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-19 08:08:38,514 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-19 08:08:38,517 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-19 08:08:38,541 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-19 08:08:38,547 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:38,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-19 08:08:39,380 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:39,801 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:08:40,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:08:40,634 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:08:40,636 [ scc.git] DEBUG Resetting... 2024-04-19 08:08:40,636 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-19 08:08:40,645 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-19 08:08:40,646 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-19 08:08:40,731 [ scc.git] DEBUG Check current status 2024-04-19 08:08:40,731 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:40,738 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f 2024-04-19 08:08:40,738 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:40,799 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-19 08:08:40,804 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-19 08:08:40,808 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-19 08:08:40,812 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-19 08:08:40,819 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-19 08:08:40,825 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-19 08:08:40,830 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6) 2024-04-19 08:08:40,831 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-19 08:08:40,831 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-19 08:08:40,832 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-19 08:08:40,832 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-19 08:08:40,832 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-19 08:08:40,832 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:08:41,150 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-19 08:08:41,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-19 08:08:41,618 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-19 08:08:41,618 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-19 08:08:41,618 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:08:41,618 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:08:41,618 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:08:41,623 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:08:41,629 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:08:41,629 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:08:41,635 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:08:41,654 [ scc.git] DEBUG Already up to date. 2024-04-19 08:08:41,654 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-19 08:08:42,119 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-19 08:08:42,119 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-19 08:08:42,125 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:08:42,125 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:08:42,125 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:08:42,131 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-19 08:08:42,161 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:08:42,168 [ 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-19 08:08:42,185 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:08:42,187 [ scc.git] DEBUG omero-server | 2 +- 2024-04-19 08:08:42,187 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:08:42,351 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:08:42,352 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:08:42,478 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-19 08:08:42,479 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:08:42,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:08:42,488 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:08:42,630 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fc80d0a9550> has no local changes 2024-04-19 08:08:42,631 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:08:42,669 [ scc.git] DEBUG [detached HEAD 1548c55] merge master -Dorg -Snone 2024-04-19 08:08:42,669 [ scc.merge] INFO Repository: ome/omero-build 2024-04-19 08:08:42,669 [ scc.merge] INFO Already up to date. 2024-04-19 08:08:42,669 [ scc.merge] INFO 2024-04-19 08:08:42,669 [ scc.merge] INFO Merged PRs: 2024-04-19 08:08:42,669 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-19 08:08:42,669 [ scc.merge] INFO 2024-04-19 08:08:42,669 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-19 08:08:42,670 [ 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-19 08:08:46,258 [ scc.config] DEBUG Found github.token 2024-04-19 08:08:46,261 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443 2024-04-19 08:08:46,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:08:46,899 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:08:47,309 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None 2024-04-19 08:08:47,309 [ scc.gh] DEBUG 4601 remaining from 5000 (Reset at 08:04 2024-04-19 08:08:47,310 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:47,314 [ scc.git] DEBUG Check current status 2024-04-19 08:08:47,314 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:47,317 [ scc.git] DEBUG 1548c55 merge master -Dorg -Snone 2024-04-19 08:08:47,317 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:47,357 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-19 08:08:47,360 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-19 08:08:47,363 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-19 08:08:47,366 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-19 08:08:47,369 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-19 08:08:47,372 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-19 08:08:47,375 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-19 08:08:47,379 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:47,808 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None 2024-04-19 08:08:48,265 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:48,698 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:08:49,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:08:49,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:08:49,535 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:08:49,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-19 08:08:49,632 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:49,636 [ scc.git] DEBUG Check current status 2024-04-19 08:08:49,636 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:49,639 [ scc.git] DEBUG 1c874820 revert to snapshot 2024-04-19 08:08:49,640 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:49,679 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:50,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None 2024-04-19 08:08:50,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:50,911 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:08:51,331 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:08:51,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:08:51,740 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:08:51,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:08:51,789 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-19 08:08:51,789 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:51,794 [ scc.git] DEBUG Check current status 2024-04-19 08:08:51,794 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:51,799 [ scc.git] DEBUG d19036d revert to snapshot 2024-04-19 08:08:51,799 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:51,846 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:52,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None 2024-04-19 08:08:52,665 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:53,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:08:53,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:08:53,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:08:53,887 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:08:53,937 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:08:53,938 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-19 08:08:53,938 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:53,943 [ scc.git] DEBUG Check current status 2024-04-19 08:08:53,943 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:53,947 [ scc.git] DEBUG 7b601e0 revert to snapshot 2024-04-19 08:08:53,948 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:53,992 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:54,362 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None 2024-04-19 08:08:54,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:55,223 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:08:55,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:08:56,041 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:08:56,044 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:08:56,105 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:08:56,106 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-19 08:08:56,106 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:56,113 [ scc.git] DEBUG Check current status 2024-04-19 08:08:56,113 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:56,120 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0 2024-04-19 08:08:56,121 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:56,178 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:56,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None 2024-04-19 08:08:56,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:57,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:08:57,789 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:08:58,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:08:58,251 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:08:58,297 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:08:58,298 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-19 08:08:58,298 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:08:58,302 [ scc.git] DEBUG Check current status 2024-04-19 08:08:58,303 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:08:58,308 [ scc.git] DEBUG a239fb6 revert to snapshot 2024-04-19 08:08:58,308 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:08:58,353 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:08:58,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None 2024-04-19 08:08:59,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:08:59,676 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:09:00,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:09:00,501 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:09:00,502 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:00,542 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:00,543 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-19 08:09:00,543 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:09:00,548 [ scc.git] DEBUG Check current status 2024-04-19 08:09:00,548 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:09:00,553 [ scc.git] DEBUG 1d30faf revert to snapshot 2024-04-19 08:09:00,553 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:09:00,603 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:09:00,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None 2024-04-19 08:09:01,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:09:01,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:09:02,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:09:02,689 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:09:02,691 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:02,735 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:02,736 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-19 08:09:02,736 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel' 2024-04-19 08:09:02,740 [ scc.git] DEBUG Check current status 2024-04-19 08:09:02,741 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:09:02,745 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-19 08:09:02,746 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:09:02,799 [ scc.config] DEBUG Found remote.origin.url 2024-04-19 08:09:03,198 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None 2024-04-19 08:09:03,699 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None 2024-04-19 08:09:04,109 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None 2024-04-19 08:09:04,611 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None 2024-04-19 08:09:05,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None 2024-04-19 08:09:05,026 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:05,068 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:05,068 [ scc.git] DEBUG Resetting... 2024-04-19 08:09:05,068 [ scc.git] DEBUG Calling 'git reset --hard HEAD' 2024-04-19 08:09:05,075 [ scc.git] DEBUG HEAD is now at 1548c55 merge master -Dorg -Snone 2024-04-19 08:09:05,075 [ scc.git] DEBUG Calling 'git submodule update --recursive' 2024-04-19 08:09:05,134 [ scc.git] DEBUG Check current status 2024-04-19 08:09:05,134 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD' 2024-04-19 08:09:05,139 [ scc.git] DEBUG 1548c55 merge master -Dorg -Snone 2024-04-19 08:09:05,139 [ scc.git] DEBUG Calling 'git submodule status' 2024-04-19 08:09:05,188 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820) 2024-04-19 08:09:05,190 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d) 2024-04-19 08:09:05,193 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0) 2024-04-19 08:09:05,196 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe) 2024-04-19 08:09:05,198 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6) 2024-04-19 08:09:05,201 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf) 2024-04-19 08:09:05,204 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63) 2024-04-19 08:09:05,205 [ scc.merge] INFO Merging Pull Request(s) based on master 2024-04-19 08:09:05,205 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization 2024-04-19 08:09:05,205 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies 2024-04-19 08:09:05,205 [ scc.merge] INFO Excluding Pull Request(s) staged as draft 2024-04-19 08:09:05,205 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking 2024-04-19 08:09:05,205 [ scc.merge] INFO Excluding Pull Request(s) without successful status 2024-04-19 08:09:05,205 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:05,500 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None 2024-04-19 08:09:05,954 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None 2024-04-19 08:09:05,955 [ scc.repo] DEBUG # ... Include label: dependencies 2024-04-19 08:09:06,800 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-19 08:09:07,259 [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-19 08:09:07,777 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None 2024-04-19 08:09:08,279 [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-19 08:09:08,280 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-19 08:09:08,280 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:09:08,280 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:08,280 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:08,286 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:09:08,289 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:09:08,290 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:09:08,294 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:09:08,299 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:08,300 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head' 2024-04-19 08:09:08,757 [ scc.git] DEBUG From https://github.com/ome/omero-build 2024-04-19 08:09:08,757 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD 2024-04-19 08:09:08,763 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:09:08,763 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:08,763 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:08,768 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f' 2024-04-19 08:09:08,774 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:08,780 [ 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-19 08:09:08,786 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:08,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:08,946 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:09:08,992 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:08,992 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:08,996 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:09,717 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None 2024-04-19 08:09:10,191 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None 2024-04-19 08:09:10,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None 2024-04-19 08:09:11,138 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-19 08:09:11,611 [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-19 08:09:12,112 [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-19 08:09:12,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None 2024-04-19 08:09:13,056 [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-19 08:09:13,057 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-19 08:09:13,523 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None 2024-04-19 08:09:13,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None 2024-04-19 08:09:14,503 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None 2024-04-19 08:09:14,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None 2024-04-19 08:09:15,450 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-19 08:09:15,917 [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-19 08:09:16,443 [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-19 08:09:16,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None 2024-04-19 08:09:17,316 [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-19 08:09:17,317 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning' 2024-04-19 08:09:17,771 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None 2024-04-19 08:09:18,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-19 08:09:18,735 [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-19 08:09:19,241 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None 2024-04-19 08:09:19,654 [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-19 08:09:19,657 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:09:20,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None 2024-04-19 08:09:20,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None 2024-04-19 08:09:21,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-19 08:09:21,574 [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-19 08:09:22,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None 2024-04-19 08:09:22,470 [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-19 08:09:22,471 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-19 08:09:22,471 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:09:22,472 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-19 08:09:22,472 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:22,472 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:22,477 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:09:22,485 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:09:22,485 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:09:22,492 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:09:22,499 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:22,499 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head' 2024-04-19 08:09:23,066 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-19 08:09:23,067 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD 2024-04-19 08:09:23,073 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head' 2024-04-19 08:09:23,472 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-19 08:09:23,473 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD 2024-04-19 08:09:23,479 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head' 2024-04-19 08:09:23,983 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-19 08:09:23,983 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD 2024-04-19 08:09:23,991 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head' 2024-04-19 08:09:24,417 [ scc.git] DEBUG From https://github.com/ome/omero-blitz 2024-04-19 08:09:24,417 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD 2024-04-19 08:09:24,423 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:09:24,423 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:24,423 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:24,429 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723' 2024-04-19 08:09:24,435 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:24,440 [ 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-19 08:09:24,477 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java 2024-04-19 08:09:24,479 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:24,482 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++ 2024-04-19 08:09:24,482 [ scc.git] DEBUG 1 file changed, 6 insertions(+) 2024-04-19 08:09:24,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:24,642 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87' 2024-04-19 08:09:24,652 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:24,658 [ 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-19 08:09:24,683 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:09:24,684 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:24,687 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:09:24,687 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:25,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:25,048 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-19 08:09:25,056 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:25,061 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9' 2024-04-19 08:09:25,123 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:25,126 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +- 2024-04-19 08:09:25,126 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:25,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:25,470 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189' 2024-04-19 08:09:25,480 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:25,484 [ 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-19 08:09:25,510 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:25,514 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++----- 2024-04-19 08:09:25,514 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-) 2024-04-19 08:09:25,888 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:25,889 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:09:25,931 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:25,931 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:25,935 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:25,974 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:09:25,983 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8703292310> has no local changes 2024-04-19 08:09:25,983 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:09:25,994 [ scc.git] DEBUG [detached HEAD 412fc853] merge master -Dorg -Ssuccess-only 2024-04-19 08:09:25,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:25,995 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:26,463 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None 2024-04-19 08:09:26,913 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None 2024-04-19 08:09:27,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None 2024-04-19 08:09:27,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-19 08:09:28,362 [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-19 08:09:28,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None 2024-04-19 08:09:29,287 [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-19 08:09:29,288 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-19 08:09:29,747 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None 2024-04-19 08:09:30,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None 2024-04-19 08:09:30,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-19 08:09:31,242 [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-19 08:09:31,705 [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-19 08:09:32,183 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None 2024-04-19 08:09:32,594 [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-19 08:09:32,595 [ scc.repo] DEBUG - PR 42 jburel 'include all' 2024-04-19 08:09:33,051 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None 2024-04-19 08:09:33,559 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-19 08:09:34,008 [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-19 08:09:34,495 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None 2024-04-19 08:09:34,925 [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-19 08:09:34,926 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:09:34,926 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:09:34,926 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-19 08:09:34,926 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:34,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:34,932 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:09:34,937 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:09:34,937 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:09:34,943 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:09:34,949 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:34,950 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head' 2024-04-19 08:09:35,366 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-19 08:09:35,366 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD 2024-04-19 08:09:35,373 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head' 2024-04-19 08:09:35,838 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-19 08:09:35,838 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD 2024-04-19 08:09:35,845 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head' 2024-04-19 08:09:36,270 [ scc.git] DEBUG From https://github.com/ome/omero-common 2024-04-19 08:09:36,270 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD 2024-04-19 08:09:36,275 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:09:36,275 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:36,275 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:36,279 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007' 2024-04-19 08:09:36,284 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:36,289 [ 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-19 08:09:36,304 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:09:36,306 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:36,309 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:09:36,309 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:36,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:36,465 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-19 08:09:36,471 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:36,477 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39' 2024-04-19 08:09:36,488 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:36,491 [ scc.git] DEBUG publish.gradle | 17 +---------------- 2024-04-19 08:09:36,491 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-) 2024-04-19 08:09:36,870 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:36,871 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170' 2024-04-19 08:09:36,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:36,886 [ 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-19 08:09:36,955 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:36,960 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 - 2024-04-19 08:09:36,960 [ scc.git] DEBUG 1 file changed, 1 deletion(-) 2024-04-19 08:09:37,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:37,283 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:09:37,337 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:37,337 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:37,344 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:37,407 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:09:37,418 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f87021eb640> has no local changes 2024-04-19 08:09:37,419 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:09:37,431 [ scc.git] DEBUG [detached HEAD 4387f58] merge master -Dorg -Ssuccess-only 2024-04-19 08:09:37,431 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:37,432 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:37,809 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None 2024-04-19 08:09:38,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None 2024-04-19 08:09:38,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None 2024-04-19 08:09:39,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None 2024-04-19 08:09:39,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-19 08:09:40,229 [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-19 08:09:40,735 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None 2024-04-19 08:09:41,158 [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-19 08:09:41,159 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:09:41,633 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None 2024-04-19 08:09:42,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None 2024-04-19 08:09:42,120 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:09:42,120 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-19 08:09:42,120 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:42,120 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:42,126 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:09:42,130 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:09:42,130 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:09:42,135 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:09:42,139 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:42,139 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head' 2024-04-19 08:09:42,727 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java 2024-04-19 08:09:42,727 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD 2024-04-19 08:09:42,734 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:09:42,734 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:42,734 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:42,740 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c' 2024-04-19 08:09:42,746 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:42,751 [ 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-19 08:09:42,779 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:09:42,780 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:42,783 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:09:42,783 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:42,947 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:42,949 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:09:43,005 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:43,006 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:43,012 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:43,071 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:09:43,081 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8701179af0> has no local changes 2024-04-19 08:09:43,082 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:09:43,096 [ scc.git] DEBUG [detached HEAD 084ed8e] merge master -Dorg -Ssuccess-only 2024-04-19 08:09:43,097 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:43,098 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:43,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None 2024-04-19 08:09:43,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None 2024-04-19 08:09:44,442 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-19 08:09:44,905 [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-19 08:09:45,420 [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-19 08:09:45,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None 2024-04-19 08:09:46,368 [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-19 08:09:46,369 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-19 08:09:46,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None 2024-04-19 08:09:47,336 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-19 08:09:47,881 [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-19 08:09:48,362 [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-19 08:09:48,861 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None 2024-04-19 08:09:49,278 [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-19 08:09:49,280 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-19 08:09:49,744 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None 2024-04-19 08:09:50,197 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None 2024-04-19 08:09:50,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-19 08:09:51,135 [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-19 08:09:51,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None 2024-04-19 08:09:52,050 [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-19 08:09:52,051 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:09:52,051 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:09:52,051 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-19 08:09:52,051 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:52,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:52,057 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:09:52,062 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:09:52,062 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:09:52,066 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:09:52,070 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:52,071 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head' 2024-04-19 08:09:52,468 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-19 08:09:52,469 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD 2024-04-19 08:09:52,474 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head' 2024-04-19 08:09:52,864 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-19 08:09:52,865 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD 2024-04-19 08:09:52,870 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head' 2024-04-19 08:09:53,468 [ scc.git] DEBUG From https://github.com/ome/omero-model 2024-04-19 08:09:53,468 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD 2024-04-19 08:09:53,473 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:09:53,473 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:53,473 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:53,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5' 2024-04-19 08:09:53,495 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:53,502 [ 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-19 08:09:53,547 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:09:53,548 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:53,551 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:09:53,551 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:53,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:53,716 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19' 2024-04-19 08:09:53,732 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:53,739 [ 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-19 08:09:53,765 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:53,768 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++- 2024-04-19 08:09:53,768 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-) 2024-04-19 08:09:54,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:54,123 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc' 2024-04-19 08:09:54,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:54,137 [ 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-19 08:09:54,147 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:09:54,148 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:54,150 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:09:54,150 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:54,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:54,537 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:09:54,581 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:54,582 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:54,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:54,628 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:09:54,635 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f870322f6a0> has no local changes 2024-04-19 08:09:54,635 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:09:54,645 [ scc.git] DEBUG [detached HEAD 8b690d6] merge master -Dorg -Ssuccess-only 2024-04-19 08:09:54,645 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:54,645 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:55,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None 2024-04-19 08:09:55,552 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None 2024-04-19 08:09:56,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-19 08:09:56,527 [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-19 08:09:57,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None 2024-04-19 08:09:57,506 [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-19 08:09:57,507 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:09:57,961 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None 2024-04-19 08:09:58,437 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None 2024-04-19 08:09:58,439 [ scc.repo] DEBUG # ... Exclude label: exclude 2024-04-19 08:09:58,439 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:09:58,440 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-19 08:09:58,440 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:58,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:58,446 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:09:58,450 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:09:58,451 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:09:58,455 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:09:58,461 [ scc.git] DEBUG Already up to date. 2024-04-19 08:09:58,461 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head' 2024-04-19 08:09:58,864 [ scc.git] DEBUG From https://github.com/ome/omero-renderer 2024-04-19 08:09:58,864 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD 2024-04-19 08:09:58,871 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:09:58,872 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:58,872 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:58,877 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751' 2024-04-19 08:09:58,881 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:58,884 [ 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-19 08:09:58,924 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:09:58,925 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:09:58,927 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:09:58,927 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:09:59,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:09:59,092 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:09:59,132 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:09:59,132 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:09:59,137 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:09:59,175 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:09:59,181 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f87021c4b80> has no local changes 2024-04-19 08:09:59,181 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:09:59,189 [ scc.git] DEBUG [detached HEAD 27c5619] merge master -Dorg -Ssuccess-only 2024-04-19 08:09:59,189 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:09:59,189 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:09:59,644 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None 2024-04-19 08:10:00,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None 2024-04-19 08:10:00,584 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-19 08:10:01,038 [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-19 08:10:01,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None 2024-04-19 08:10:02,025 [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-19 08:10:02,026 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:02,504 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None 2024-04-19 08:10:02,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None 2024-04-19 08:10:02,998 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:10:02,998 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-19 08:10:02,998 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:10:02,998 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:03,004 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:10:03,008 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:10:03,008 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:10:03,012 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:10:03,017 [ scc.git] DEBUG Already up to date. 2024-04-19 08:10:03,017 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head' 2024-04-19 08:10:03,487 [ scc.git] DEBUG From https://github.com/ome/omero-romio 2024-04-19 08:10:03,488 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD 2024-04-19 08:10:03,498 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:10:03,498 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:10:03,499 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:03,512 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d' 2024-04-19 08:10:03,526 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:03,536 [ 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-19 08:10:03,663 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:10:03,664 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:10:03,666 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:10:03,666 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:10:03,827 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:03,828 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:10:03,867 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:10:03,867 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:03,873 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:10:03,910 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:10:03,915 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f87021c49d0> has no local changes 2024-04-19 08:10:03,916 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:10:03,924 [ scc.git] DEBUG [detached HEAD 93ba827] merge master -Dorg -Ssuccess-only 2024-04-19 08:10:03,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:03,924 [ scc.repo] DEBUG ## PRs found: 2024-04-19 08:10:04,484 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None 2024-04-19 08:10:04,957 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None 2024-04-19 08:10:05,475 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-19 08:10:05,968 [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-19 08:10:06,435 [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-19 08:10:06,918 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None 2024-04-19 08:10:07,346 [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-19 08:10:07,347 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-19 08:10:07,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None 2024-04-19 08:10:08,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None 2024-04-19 08:10:08,799 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-19 08:10:09,296 [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-19 08:10:09,754 [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-19 08:10:10,229 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None 2024-04-19 08:10:10,675 [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-19 08:10:10,676 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-19 08:10:11,154 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None 2024-04-19 08:10:11,588 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None 2024-04-19 08:10:12,040 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None 2024-04-19 08:10:12,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None 2024-04-19 08:10:12,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-19 08:10:13,432 [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-19 08:10:13,948 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None 2024-04-19 08:10:14,388 [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-19 08:10:14,389 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc' 2024-04-19 08:10:14,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None 2024-04-19 08:10:15,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-19 08:10:15,795 [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-19 08:10:16,258 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None 2024-04-19 08:10:16,681 [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-19 08:10:16,682 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:17,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None 2024-04-19 08:10:17,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None 2024-04-19 08:10:18,151 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-19 08:10:18,619 [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-19 08:10:19,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None 2024-04-19 08:10:19,533 [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-19 08:10:19,533 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-19 08:10:19,534 [ scc.repo] DEBUG ## Branches found: 2024-04-19 08:10:19,534 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-19 08:10:19,534 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:10:19,534 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:19,539 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master' 2024-04-19 08:10:19,543 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included. 2024-04-19 08:10:19,543 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master' 2024-04-19 08:10:19,548 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master' 2024-04-19 08:10:19,554 [ scc.git] DEBUG Already up to date. 2024-04-19 08:10:19,554 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head' 2024-04-19 08:10:20,174 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-19 08:10:20,175 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD 2024-04-19 08:10:20,179 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head' 2024-04-19 08:10:20,554 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-19 08:10:20,554 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD 2024-04-19 08:10:20,560 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head' 2024-04-19 08:10:20,959 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-19 08:10:20,959 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD 2024-04-19 08:10:20,965 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head' 2024-04-19 08:10:21,413 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-19 08:10:21,413 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD 2024-04-19 08:10:21,419 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head' 2024-04-19 08:10:21,815 [ scc.git] DEBUG From https://github.com/ome/omero-server 2024-04-19 08:10:21,815 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD 2024-04-19 08:10:21,822 [ scc.git] DEBUG ## Unique users: [] 2024-04-19 08:10:21,822 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:10:21,822 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:21,833 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-19 08:10:21,841 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:21,845 [ 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-19 08:10:21,929 [ 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-19 08:10:21,930 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:10:21,930 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle 2024-04-19 08:10:21,930 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result. 2024-04-19 08:10:21,930 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U' 2024-04-19 08:10:21,937 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-19 08:10:21,946 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167 2024-04-19 08:10:22,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:22,102 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf' 2024-04-19 08:10:22,110 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc' 2024-04-19 08:10:22,125 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' Conflicting PR. Removed from build [OMERO-build-push#38](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/consoleText) for more details. Possible conflicts: - Upstream changes - build.gradle - .travis.yml --conflicts 2024-04-19 08:10:22,135 [ scc.config] DEBUG Found github.token 2024-04-19 08:10:22,136 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts. 2024-04-19 08:10:22,136 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374' 2024-04-19 08:10:22,148 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:22,161 [ 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-19 08:10:22,215 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:10:22,218 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:10:22,223 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:10:22,223 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:10:22,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:22,511 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-19 08:10:22,517 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:22,521 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d' 2024-04-19 08:10:22,574 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:10:22,577 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +- 2024-04-19 08:10:22,577 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:10:22,919 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:22,921 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8' 2024-04-19 08:10:22,928 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:22,935 [ 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-19 08:10:22,981 [ scc.git] DEBUG Auto-merging build.gradle 2024-04-19 08:10:22,982 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:10:22,986 [ scc.git] DEBUG build.gradle | 2 +- 2024-04-19 08:10:22,986 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-) 2024-04-19 08:10:23,334 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:23,335 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff' 2024-04-19 08:10:23,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:23,353 [ 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-19 08:10:23,384 [ scc.git] DEBUG Merge made by the 'ort' strategy. 2024-04-19 08:10:23,387 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++-- 2024-04-19 08:10:23,387 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-) 2024-04-19 08:10:23,742 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:23,743 [ scc.git] DEBUG Calling 'git submodule update' 2024-04-19 08:10:23,808 [ scc.git] DEBUG Get sha1 of %s 2024-04-19 08:10:23,809 [ scc.git] DEBUG Calling 'git rev-parse HEAD' 2024-04-19 08:10:23,819 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:10:23,872 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:10:23,885 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f87021bca30> has no local changes 2024-04-19 08:10:23,886 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:10:23,900 [ scc.git] DEBUG [detached HEAD 65be6336] merge master -Dorg -Ssuccess-only 2024-04-19 08:10:23,901 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:23,901 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path' 2024-04-19 08:10:23,957 [ scc.config] DEBUG Found submodule.omero-blitz.url 2024-04-19 08:10:24,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:24,168 [ scc.config] DEBUG Found submodule.omero-blitz.branch 2024-04-19 08:10:24,172 [ scc.config] DEBUG Found submodule.omero-common.url 2024-04-19 08:10:24,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:24,566 [ scc.config] DEBUG Found submodule.omero-common.branch 2024-04-19 08:10:24,571 [ scc.config] DEBUG Found submodule.omero-gateway-java.url 2024-04-19 08:10:24,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:24,983 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch 2024-04-19 08:10:24,989 [ scc.config] DEBUG Found submodule.omero-model.url 2024-04-19 08:10:25,383 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:25,397 [ scc.config] DEBUG Found submodule.omero-model.branch 2024-04-19 08:10:25,402 [ scc.config] DEBUG Found submodule.omero-renderer.url 2024-04-19 08:10:25,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:25,807 [ scc.config] DEBUG Found submodule.omero-renderer.branch 2024-04-19 08:10:25,811 [ scc.config] DEBUG Found submodule.omero-romio.url 2024-04-19 08:10:26,214 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:26,225 [ scc.config] DEBUG Found submodule.omero-romio.branch 2024-04-19 08:10:26,229 [ scc.config] DEBUG Found submodule.omero-server.url 2024-04-19 08:10:26,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None 2024-04-19 08:10:26,632 [ scc.config] DEBUG Found submodule.omero-server.branch 2024-04-19 08:10:26,632 [ scc.git] DEBUG Calling 'git status --porcelain' 2024-04-19 08:10:26,671 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8703f77550> has local changes 2024-04-19 08:10:26,671 [ 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#38 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/38/)' 2024-04-19 08:10:26,682 [ scc.git] DEBUG [detached HEAD 1173160] merge master -Dorg -Ssuccess-only 2024-04-19 08:10:26,682 [ scc.merge] INFO Repository: ome/omero-build 2024-04-19 08:10:26,683 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-) 2024-04-19 08:10:26,683 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,683 [ scc.merge] INFO 2024-04-19 08:10:26,683 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,683 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`' 2024-04-19 08:10:26,683 [ scc.merge] INFO 2024-04-19 08:10:26,683 [ scc.merge] INFO Repository: ome/omero-blitz 2024-04-19 08:10:26,683 [ scc.merge] INFO Excluded PRs: 2024-04-19 08:10:26,683 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft) 2024-04-19 08:10:26,683 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,683 [ scc.merge] INFO 2024-04-19 08:10:26,683 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,683 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account' 2024-04-19 08:10:26,683 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,683 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning' 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()' 2024-04-19 08:10:26,684 [ scc.merge] INFO 2024-04-19 08:10:26,684 [ scc.merge] INFO Repository: ome/omero-common 2024-04-19 08:10:26,684 [ scc.merge] INFO Excluded PRs: 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment) 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-19 08:10:26,684 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,684 [ scc.merge] INFO 2024-04-19 08:10:26,684 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 42 jburel 'include all' 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property' 2024-04-19 08:10:26,684 [ scc.merge] INFO 2024-04-19 08:10:26,684 [ scc.merge] INFO Repository: ome/omero-gateway-java 2024-04-19 08:10:26,684 [ scc.merge] INFO Excluded PRs: 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier) 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment) 2024-04-19 08:10:26,684 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,684 [ scc.merge] INFO 2024-04-19 08:10:26,684 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,684 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,684 [ scc.merge] INFO 2024-04-19 08:10:26,685 [ scc.merge] INFO Repository: ome/omero-model 2024-04-19 08:10:26,685 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,685 [ scc.merge] INFO 2024-04-19 08:10:26,685 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata' 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0' 2024-04-19 08:10:26,685 [ scc.merge] INFO 2024-04-19 08:10:26,685 [ scc.merge] INFO Repository: ome/omero-renderer 2024-04-19 08:10:26,685 [ scc.merge] INFO Excluded PRs: 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude) 2024-04-19 08:10:26,685 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,685 [ scc.merge] INFO 2024-04-19 08:10:26,685 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,685 [ scc.merge] INFO 2024-04-19 08:10:26,685 [ scc.merge] INFO Repository: ome/omero-romio 2024-04-19 08:10:26,685 [ scc.merge] INFO Excluded PRs: 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment) 2024-04-19 08:10:26,685 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,685 [ scc.merge] INFO 2024-04-19 08:10:26,685 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,685 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,685 [ scc.merge] INFO 2024-04-19 08:10:26,686 [ scc.merge] INFO Repository: ome/omero-server 2024-04-19 08:10:26,686 [ scc.merge] INFO Excluded PRs: 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft) 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment) 2024-04-19 08:10:26,686 [ scc.merge] INFO Already up to date. 2024-04-19 08:10:26,686 [ scc.merge] INFO 2024-04-19 08:10:26,686 [ scc.merge] INFO Merged PRs: 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0' 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 152 jburel 'Set class in doc' 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits' 2024-04-19 08:10:26,686 [ scc.merge] INFO 2024-04-19 08:10:26,686 [ scc.merge] INFO Conflicting PRs (not included): 2024-04-19 08:10:26,686 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks' 2024-04-19 08:10:26,686 [ scc.merge] INFO 2024-04-19 08:10:26,686 [ scc.merge] DEBUG Cleaning remote branches created for merging 2024-04-19 08:10:26,686 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,692 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz 2024-04-19 08:10:26,692 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:26,697 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common 2024-04-19 08:10:26,697 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:26,701 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java 2024-04-19 08:10:26,701 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:26,705 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model 2024-04-19 08:10:26,705 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:26,709 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer 2024-04-19 08:10:26,709 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:26,713 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio 2024-04-19 08:10:26,713 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push 2024-04-19 08:10:26,719 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server 2024-04-19 08:10:26,719 [ scc.git] DEBUG Calling 'git remote' 2024-04-19 08:10:26,724 [ 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 dda7ea89] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) Entering 'omero-common' [detached HEAD e119d7b] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-gateway-java' [detached HEAD d7cebdd] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-model' [detached HEAD ca87979] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-renderer' [detached HEAD 72624f8] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-romio' [detached HEAD 55d1924] Update component versions 1 file changed, 1 insertion(+), 1 deletion(-) Entering 'omero-server' [detached HEAD 77b89e6c] Update component versions 1 file changed, 2 insertions(+), 2 deletions(-) [detached HEAD c6809f5] Update component versions 7 files changed, 7 insertions(+), 7 deletions(-) 2024-04-19 08:11:03,476 [ 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