Started by upstream project "Trigger" build number 42
originally caused by:
Started by timer
[Pipeline] Start of Pipeline
[Pipeline] node
Running on testintegration in /home/omero/workspace/OMERO-build-push
[Pipeline] {
[Pipeline] library
Loading library recursiveMerge@master
Attempting to resolve master from remote references...
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git ls-remote -- https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Found match: refs/heads/master revision f061dff15033c5cd55249a383f52c15ca4a0e5cf
The recommended git tool is: NONE
No credentials specified
> git rev-parse --resolve-git-dir /var/jenkins_home/jobs/OMERO-build-push/workspace@libs/3527f795de077758b82663f7b48798100750860c75e4099522d51863b08dc748/.git # timeout=10
Fetching changes from the remote Git repository
> git config remote.origin.url https://github.com/ome/jenkins-library-recursivemerge.git # timeout=10
Fetching without tags
Fetching upstream changes from https://github.com/ome/jenkins-library-recursivemerge.git
> git --version # timeout=10
> git --version # 'git version 2.39.2'
> git fetch --no-tags --force --progress -- https://github.com/ome/jenkins-library-recursivemerge.git +refs/heads/*:refs/remotes/origin/* # timeout=10
Checking out Revision f061dff15033c5cd55249a383f52c15ca4a0e5cf (master)
> git config core.sparsecheckout # timeout=10
> git checkout -f f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
Commit message: "Merge pull request #17 from jburel/python3"
> git rev-list --no-walk f061dff15033c5cd55249a383f52c15ca4a0e5cf # timeout=10
[Pipeline] checkout
The recommended git tool is: NONE
No credentials specified
Fetching changes from the remote Git repository
Checking out Revision be302339afbcb58c8fe5fb6ab3932873d847cd68 (refs/remotes/origin/master)
> git rev-parse --resolve-git-dir /home/omero/workspace/OMERO-build-push/.git # timeout=10
> git config remote.origin.url https://github.com/ome/omero-build.git # timeout=10
Fetching upstream changes from https://github.com/ome/omero-build.git
> git --version # timeout=10
> git --version # 'git version 2.39.3'
> git fetch --tags --force --progress -- https://github.com/ome/omero-build.git +refs/heads/*:refs/remotes/origin/* # timeout=10
> git rev-parse refs/remotes/origin/master^{commit} # timeout=10
> git config core.sparsecheckout # timeout=10
> git checkout -f be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10
Commit message: "Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f"
> git rev-list --no-walk be302339afbcb58c8fe5fb6ab3932873d847cd68 # timeout=10
Cleaning workspace
> git rev-parse --verify HEAD # timeout=10
Resetting working tree
> git reset --hard # timeout=10
> git clean -fdx # timeout=10
> git submodule foreach --recursive git reset --hard # timeout=10
> git submodule foreach --recursive git clean -fdx # timeout=10
> git remote # timeout=10
> git submodule init # timeout=10
> git submodule sync # timeout=10
> git config --get remote.origin.url # timeout=10
> git submodule init # timeout=10
> git config -f .gitmodules --get-regexp ^submodule\.(.+)\.url # timeout=10
> git config --get submodule.omero-model.url # timeout=10
> git config -f .gitmodules --get submodule.omero-model.path # timeout=10
> git config --get submodule.omero-common.url # timeout=10
> git config -f .gitmodules --get submodule.omero-common.path # timeout=10
> git config --get submodule.omero-romio.url # timeout=10
> git config -f .gitmodules --get submodule.omero-romio.path # timeout=10
> git config --get submodule.omero-renderer.url # timeout=10
> git config -f .gitmodules --get submodule.omero-renderer.path # timeout=10
> git config --get submodule.omero-server.url # timeout=10
> git config -f .gitmodules --get submodule.omero-server.path # timeout=10
> git config --get submodule.omero-blitz.url # timeout=10
> git config -f .gitmodules --get submodule.omero-blitz.path # timeout=10
> git config --get submodule.omero-gateway-java.url # timeout=10
> git config -f .gitmodules --get submodule.omero-gateway-java.path # timeout=10
> git submodule update --init --recursive omero-model # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-gradle-plugins-push" build number 37
[Pipeline] sh
> git submodule update --init --recursive omero-common # timeout=10
> git submodule update --init --recursive omero-romio # timeout=10
> git submodule update --init --recursive omero-renderer # timeout=10
> git submodule update --init --recursive omero-server # timeout=10
> git submodule update --init --recursive omero-blitz # timeout=10
> git submodule update --init --recursive omero-gateway-java # timeout=10
+ pushd build
~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
+ popd
~/workspace/OMERO-build-push
+ python3 -m venv build/venv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-build-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.0-py3-none-any.whl (2.1 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.0
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.19.1-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB)
Collecting future (from scc)
Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB)
Collecting ruamel.yaml (from scc)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB)
Collecting ruamel.yaml.jinja2 (from scc)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB)
Collecting six (from scc)
Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.18-py2.py3-none-any.whl.metadata (48 kB)
Collecting yaclifw<0.3,>=0.2.0 (from scc)
Using cached yaclifw-0.2.0-py3-none-any.whl
Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.31.0-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.11.0-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.3 kB)
Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.2.2-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.19.1-py3-none-any.whl (48 kB)
Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB)
Using cached urllib3-1.26.18-py2.py3-none-any.whl (143 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.8.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.31.0-py3-none-any.whl (62 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.11.0-py3-none-any.whl (34 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.2.2-py3-none-any.whl (163 kB)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl (4.6 MB)
Using cached idna-3.7-py3-none-any.whl (66 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.2.2 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-42.0.5 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.31.0 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.19.1 six-1.16.0 typing-extensions-4.11.0 urllib3-1.26.18 wrapt-1.16.0 yaclifw-0.2.0
[Pipeline] sh
+ export BASE_REPO=omero-build.git
+ BASE_REPO=omero-build.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-build-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-04-18 00:21:27,318 [ scc.config] DEBUG Found github.token
2024-04-18 00:21:27,321 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-18 00:21:27,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:21:27,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:21:28,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-18 00:21:28,403 [ scc.gh] DEBUG 4862 remaining from 5000 (Reset at 01:04
2024-04-18 00:21:28,403 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:28,408 [ scc.git] DEBUG Check current status
2024-04-18 00:21:28,409 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:28,413 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f
2024-04-18 00:21:28,413 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:28,455 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-18 00:21:28,458 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-18 00:21:28,461 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-18 00:21:28,465 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-18 00:21:28,468 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-18 00:21:28,470 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-18 00:21:28,521 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6)
2024-04-18 00:21:28,526 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:28,884 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-04-18 00:21:29,344 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:29,755 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:30,165 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:30,580 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:30,581 [ scc.git] DEBUG Resetting...
2024-04-18 00:21:30,581 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-18 00:21:30,588 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f
2024-04-18 00:21:30,588 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-18 00:21:30,663 [ scc.git] DEBUG Check current status
2024-04-18 00:21:30,664 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:30,668 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f
2024-04-18 00:21:30,668 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:30,709 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-18 00:21:30,711 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-18 00:21:30,714 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-18 00:21:30,717 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-18 00:21:30,719 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-18 00:21:30,722 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-18 00:21:30,724 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6)
2024-04-18 00:21:30,725 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-18 00:21:30,726 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-18 00:21:30,726 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-18 00:21:30,726 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-18 00:21:30,726 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-18 00:21:30,726 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:21:31,092 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None
2024-04-18 00:21:31,595 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None
2024-04-18 00:21:31,596 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:21:31,596 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-18 00:21:31,596 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:21:31,596 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:21:31,597 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:31,602 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:21:31,606 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:21:31,606 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:21:31,611 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:21:31,617 [ scc.git] DEBUG Already up to date.
2024-04-18 00:21:31,617 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head'
2024-04-18 00:21:31,996 [ scc.git] DEBUG From https://github.com/ome/omero-build
2024-04-18 00:21:31,996 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD
2024-04-18 00:21:32,001 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:21:32,002 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:21:32,002 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:32,006 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f'
2024-04-18 00:21:32,040 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:32,044 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Snone: PR 185 (Bump omero-server from `82d598f` to `f67fdb6`) a76e76cd9b8fc401d649bcdc06a22f5cd785d51f'
2024-04-18 00:21:32,054 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:21:32,057 [ scc.git] DEBUG omero-server | 2 +-
2024-04-18 00:21:32,057 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:21:32,225 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:21:32,226 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:21:32,319 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc'
2024-04-18 00:21:32,320 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:21:32,320 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:32,325 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:21:32,470 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7ff882b11550> has no local changes
2024-04-18 00:21:32,471 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:21:32,508 [ scc.git] DEBUG [detached HEAD 2c50e53] merge master -Dorg -Snone
2024-04-18 00:21:32,508 [ scc.merge] INFO Repository: ome/omero-build
2024-04-18 00:21:32,509 [ scc.merge] INFO Already up to date.
2024-04-18 00:21:32,509 [ scc.merge] INFO
2024-04-18 00:21:32,509 [ scc.merge] INFO Merged PRs:
2024-04-18 00:21:32,509 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-18 00:21:32,509 [ scc.merge] INFO
2024-04-18 00:21:32,509 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:21:32,509 [ 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-18 00:21:35,894 [ scc.config] DEBUG Found github.token
2024-04-18 00:21:35,897 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-18 00:21:36,125 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:21:36,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:21:36,924 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-18 00:21:36,926 [ scc.gh] DEBUG 4852 remaining from 5000 (Reset at 01:04
2024-04-18 00:21:36,926 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:36,931 [ scc.git] DEBUG Check current status
2024-04-18 00:21:36,931 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:36,935 [ scc.git] DEBUG 2c50e53 merge master -Dorg -Snone
2024-04-18 00:21:36,935 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:36,978 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-18 00:21:36,982 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-18 00:21:36,985 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-18 00:21:36,989 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-18 00:21:36,992 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-18 00:21:36,995 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-18 00:21:36,999 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63)
2024-04-18 00:21:37,004 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:37,392 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-04-18 00:21:37,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:38,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:38,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:39,140 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:39,143 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:39,198 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-04-18 00:21:39,198 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:39,202 [ scc.git] DEBUG Check current status
2024-04-18 00:21:39,202 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:39,206 [ scc.git] DEBUG 1c874820 revert to snapshot
2024-04-18 00:21:39,206 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:39,250 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:39,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2024-04-18 00:21:40,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:40,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:40,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:41,370 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:41,372 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:41,421 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:41,422 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-04-18 00:21:41,422 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:41,427 [ scc.git] DEBUG Check current status
2024-04-18 00:21:41,427 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:41,432 [ scc.git] DEBUG d19036d revert to snapshot
2024-04-18 00:21:41,433 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:41,485 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:41,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2024-04-18 00:21:42,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:42,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:43,112 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:43,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:43,521 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:43,560 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:43,561 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-04-18 00:21:43,561 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:43,565 [ scc.git] DEBUG Check current status
2024-04-18 00:21:43,565 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:43,569 [ scc.git] DEBUG 7b601e0 revert to snapshot
2024-04-18 00:21:43,569 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:43,610 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:43,996 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2024-04-18 00:21:44,456 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:44,882 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:45,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:45,728 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:45,729 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:45,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:45,773 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-04-18 00:21:45,773 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:45,779 [ scc.git] DEBUG Check current status
2024-04-18 00:21:45,779 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:45,784 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0
2024-04-18 00:21:45,785 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:45,828 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:46,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2024-04-18 00:21:46,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:47,106 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:47,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:47,945 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:47,946 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:47,986 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:47,987 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-04-18 00:21:47,987 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:47,991 [ scc.git] DEBUG Check current status
2024-04-18 00:21:47,991 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:47,995 [ scc.git] DEBUG a239fb6 revert to snapshot
2024-04-18 00:21:47,996 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:48,038 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:48,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2024-04-18 00:21:48,849 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:49,272 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:49,700 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:50,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:50,119 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:50,173 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:50,175 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-04-18 00:21:50,176 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:50,186 [ scc.git] DEBUG Check current status
2024-04-18 00:21:50,187 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:50,193 [ scc.git] DEBUG 1d30faf revert to snapshot
2024-04-18 00:21:50,194 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:50,271 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:50,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2024-04-18 00:21:51,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:51,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:51,952 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:52,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:52,370 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:52,423 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:52,424 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-04-18 00:21:52,424 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-18 00:21:52,431 [ scc.git] DEBUG Check current status
2024-04-18 00:21:52,432 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:52,437 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167
2024-04-18 00:21:52,438 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:52,495 [ scc.config] DEBUG Found remote.origin.url
2024-04-18 00:21:52,867 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2024-04-18 00:21:53,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-18 00:21:53,748 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-18 00:21:54,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-18 00:21:54,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-18 00:21:54,586 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:21:54,632 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:21:54,632 [ scc.git] DEBUG Resetting...
2024-04-18 00:21:54,632 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-18 00:21:54,640 [ scc.git] DEBUG HEAD is now at 2c50e53 merge master -Dorg -Snone
2024-04-18 00:21:54,641 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-18 00:21:54,717 [ scc.git] DEBUG Check current status
2024-04-18 00:21:54,717 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-18 00:21:54,721 [ scc.git] DEBUG 2c50e53 merge master -Dorg -Snone
2024-04-18 00:21:54,722 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-18 00:21:54,767 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-18 00:21:54,770 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-18 00:21:54,773 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-18 00:21:54,777 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-18 00:21:54,780 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-18 00:21:54,783 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-18 00:21:54,786 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63)
2024-04-18 00:21:54,787 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-18 00:21:54,787 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-18 00:21:54,787 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-18 00:21:54,787 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-18 00:21:54,787 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-18 00:21:54,787 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-18 00:21:54,787 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:21:55,078 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None
2024-04-18 00:21:55,536 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None
2024-04-18 00:21:55,538 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-18 00:21:56,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None
2024-04-18 00:21:56,539 [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-18 00:21:57,052 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None
2024-04-18 00:21:57,478 [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-18 00:21:57,479 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-18 00:21:57,479 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:21:57,479 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:21:57,479 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:57,487 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:21:57,495 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:21:57,495 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:21:57,503 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:21:57,511 [ scc.git] DEBUG Already up to date.
2024-04-18 00:21:57,512 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head'
2024-04-18 00:21:57,958 [ scc.git] DEBUG From https://github.com/ome/omero-build
2024-04-18 00:21:57,959 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD
2024-04-18 00:21:57,965 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:21:57,965 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:21:57,965 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:57,970 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f'
2024-04-18 00:21:57,976 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:57,981 [ 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-18 00:21:57,987 [ scc.git] DEBUG Already up to date.
2024-04-18 00:21:58,145 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:21:58,147 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:21:58,222 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:21:58,223 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:21:58,228 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:21:58,711 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2024-04-18 00:21:59,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None
2024-04-18 00:21:59,671 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None
2024-04-18 00:22:00,169 [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-18 00:22:00,632 [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-18 00:22:01,070 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None
2024-04-18 00:22:01,483 [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-18 00:22:01,484 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()'
2024-04-18 00:22:01,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None
2024-04-18 00:22:02,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None
2024-04-18 00:22:02,892 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2024-04-18 00:22:03,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2024-04-18 00:22:03,854 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-04-18 00:22:04,326 [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-18 00:22:04,775 [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-18 00:22:05,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-04-18 00:22:05,647 [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-18 00:22:05,648 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2024-04-18 00:22:06,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None
2024-04-18 00:22:06,608 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-04-18 00:22:07,109 [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-18 00:22:07,586 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-04-18 00:22:08,016 [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-18 00:22:08,017 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:22:08,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2024-04-18 00:22:08,977 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2024-04-18 00:22:09,462 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-04-18 00:22:09,921 [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-18 00:22:10,401 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-04-18 00:22:10,821 [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-18 00:22:10,822 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-04-18 00:22:10,822 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:22:10,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-04-18 00:22:10,822 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:10,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:10,830 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:22:10,836 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:22:10,836 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:22:10,846 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:22:10,854 [ scc.git] DEBUG Already up to date.
2024-04-18 00:22:10,854 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2024-04-18 00:22:11,309 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-18 00:22:11,309 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2024-04-18 00:22:11,315 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-18 00:22:11,682 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-18 00:22:11,682 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-18 00:22:11,689 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2024-04-18 00:22:12,201 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-18 00:22:12,201 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2024-04-18 00:22:12,208 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head'
2024-04-18 00:22:12,659 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-18 00:22:12,659 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD
2024-04-18 00:22:12,665 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:22:12,665 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:12,665 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:12,670 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-04-18 00:22:12,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:12,683 [ 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-18 00:22:12,711 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2024-04-18 00:22:12,713 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:12,716 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2024-04-18 00:22:12,716 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-04-18 00:22:12,883 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:12,884 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87'
2024-04-18 00:22:12,890 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:12,894 [ 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-18 00:22:12,921 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:22:12,922 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:12,927 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:22:12,927 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:13,279 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:13,280 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9'
2024-04-18 00:22:13,288 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:13,295 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9'
2024-04-18 00:22:13,346 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:13,349 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2024-04-18 00:22:13,350 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:13,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:13,698 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189'
2024-04-18 00:22:13,707 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:13,714 [ 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-18 00:22:13,742 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:13,745 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++-----
2024-04-18 00:22:13,745 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-)
2024-04-18 00:22:14,115 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:14,116 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:22:14,174 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:14,174 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:14,180 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:22:14,228 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:22:14,238 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d172b310> has no local changes
2024-04-18 00:22:14,239 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:22:14,252 [ scc.git] DEBUG [detached HEAD ed694fe6] merge master -Dorg -Ssuccess-only
2024-04-18 00:22:14,253 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:22:14,253 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:22:14,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2024-04-18 00:22:15,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None
2024-04-18 00:22:15,616 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None
2024-04-18 00:22:16,094 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None
2024-04-18 00:22:16,526 [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-18 00:22:16,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None
2024-04-18 00:22:17,379 [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-18 00:22:17,380 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property'
2024-04-18 00:22:17,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2024-04-18 00:22:18,307 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2024-04-18 00:22:18,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-04-18 00:22:19,407 [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-18 00:22:19,893 [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-18 00:22:20,376 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-04-18 00:22:20,813 [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-18 00:22:20,813 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2024-04-18 00:22:21,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None
2024-04-18 00:22:21,783 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-04-18 00:22:22,253 [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-18 00:22:22,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-04-18 00:22:23,126 [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-18 00:22:23,126 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:22:23,127 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:22:23,127 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-04-18 00:22:23,127 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:23,127 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:23,132 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:22:23,136 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:22:23,137 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:22:23,142 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:22:23,147 [ scc.git] DEBUG Already up to date.
2024-04-18 00:22:23,148 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head'
2024-04-18 00:22:23,532 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-04-18 00:22:23,532 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD
2024-04-18 00:22:23,538 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2024-04-18 00:22:23,973 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-04-18 00:22:23,973 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2024-04-18 00:22:23,979 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head'
2024-04-18 00:22:24,362 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-04-18 00:22:24,362 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD
2024-04-18 00:22:24,367 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:22:24,367 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:24,367 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:24,372 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007'
2024-04-18 00:22:24,377 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:24,381 [ 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-18 00:22:24,407 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:22:24,408 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:24,411 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:22:24,411 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:24,561 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:24,563 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-04-18 00:22:24,570 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:24,576 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-04-18 00:22:24,590 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:24,593 [ scc.git] DEBUG publish.gradle | 17 +----------------
2024-04-18 00:22:24,593 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2024-04-18 00:22:24,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:24,976 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170'
2024-04-18 00:22:24,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:24,990 [ 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-18 00:22:25,016 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:25,020 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 -
2024-04-18 00:22:25,020 [ scc.git] DEBUG 1 file changed, 1 deletion(-)
2024-04-18 00:22:25,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:25,396 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:22:25,443 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:25,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:25,449 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:22:25,493 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:22:25,500 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d0684640> has no local changes
2024-04-18 00:22:25,500 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:22:25,510 [ scc.git] DEBUG [detached HEAD 7b75dde] merge master -Dorg -Ssuccess-only
2024-04-18 00:22:25,510 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:22:25,510 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:22:25,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2024-04-18 00:22:26,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None
2024-04-18 00:22:26,895 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None
2024-04-18 00:22:27,359 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None
2024-04-18 00:22:27,853 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-04-18 00:22:28,321 [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-18 00:22:28,823 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-04-18 00:22:29,247 [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-18 00:22:29,248 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:22:29,715 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2024-04-18 00:22:30,226 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2024-04-18 00:22:30,228 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:22:30,228 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-04-18 00:22:30,228 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:30,229 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:30,233 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:22:30,238 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:22:30,239 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:22:30,244 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:22:30,249 [ scc.git] DEBUG Already up to date.
2024-04-18 00:22:30,250 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-18 00:22:30,639 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-04-18 00:22:30,640 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-18 00:22:30,645 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:22:30,645 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:30,645 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:30,650 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c'
2024-04-18 00:22:30,657 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:30,662 [ 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-18 00:22:30,687 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:22:30,688 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:30,691 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:22:30,691 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:30,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:30,846 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:22:30,902 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:30,902 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:30,907 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:22:30,954 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:22:30,963 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d0614af0> has no local changes
2024-04-18 00:22:30,963 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:22:30,978 [ scc.git] DEBUG [detached HEAD 1924c37] merge master -Dorg -Ssuccess-only
2024-04-18 00:22:30,978 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:22:30,979 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:22:31,352 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None
2024-04-18 00:22:31,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None
2024-04-18 00:22:32,356 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None
2024-04-18 00:22:32,863 [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-18 00:22:33,374 [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-18 00:22:33,875 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None
2024-04-18 00:22:34,294 [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-18 00:22:34,296 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
2024-04-18 00:22:34,763 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None
2024-04-18 00:22:35,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None
2024-04-18 00:22:35,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-04-18 00:22:36,189 [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-18 00:22:36,624 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-04-18 00:22:37,048 [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-18 00:22:37,048 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:22:37,048 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:22:37,048 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-04-18 00:22:37,049 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:37,049 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:37,055 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:22:37,060 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:22:37,061 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:22:37,067 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:22:37,075 [ scc.git] DEBUG Already up to date.
2024-04-18 00:22:37,075 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-04-18 00:22:37,487 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-04-18 00:22:37,487 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-04-18 00:22:37,493 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head'
2024-04-18 00:22:37,960 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-04-18 00:22:37,961 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD
2024-04-18 00:22:37,969 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:22:37,970 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:37,970 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:37,983 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5'
2024-04-18 00:22:37,991 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:37,999 [ 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-18 00:22:38,067 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:22:38,069 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:38,072 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:22:38,072 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:38,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:38,237 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19'
2024-04-18 00:22:38,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:38,266 [ 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-18 00:22:38,301 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:38,307 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++-
2024-04-18 00:22:38,307 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-)
2024-04-18 00:22:38,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:38,668 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:22:38,715 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:38,715 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:38,720 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:22:38,763 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:22:38,772 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d16c86a0> has no local changes
2024-04-18 00:22:38,773 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-model
Already up to date.
Merged PRs:
- PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
Generated by OMERO-build-push#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:22:38,784 [ scc.git] DEBUG [detached HEAD 01aed55] merge master -Dorg -Ssuccess-only
2024-04-18 00:22:38,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:22:38,785 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:22:39,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2024-04-18 00:22:39,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None
2024-04-18 00:22:40,202 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-04-18 00:22:40,720 [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-18 00:22:41,219 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-04-18 00:22:41,635 [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-18 00:22:41,636 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:22:42,091 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2024-04-18 00:22:42,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2024-04-18 00:22:42,573 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-18 00:22:42,574 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:22:42,574 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-04-18 00:22:42,574 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:42,574 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:42,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:22:42,587 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:22:42,587 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:22:42,594 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:22:42,601 [ scc.git] DEBUG Already up to date.
2024-04-18 00:22:42,601 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-18 00:22:43,035 [ scc.git] DEBUG From https://github.com/ome/omero-renderer
2024-04-18 00:22:43,035 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-18 00:22:43,042 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:22:43,042 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:43,043 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:43,049 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751'
2024-04-18 00:22:43,058 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:43,064 [ 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-18 00:22:43,095 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:22:43,096 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:43,099 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:22:43,099 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:43,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:43,251 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:22:43,301 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:43,301 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:43,307 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:22:43,355 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:22:43,363 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d0668b80> has no local changes
2024-04-18 00:22:43,363 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:22:43,376 [ scc.git] DEBUG [detached HEAD b9002c4] merge master -Dorg -Ssuccess-only
2024-04-18 00:22:43,377 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:22:43,377 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:22:43,797 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2024-04-18 00:22:44,245 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None
2024-04-18 00:22:44,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-04-18 00:22:45,213 [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-18 00:22:45,659 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-04-18 00:22:46,082 [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-18 00:22:46,083 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:22:46,543 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2024-04-18 00:22:47,031 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2024-04-18 00:22:47,033 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:22:47,033 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-04-18 00:22:47,033 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:47,033 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:47,038 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:22:47,044 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:22:47,044 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:22:47,050 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:22:47,055 [ scc.git] DEBUG Already up to date.
2024-04-18 00:22:47,056 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head'
2024-04-18 00:22:47,482 [ scc.git] DEBUG From https://github.com/ome/omero-romio
2024-04-18 00:22:47,482 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD
2024-04-18 00:22:47,489 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:22:47,489 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:47,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:47,496 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d'
2024-04-18 00:22:47,503 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:47,511 [ 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-18 00:22:47,551 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:22:47,553 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:22:47,556 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:22:47,556 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:22:47,709 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:22:47,710 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:22:47,771 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:22:47,771 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:22:47,776 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:22:47,818 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:22:47,825 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d06689d0> has no local changes
2024-04-18 00:22:47,826 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:22:47,837 [ scc.git] DEBUG [detached HEAD a7e830b] merge master -Dorg -Ssuccess-only
2024-04-18 00:22:47,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:22:47,838 [ scc.repo] DEBUG ## PRs found:
2024-04-18 00:22:48,308 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2024-04-18 00:22:48,778 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None
2024-04-18 00:22:49,292 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-04-18 00:22:49,783 [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-18 00:22:50,246 [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-18 00:22:50,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-04-18 00:22:51,189 [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-18 00:22:51,190 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits'
2024-04-18 00:22:51,654 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None
2024-04-18 00:22:52,113 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None
2024-04-18 00:22:52,601 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None
2024-04-18 00:22:53,077 [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-18 00:22:53,569 [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-18 00:22:54,003 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None
2024-04-18 00:22:54,425 [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-18 00:22:54,426 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28'
2024-04-18 00:22:54,878 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2024-04-18 00:22:55,350 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2024-04-18 00:22:55,805 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2024-04-18 00:22:56,266 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2024-04-18 00:22:56,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-04-18 00:22:57,237 [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-18 00:22:57,725 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-04-18 00:22:58,140 [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-18 00:22:58,141 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2024-04-18 00:22:58,582 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None
2024-04-18 00:22:59,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-04-18 00:22:59,535 [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-18 00:23:00,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-04-18 00:23:00,457 [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-18 00:23:00,457 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:00,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2024-04-18 00:23:01,364 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2024-04-18 00:23:01,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-04-18 00:23:02,295 [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-18 00:23:02,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-04-18 00:23:03,231 [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-18 00:23:03,232 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-04-18 00:23:03,232 [ scc.repo] DEBUG ## Branches found:
2024-04-18 00:23:03,232 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-04-18 00:23:03,233 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:23:03,233 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:03,238 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-18 00:23:03,243 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-18 00:23:03,243 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-18 00:23:03,249 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-18 00:23:03,255 [ scc.git] DEBUG Already up to date.
2024-04-18 00:23:03,256 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2024-04-18 00:23:03,720 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-18 00:23:03,720 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2024-04-18 00:23:03,725 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head'
2024-04-18 00:23:04,118 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-18 00:23:04,118 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD
2024-04-18 00:23:04,123 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2024-04-18 00:23:04,538 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-18 00:23:04,538 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2024-04-18 00:23:04,543 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head'
2024-04-18 00:23:04,975 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-18 00:23:04,976 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD
2024-04-18 00:23:04,980 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head'
2024-04-18 00:23:05,392 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-18 00:23:05,392 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD
2024-04-18 00:23:05,396 [ scc.git] DEBUG ## Unique users: []
2024-04-18 00:23:05,396 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:23:05,396 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:05,401 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-04-18 00:23:05,408 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:05,413 [ 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-18 00:23:05,880 [ 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-18 00:23:05,880 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:23:05,881 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2024-04-18 00:23:05,881 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-18 00:23:05,881 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-18 00:23:05,889 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc'
2024-04-18 00:23:05,899 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167
2024-04-18 00:23:06,072 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:06,073 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-04-18 00:23:06,080 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc'
2024-04-18 00:23:06,086 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#37](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .travis.yml
- build.gradle
--conflicts
2024-04-18 00:23:06,089 [ scc.config] DEBUG Found github.token
2024-04-18 00:23:06,089 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2024-04-18 00:23:06,089 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374'
2024-04-18 00:23:06,094 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:06,098 [ 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-18 00:23:06,127 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:23:06,128 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:23:06,131 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:23:06,131 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:23:06,482 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:06,483 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2024-04-18 00:23:06,490 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:06,494 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2024-04-18 00:23:06,561 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:23:06,564 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2024-04-18 00:23:06,564 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:23:06,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:06,881 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8'
2024-04-18 00:23:06,887 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:06,891 [ 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-18 00:23:06,949 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-18 00:23:06,950 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:23:06,953 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-18 00:23:06,953 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-18 00:23:07,287 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:07,288 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff'
2024-04-18 00:23:07,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:07,299 [ 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-18 00:23:07,327 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-18 00:23:07,330 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++--
2024-04-18 00:23:07,330 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2024-04-18 00:23:07,688 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:07,689 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-18 00:23:07,727 [ scc.git] DEBUG Get sha1 of %s
2024-04-18 00:23:07,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-18 00:23:07,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:23:07,772 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:23:07,781 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d066aa30> has no local changes
2024-04-18 00:23:07,782 [ 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#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:23:07,792 [ scc.git] DEBUG [detached HEAD aecd8905] merge master -Dorg -Ssuccess-only
2024-04-18 00:23:07,793 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:07,793 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-18 00:23:07,849 [ scc.config] DEBUG Found submodule.omero-blitz.url
2024-04-18 00:23:08,100 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:08,110 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2024-04-18 00:23:08,113 [ scc.config] DEBUG Found submodule.omero-common.url
2024-04-18 00:23:08,515 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:08,526 [ scc.config] DEBUG Found submodule.omero-common.branch
2024-04-18 00:23:08,530 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2024-04-18 00:23:08,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:08,940 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2024-04-18 00:23:08,944 [ scc.config] DEBUG Found submodule.omero-model.url
2024-04-18 00:23:09,339 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:09,348 [ scc.config] DEBUG Found submodule.omero-model.branch
2024-04-18 00:23:09,353 [ scc.config] DEBUG Found submodule.omero-renderer.url
2024-04-18 00:23:09,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:09,755 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2024-04-18 00:23:09,759 [ scc.config] DEBUG Found submodule.omero-romio.url
2024-04-18 00:23:10,156 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:10,165 [ scc.config] DEBUG Found submodule.omero-romio.branch
2024-04-18 00:23:10,168 [ scc.config] DEBUG Found submodule.omero-server.url
2024-04-18 00:23:10,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-18 00:23:10,563 [ scc.config] DEBUG Found submodule.omero-server.branch
2024-04-18 00:23:10,563 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-18 00:23:10,604 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f31d240d550> has local changes
2024-04-18 00:23:10,605 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-build
Already up to date.
Merged PRs:
- PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
Repository: ome/omero-blitz
Excluded PRs:
- PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft)
Already up to date.
Merged PRs:
- PR 119 dominikl 'Take Ice and omero sysenv variables into account'
- PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 132 jburel 'Fix javadoc warning'
- PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()'
Repository: ome/omero-common
Excluded PRs:
- PR 40 jburel 'set classifier' (exclude comment)
- PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 42 jburel 'include all'
- PR 43 sbesson 'Mark omero.security.ignore_case as production property'
Repository: ome/omero-gateway-java
Excluded PRs:
- PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier)
- PR 30 jburel 'Import image' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-model
Already up to date.
Merged PRs:
- PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Already up to date.
Merged PRs:
- PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-romio
Excluded PRs:
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Merged PRs:
- PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-server
Excluded PRs:
- PR 166 kkoz 'Experimenter group cache' (stage: draft)
- PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 152 jburel 'Set class in doc'
- PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28'
- PR 177 chris-allan 'Swap default min and background thread limits'
Conflicting PRs (not included):
- PR 61 joshmoore 'Pass user executor to rendering tasks'
Generated by OMERO-build-push#37 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/37/)'
2024-04-18 00:23:10,615 [ scc.git] DEBUG [detached HEAD 4b3be39] merge master -Dorg -Ssuccess-only
2024-04-18 00:23:10,615 [ scc.merge] INFO Repository: ome/omero-build
2024-04-18 00:23:10,615 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2024-04-18 00:23:10,615 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,615 [ scc.merge] INFO
2024-04-18 00:23:10,615 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,615 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-18 00:23:10,615 [ scc.merge] INFO
2024-04-18 00:23:10,615 [ scc.merge] INFO Repository: ome/omero-blitz
2024-04-18 00:23:10,615 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:23:10,615 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft)
2024-04-18 00:23:10,615 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,615 [ scc.merge] INFO
2024-04-18 00:23:10,615 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()'
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Repository: ome/omero-common
2024-04-18 00:23:10,616 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2024-04-18 00:23:10,616 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 42 jburel 'include all'
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property'
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Repository: ome/omero-gateway-java
2024-04-18 00:23:10,616 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier)
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2024-04-18 00:23:10,616 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Repository: ome/omero-model
2024-04-18 00:23:10,616 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,616 [ scc.merge] INFO Repository: ome/omero-renderer
2024-04-18 00:23:10,616 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:23:10,616 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2024-04-18 00:23:10,616 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,616 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,617 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] INFO Repository: ome/omero-romio
2024-04-18 00:23:10,617 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2024-04-18 00:23:10,617 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,617 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,617 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] INFO Repository: ome/omero-server
2024-04-18 00:23:10,617 [ scc.merge] INFO Excluded PRs:
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2024-04-18 00:23:10,617 [ scc.merge] INFO Already up to date.
2024-04-18 00:23:10,617 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] INFO Merged PRs:
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28'
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits'
2024-04-18 00:23:10,617 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-18 00:23:10,617 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-04-18 00:23:10,617 [ scc.merge] INFO
2024-04-18 00:23:10,617 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-18 00:23:10,617 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,621 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-04-18 00:23:10,622 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:10,625 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-04-18 00:23:10,625 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:10,629 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-04-18 00:23:10,629 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:10,633 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-04-18 00:23:10,633 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:10,637 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-04-18 00:23:10,637 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:10,642 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-04-18 00:23:10,642 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,646 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-18 00:23:10,647 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-04-18 00:23:10,647 [ scc.git] DEBUG Calling 'git remote'
2024-04-18 00:23:10,651 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
Update component versions
Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-server from 5.6.10 to 5.6.11-SNAPSHOT
Updating omero-model from 5.6.13 to 5.6.14-SNAPSHOT
Updating omero-blitz from 5.7.2 to 5.7.3-SNAPSHOT
Updating formats-gpl from 7.2.0 to 8.0.0-SNAPSHOT
Updating omero-romio from 5.7.5 to 5.7.6-SNAPSHOT
Updating omero-common from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-renderer from 5.5.15 to 5.5.16-SNAPSHOT
Commit all component version changes
Entering 'omero-blitz'
Entering 'omero-common'
Entering 'omero-gateway-java'
Entering 'omero-model'
Entering 'omero-renderer'
Entering 'omero-romio'
Entering 'omero-server'
Entering 'omero-blitz'
[detached HEAD 71752f51] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD f8f92f4] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD e5e5cc2] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD 865c037] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD f918d24] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD d1a6f3b] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD 0badf972] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD c982d54] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2024-04-18 00:23:46,370 [ 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