Started by upstream project "Trigger" build number 46
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
> git submodule update --init --recursive omero-common # timeout=10
> git submodule update --init --recursive omero-romio # timeout=10
[Pipeline] pwd
[Pipeline] copyArtifacts
Copied 1 artifact from "OMERO-gradle-plugins-push" build number 40
[Pipeline] sh
+ pushd build
~/workspace/OMERO-build-push/build ~/workspace/OMERO-build-push
+ curl -sfL https://github.com/ome/build-infra/archive/master.tar.gz
+ tar -zxf -
> git submodule update --init --recursive omero-renderer # timeout=10
> git submodule update --init --recursive omero-server # timeout=10
> git submodule update --init --recursive omero-blitz # timeout=10
> git submodule update --init --recursive omero-gateway-java # timeout=10
+ popd
~/workspace/OMERO-build-push
+ python3 -m venv build/venv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-build-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ python3 -m pip install -U pip
Requirement already satisfied: pip in ./build/venv/lib/python3.9/site-packages (21.2.3)
Collecting pip
Using cached pip-24.0-py3-none-any.whl (2.1 MB)
Installing collected packages: pip
Attempting uninstall: pip
Found existing installation: pip 21.2.3
Uninstalling pip-21.2.3:
Successfully uninstalled pip-21.2.3
Successfully installed pip-24.0
+ python3 -m pip install scc
Collecting scc
Using cached scc-0.19.1-py3-none-any.whl.metadata (3.6 kB)
Collecting PyGithub>=1.54 (from scc)
Using cached PyGithub-2.3.0-py3-none-any.whl.metadata (3.8 kB)
Collecting PyYAML>=5.1 (from scc)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (2.1 kB)
Collecting future (from scc)
Using cached future-1.0.0-py3-none-any.whl.metadata (4.0 kB)
Collecting ruamel.yaml (from scc)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl.metadata (23 kB)
Collecting ruamel.yaml.jinja2 (from scc)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl.metadata (2.9 kB)
Collecting six (from scc)
Using cached six-1.16.0-py2.py3-none-any.whl.metadata (1.8 kB)
Collecting urllib3<2 (from scc)
Using cached urllib3-1.26.18-py2.py3-none-any.whl.metadata (48 kB)
Collecting yaclifw<0.3,>=0.2.0 (from scc)
Using cached yaclifw-0.2.0-py3-none-any.whl
Collecting pynacl>=1.4.0 (from PyGithub>=1.54->scc)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl.metadata (8.6 kB)
Collecting requests>=2.14.0 (from PyGithub>=1.54->scc)
Using cached requests-2.31.0-py3-none-any.whl.metadata (4.6 kB)
Collecting pyjwt>=2.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached PyJWT-2.8.0-py3-none-any.whl.metadata (4.2 kB)
Collecting typing-extensions>=4.0.0 (from PyGithub>=1.54->scc)
Using cached typing_extensions-4.11.0-py3-none-any.whl.metadata (3.0 kB)
Collecting Deprecated (from PyGithub>=1.54->scc)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl.metadata (5.4 kB)
Collecting ruamel.yaml.clib>=0.2.7 (from ruamel.yaml->scc)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl.metadata (2.2 kB)
Collecting cryptography>=3.4.0 (from pyjwt[crypto]>=2.4.0->PyGithub>=1.54->scc)
Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl.metadata (5.3 kB)
Collecting cffi>=1.4.1 (from pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (1.5 kB)
Collecting charset-normalizer<4,>=2 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (33 kB)
Collecting idna<4,>=2.5 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached idna-3.7-py3-none-any.whl.metadata (9.9 kB)
Collecting certifi>=2017.4.17 (from requests>=2.14.0->PyGithub>=1.54->scc)
Using cached certifi-2024.2.2-py3-none-any.whl.metadata (2.2 kB)
Collecting wrapt<2,>=1.10 (from Deprecated->PyGithub>=1.54->scc)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (6.6 kB)
Collecting pycparser (from cffi>=1.4.1->pynacl>=1.4.0->PyGithub>=1.54->scc)
Using cached pycparser-2.22-py3-none-any.whl.metadata (943 bytes)
Using cached scc-0.19.1-py3-none-any.whl (48 kB)
Using cached PyGithub-2.3.0-py3-none-any.whl (354 kB)
Using cached PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (738 kB)
Using cached urllib3-1.26.18-py2.py3-none-any.whl (143 kB)
Using cached future-1.0.0-py3-none-any.whl (491 kB)
Using cached ruamel.yaml-0.18.6-py3-none-any.whl (117 kB)
Using cached ruamel.yaml.jinja2-0.2.7-py2.py3-none-any.whl (5.5 kB)
Using cached six-1.16.0-py2.py3-none-any.whl (11 kB)
Using cached PyJWT-2.8.0-py3-none-any.whl (22 kB)
Using cached PyNaCl-1.5.0-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl (856 kB)
Using cached requests-2.31.0-py3-none-any.whl (62 kB)
Using cached ruamel.yaml.clib-0.2.8-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl (562 kB)
Using cached typing_extensions-4.11.0-py3-none-any.whl (34 kB)
Using cached Deprecated-1.2.14-py2.py3-none-any.whl (9.6 kB)
Using cached certifi-2024.2.2-py3-none-any.whl (163 kB)
Using cached cffi-1.16.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (443 kB)
Using cached charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (142 kB)
Using cached cryptography-42.0.5-cp39-abi3-manylinux_2_28_x86_64.whl (4.6 MB)
Using cached idna-3.7-py3-none-any.whl (66 kB)
Using cached wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl (80 kB)
Using cached pycparser-2.22-py3-none-any.whl (117 kB)
Installing collected packages: wrapt, urllib3, typing-extensions, six, ruamel.yaml.clib, PyYAML, pyjwt, pycparser, idna, future, charset-normalizer, certifi, yaclifw, ruamel.yaml, requests, Deprecated, cffi, ruamel.yaml.jinja2, pynacl, cryptography, PyGithub, scc
Successfully installed Deprecated-1.2.14 PyGithub-2.3.0 PyYAML-6.0.1 certifi-2024.2.2 cffi-1.16.0 charset-normalizer-3.3.2 cryptography-42.0.5 future-1.0.0 idna-3.7 pycparser-2.22 pyjwt-2.8.0 pynacl-1.5.0 requests-2.31.0 ruamel.yaml-0.18.6 ruamel.yaml.clib-0.2.8 ruamel.yaml.jinja2-0.2.7 scc-0.19.1 six-1.16.0 typing-extensions-4.11.0 urllib3-1.26.18 wrapt-1.16.0 yaclifw-0.2.0
[Pipeline] sh
+ export BASE_REPO=omero-build.git
+ BASE_REPO=omero-build.git
+ export BASE_BRANCH=master
+ BASE_BRANCH=master
+ export VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ VERSION_LOG=/home/omero/workspace/OMERO-build-push/build/version.tsv
+ . build/venv/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ '[' '!' nondestructive = nondestructive ']'
++ VIRTUAL_ENV=/home/omero/workspace/OMERO-build-push/build/venv
++ export VIRTUAL_ENV
++ _OLD_VIRTUAL_PATH=/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ PATH=/home/omero/workspace/OMERO-build-push/build/venv/bin:/opt/ice-3.6.5/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(venv) '
++ export PS1
++ '[' -n /bin/bash -o -n '' ']'
++ hash -r
+ '[' merge_ci '!=' null ']'
+ export PUSH_BRANCH=merge_ci
+ PUSH_BRANCH=merge_ci
+ '[' null '!=' null ']'
+ export STATUS=success-only 'MERGE_OPTIONS=-vvv --no-ask --reset --comment'
+ STATUS=success-only
+ MERGE_OPTIONS='-vvv --no-ask --reset --comment'
+ bash build/build-infra-master/recursive-merge
Merge base repository (no submodule updates)
2024-04-21 00:23:41,808 [ scc.config] DEBUG Found github.token
2024-04-21 00:23:41,812 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-21 00:23:42,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:23:42,527 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:23:42,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-21 00:23:42,924 [ scc.gh] DEBUG 4862 remaining from 5000 (Reset at 01:04
2024-04-21 00:23:42,925 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:23:42,930 [ scc.git] DEBUG Check current status
2024-04-21 00:23:42,931 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:23:42,935 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f
2024-04-21 00:23:42,936 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:23:42,991 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-21 00:23:42,995 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-21 00:23:42,998 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-21 00:23:43,009 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-21 00:23:43,013 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-21 00:23:43,016 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-21 00:23:43,022 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6)
2024-04-21 00:23:43,029 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:23:43,403 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-04-21 00:23:43,859 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:23:44,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:23:44,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:23:45,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:23:45,092 [ scc.git] DEBUG Resetting...
2024-04-21 00:23:45,092 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-21 00:23:45,099 [ scc.git] DEBUG HEAD is now at be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f
2024-04-21 00:23:45,100 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-21 00:23:45,185 [ scc.git] DEBUG Check current status
2024-04-21 00:23:45,186 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:23:45,191 [ scc.git] DEBUG be30233 Merge pull request #184 from ome/dependabot/submodules/omero-server-82d598f
2024-04-21 00:23:45,191 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:23:45,244 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-21 00:23:45,247 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-21 00:23:45,250 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-21 00:23:45,254 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-21 00:23:45,257 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-21 00:23:45,262 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-21 00:23:45,266 [ scc.git] DEBUG 82d598f610880182491081fc123865ddb6173977 omero-server (v5.6.10-6-g82d598f6)
2024-04-21 00:23:45,267 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-21 00:23:45,267 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-21 00:23:45,267 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-21 00:23:45,268 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-21 00:23:45,268 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-21 00:23:45,268 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:23:45,587 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None
2024-04-21 00:23:46,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None
2024-04-21 00:23:46,059 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-21 00:23:46,060 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-21 00:23:46,060 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:23:46,060 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:23:46,060 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:23:46,064 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:23:46,068 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:23:46,068 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:23:46,073 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:23:46,078 [ scc.git] DEBUG Already up to date.
2024-04-21 00:23:46,078 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head'
2024-04-21 00:23:46,471 [ scc.git] DEBUG From https://github.com/ome/omero-build
2024-04-21 00:23:46,471 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD
2024-04-21 00:23:46,477 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:23:46,478 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:23:46,478 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:23:46,482 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f'
2024-04-21 00:23:46,486 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:23:46,490 [ 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-21 00:23:46,502 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:23:46,505 [ scc.git] DEBUG omero-server | 2 +-
2024-04-21 00:23:46,505 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:23:46,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:23:46,667 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:23:46,787 [ scc.git] DEBUG Submodule path 'omero-server': checked out 'f67fdb63410655c6d5a5fc5e566149479bfaa8bc'
2024-04-21 00:23:46,788 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:23:46,788 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:23:46,793 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:23:47,001 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fad4247d490> has no local changes
2024-04-21 00:23:47,001 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:23:47,051 [ scc.git] DEBUG [detached HEAD d3abbdc] merge master -Dorg -Snone
2024-04-21 00:23:47,052 [ scc.merge] INFO Repository: ome/omero-build
2024-04-21 00:23:47,052 [ scc.merge] INFO Already up to date.
2024-04-21 00:23:47,052 [ scc.merge] INFO
2024-04-21 00:23:47,052 [ scc.merge] INFO Merged PRs:
2024-04-21 00:23:47,052 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-21 00:23:47,052 [ scc.merge] INFO
2024-04-21 00:23:47,052 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-21 00:23:47,052 [ 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-21 00:23:50,607 [ scc.config] DEBUG Found github.token
2024-04-21 00:23:50,612 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-04-21 00:23:50,868 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:23:51,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:23:51,682 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-04-21 00:23:51,684 [ scc.gh] DEBUG 4852 remaining from 5000 (Reset at 01:04
2024-04-21 00:23:51,685 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:23:51,690 [ scc.git] DEBUG Check current status
2024-04-21 00:23:51,691 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:23:51,696 [ scc.git] DEBUG d3abbdc merge master -Dorg -Snone
2024-04-21 00:23:51,696 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:23:51,761 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-21 00:23:51,765 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-21 00:23:51,768 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-21 00:23:51,772 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-21 00:23:51,775 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-21 00:23:51,779 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-21 00:23:51,783 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63)
2024-04-21 00:23:51,790 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:23:52,185 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-04-21 00:23:52,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:23:53,061 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:23:53,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:23:53,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:23:53,969 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:23:54,037 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-04-21 00:23:54,038 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:23:54,043 [ scc.git] DEBUG Check current status
2024-04-21 00:23:54,043 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:23:54,064 [ scc.git] DEBUG 1c874820 revert to snapshot
2024-04-21 00:23:54,065 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:23:54,117 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:23:54,417 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2024-04-21 00:23:54,855 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:23:55,276 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:23:55,706 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:23:56,110 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:23:56,112 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:23:56,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:23:56,152 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-04-21 00:23:56,152 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:23:56,156 [ scc.git] DEBUG Check current status
2024-04-21 00:23:56,157 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:23:56,175 [ scc.git] DEBUG d19036d revert to snapshot
2024-04-21 00:23:56,176 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:23:56,216 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:23:56,639 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2024-04-21 00:23:57,105 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:23:57,519 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:23:57,931 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:23:58,342 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:23:58,345 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:23:58,398 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:23:58,399 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-04-21 00:23:58,399 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:23:58,404 [ scc.git] DEBUG Check current status
2024-04-21 00:23:58,404 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:23:58,410 [ scc.git] DEBUG 7b601e0 revert to snapshot
2024-04-21 00:23:58,411 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:23:58,462 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:23:58,821 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2024-04-21 00:23:59,274 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:23:59,687 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:24:00,102 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:24:00,508 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:24:00,509 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:00,557 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:00,558 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-04-21 00:24:00,558 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:24:00,563 [ scc.git] DEBUG Check current status
2024-04-21 00:24:00,564 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:24:00,576 [ scc.git] DEBUG a0b38fe Merge pull request #98 from dgault/BF-7.2.0
2024-04-21 00:24:00,576 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:24:00,631 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:24:00,966 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2024-04-21 00:24:01,409 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:24:01,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:24:02,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:24:02,727 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:24:02,730 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:02,788 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:02,790 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-04-21 00:24:02,790 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:24:02,796 [ scc.git] DEBUG Check current status
2024-04-21 00:24:02,797 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:24:02,816 [ scc.git] DEBUG a239fb6 revert to snapshot
2024-04-21 00:24:02,817 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:24:02,874 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:24:03,210 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2024-04-21 00:24:03,651 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:24:04,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:24:04,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:24:04,879 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:24:04,881 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:04,932 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:04,933 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-04-21 00:24:04,933 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:24:04,939 [ scc.git] DEBUG Check current status
2024-04-21 00:24:04,939 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:24:04,952 [ scc.git] DEBUG 1d30faf revert to snapshot
2024-04-21 00:24:04,953 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:24:05,020 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:24:05,371 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2024-04-21 00:24:05,840 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:24:06,254 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:24:06,668 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:24:07,086 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:24:07,088 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:07,151 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:07,153 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-04-21 00:24:07,153 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-04-21 00:24:07,162 [ scc.git] DEBUG Check current status
2024-04-21 00:24:07,162 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:24:07,258 [ scc.git] DEBUG f67fdb63 Merge pull request #168 from scuniff/bug-167
2024-04-21 00:24:07,259 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:24:07,303 [ scc.config] DEBUG Found remote.origin.url
2024-04-21 00:24:07,568 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2024-04-21 00:24:08,062 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-04-21 00:24:08,476 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-04-21 00:24:08,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-04-21 00:24:09,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-04-21 00:24:09,327 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:09,373 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:09,373 [ scc.git] DEBUG Resetting...
2024-04-21 00:24:09,373 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-04-21 00:24:09,382 [ scc.git] DEBUG HEAD is now at d3abbdc merge master -Dorg -Snone
2024-04-21 00:24:09,382 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-04-21 00:24:09,444 [ scc.git] DEBUG Check current status
2024-04-21 00:24:09,444 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-04-21 00:24:09,450 [ scc.git] DEBUG d3abbdc merge master -Dorg -Snone
2024-04-21 00:24:09,450 [ scc.git] DEBUG Calling 'git submodule status'
2024-04-21 00:24:09,493 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-04-21 00:24:09,495 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-04-21 00:24:09,499 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-04-21 00:24:09,502 [ scc.git] DEBUG a0b38fe6975e72d577d47462f95a5c99f9400ad3 omero-model (v5.6.13-3-ga0b38fe)
2024-04-21 00:24:09,505 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-04-21 00:24:09,508 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-04-21 00:24:09,511 [ scc.git] DEBUG f67fdb63410655c6d5a5fc5e566149479bfaa8bc omero-server (v5.6.10-8-gf67fdb63)
2024-04-21 00:24:09,512 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-04-21 00:24:09,513 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-04-21 00:24:09,513 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-04-21 00:24:09,513 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-04-21 00:24:09,513 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-04-21 00:24:09,513 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-04-21 00:24:09,513 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:24:09,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 None
2024-04-21 00:24:10,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/issues/185 HTTP/1.1" 200 None
2024-04-21 00:24:10,272 [ scc.repo] DEBUG # ... Include label: dependencies
2024-04-21 00:24:10,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None
2024-04-21 00:24:11,289 [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-21 00:24:11,803 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/commits/a76e76cd9b8fc401d649bcdc06a22f5cd785d51f HTTP/1.1" 200 None
2024-04-21 00:24:12,242 [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-21 00:24:12,243 [ scc.repo] DEBUG - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-21 00:24:12,244 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:24:12,244 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:12,244 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:12,250 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:24:12,257 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:24:12,258 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:24:12,265 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:24:12,274 [ scc.git] DEBUG Already up to date.
2024-04-21 00:24:12,274 [ scc.git] DEBUG Calling 'git fetch origin pull/185/head'
2024-04-21 00:24:12,660 [ scc.git] DEBUG From https://github.com/ome/omero-build
2024-04-21 00:24:12,660 [ scc.git] DEBUG * branch refs/pull/185/head -> FETCH_HEAD
2024-04-21 00:24:12,666 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:24:12,666 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:12,667 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:12,672 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...a76e76cd9b8fc401d649bcdc06a22f5cd785d51f'
2024-04-21 00:24:12,678 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:12,683 [ 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-21 00:24:12,689 [ scc.git] DEBUG Already up to date.
2024-04-21 00:24:12,844 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:12,845 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:24:12,894 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:12,895 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:12,900 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:24:13,424 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2024-04-21 00:24:13,877 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148 HTTP/1.1" 200 None
2024-04-21 00:24:14,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/148/comments HTTP/1.1" 200 None
2024-04-21 00:24:14,815 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None
2024-04-21 00:24:15,291 [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-21 00:24:15,746 [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-21 00:24:16,257 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189 HTTP/1.1" 200 None
2024-04-21 00:24:16,681 [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-21 00:24:16,683 [ scc.repo] DEBUG - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()'
2024-04-21 00:24:17,137 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None
2024-04-21 00:24:17,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None
2024-04-21 00:24:18,050 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2024-04-21 00:24:18,487 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2024-04-21 00:24:18,998 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-04-21 00:24:19,491 [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-21 00:24:19,980 [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-21 00:24:20,469 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/6d887b53b85d244eed855703effd0e470c83bab9 HTTP/1.1" 200 None
2024-04-21 00:24:20,871 [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-21 00:24:20,873 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2024-04-21 00:24:21,312 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None
2024-04-21 00:24:21,774 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-04-21 00:24:22,236 [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-21 00:24:22,724 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-04-21 00:24:23,141 [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-21 00:24:23,142 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:24:23,605 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2024-04-21 00:24:24,037 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2024-04-21 00:24:24,514 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-04-21 00:24:24,966 [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-21 00:24:25,414 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-04-21 00:24:25,828 [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-21 00:24:25,829 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-04-21 00:24:25,829 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:24:25,829 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-04-21 00:24:25,829 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:25,829 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:25,835 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:24:25,841 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:24:25,841 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:24:25,848 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:24:25,855 [ scc.git] DEBUG Already up to date.
2024-04-21 00:24:25,855 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2024-04-21 00:24:26,314 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-21 00:24:26,314 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2024-04-21 00:24:26,321 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-04-21 00:24:26,702 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-21 00:24:26,702 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-04-21 00:24:26,708 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2024-04-21 00:24:27,126 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-21 00:24:27,127 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2024-04-21 00:24:27,132 [ scc.git] DEBUG Calling 'git fetch origin pull/148/head'
2024-04-21 00:24:27,565 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-04-21 00:24:27,566 [ scc.git] DEBUG * branch refs/pull/148/head -> FETCH_HEAD
2024-04-21 00:24:27,573 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:24:27,573 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:27,573 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:27,580 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-04-21 00:24:27,590 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:27,596 [ 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-21 00:24:27,622 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2024-04-21 00:24:27,624 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:27,628 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2024-04-21 00:24:27,628 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-04-21 00:24:27,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:27,797 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87'
2024-04-21 00:24:27,804 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:27,810 [ 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-21 00:24:27,832 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:24:27,835 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:27,838 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:24:27,838 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:24:28,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:28,217 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6d887b53b85d244eed855703effd0e470c83bab9'
2024-04-21 00:24:28,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:28,230 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) 6d887b53b85d244eed855703effd0e470c83bab9'
2024-04-21 00:24:28,304 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:28,307 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2024-04-21 00:24:28,307 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:24:28,630 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:28,631 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...e4c3f57a8d91cb36a01e1b28dbf41c1ea72f1189'
2024-04-21 00:24:28,639 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:28,644 [ 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-21 00:24:28,675 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:28,679 [ scc.git] DEBUG .../ome/services/blitz/repo/RepositoryDaoImpl.java | 26 +++++++++++++++++-----
2024-04-21 00:24:28,679 [ scc.git] DEBUG 1 file changed, 21 insertions(+), 5 deletions(-)
2024-04-21 00:24:29,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:29,029 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:24:29,069 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:29,070 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:29,076 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:29,113 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:24:29,122 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc9b1be0> has no local changes
2024-04-21 00:24:29,123 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:24:29,133 [ scc.git] DEBUG [detached HEAD a4f1dd05] merge master -Dorg -Ssuccess-only
2024-04-21 00:24:29,133 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:29,133 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:24:29,542 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2024-04-21 00:24:29,995 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None
2024-04-21 00:24:30,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43/comments HTTP/1.1" 200 None
2024-04-21 00:24:30,937 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None
2024-04-21 00:24:31,405 [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-21 00:24:31,839 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None
2024-04-21 00:24:32,257 [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-21 00:24:32,257 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property'
2024-04-21 00:24:32,705 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2024-04-21 00:24:33,155 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2024-04-21 00:24:33,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-04-21 00:24:34,123 [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-21 00:24:34,619 [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-21 00:24:35,054 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-04-21 00:24:35,466 [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-21 00:24:35,467 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2024-04-21 00:24:36,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None
2024-04-21 00:24:36,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-04-21 00:24:37,036 [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-21 00:24:37,540 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-04-21 00:24:37,957 [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-21 00:24:37,957 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:24:37,958 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:24:37,958 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-04-21 00:24:37,958 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:37,958 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:37,965 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:24:37,973 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:24:37,974 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:24:37,981 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:24:37,989 [ scc.git] DEBUG Already up to date.
2024-04-21 00:24:37,990 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head'
2024-04-21 00:24:38,407 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-04-21 00:24:38,408 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD
2024-04-21 00:24:38,415 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2024-04-21 00:24:38,814 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-04-21 00:24:38,814 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2024-04-21 00:24:38,820 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head'
2024-04-21 00:24:39,240 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-04-21 00:24:39,241 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD
2024-04-21 00:24:39,248 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:24:39,248 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:39,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:39,253 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007'
2024-04-21 00:24:39,259 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:39,265 [ 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-21 00:24:39,278 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:24:39,297 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:39,300 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:24:39,301 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:24:39,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:39,456 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-04-21 00:24:39,463 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:39,470 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-04-21 00:24:39,488 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:39,491 [ scc.git] DEBUG publish.gradle | 17 +----------------
2024-04-21 00:24:39,491 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2024-04-21 00:24:39,863 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:39,865 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170'
2024-04-21 00:24:39,874 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:39,882 [ 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-21 00:24:39,921 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:39,926 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 -
2024-04-21 00:24:39,927 [ scc.git] DEBUG 1 file changed, 1 deletion(-)
2024-04-21 00:24:40,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:40,270 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:24:40,325 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:40,326 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:40,334 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:40,390 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:24:40,402 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc10b640> has no local changes
2024-04-21 00:24:40,403 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:24:40,416 [ scc.git] DEBUG [detached HEAD faa936b] merge master -Dorg -Ssuccess-only
2024-04-21 00:24:40,417 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:40,417 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:24:40,811 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2024-04-21 00:24:41,260 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None
2024-04-21 00:24:41,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None
2024-04-21 00:24:42,188 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None
2024-04-21 00:24:42,710 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-04-21 00:24:43,175 [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-21 00:24:43,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-04-21 00:24:44,038 [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-21 00:24:44,039 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:24:44,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2024-04-21 00:24:45,020 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2024-04-21 00:24:45,022 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:24:45,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-04-21 00:24:45,022 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:45,023 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:45,030 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:24:45,038 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:24:45,038 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:24:45,046 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:24:45,055 [ scc.git] DEBUG Already up to date.
2024-04-21 00:24:45,055 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-04-21 00:24:45,469 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-04-21 00:24:45,469 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-04-21 00:24:45,475 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:24:45,475 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:45,475 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:45,481 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c'
2024-04-21 00:24:45,487 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:45,491 [ 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-21 00:24:45,541 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:24:45,542 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:45,545 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:24:45,545 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:24:45,703 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:45,704 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:24:45,751 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:45,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:45,756 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:45,802 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:24:45,808 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc09baf0> has no local changes
2024-04-21 00:24:45,809 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:24:45,818 [ scc.git] DEBUG [detached HEAD 03dfc03] merge master -Dorg -Ssuccess-only
2024-04-21 00:24:45,818 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:45,818 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:24:46,250 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None
2024-04-21 00:24:46,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/100 HTTP/1.1" 200 None
2024-04-21 00:24:47,294 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None
2024-04-21 00:24:47,784 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-04-21 00:24:48,228 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-04-21 00:24:48,696 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/9e284c2e5a7bbb845906c2799693af75ec42bebc HTTP/1.1" 200 None
2024-04-21 00:24:49,121 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/9e284c2e5a7bbb845906c2799693af75ec42bebc?per_page=1 HTTP/1.1" 200 2
2024-04-21 00:24:49,122 [ scc.repo] DEBUG - PR 100 dgault 'Bump Bio-Formats to version 7.3.0'
2024-04-21 00:24:49,594 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/99 HTTP/1.1" 200 None
2024-04-21 00:24:50,111 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None
2024-04-21 00:24:50,598 [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-21 00:24:51,104 [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-21 00:24:51,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/63ee5eb9c79f5b2929fcc2e15b77e44e35945c19 HTTP/1.1" 200 None
2024-04-21 00:24:52,047 [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-21 00:24:52,048 [ scc.repo] DEBUG - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
2024-04-21 00:24:52,507 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None
2024-04-21 00:24:52,971 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None
2024-04-21 00:24:53,473 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-04-21 00:24:53,911 [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-21 00:24:54,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-04-21 00:24:54,821 [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-21 00:24:54,822 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:24:54,822 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:24:54,822 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-04-21 00:24:54,822 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:54,823 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:54,827 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:24:54,831 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:24:54,832 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:24:54,837 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:24:54,843 [ scc.git] DEBUG Already up to date.
2024-04-21 00:24:54,844 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-04-21 00:24:55,232 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-04-21 00:24:55,232 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-04-21 00:24:55,238 [ scc.git] DEBUG Calling 'git fetch origin pull/99/head'
2024-04-21 00:24:55,624 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-04-21 00:24:55,625 [ scc.git] DEBUG * branch refs/pull/99/head -> FETCH_HEAD
2024-04-21 00:24:55,631 [ scc.git] DEBUG Calling 'git fetch origin pull/100/head'
2024-04-21 00:24:56,294 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-04-21 00:24:56,295 [ scc.git] DEBUG * branch refs/pull/100/head -> FETCH_HEAD
2024-04-21 00:24:56,301 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:24:56,301 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:56,302 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:56,308 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5'
2024-04-21 00:24:56,319 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:56,324 [ 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-21 00:24:56,474 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:24:56,476 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:56,479 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:24:56,479 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:24:56,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:56,651 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...63ee5eb9c79f5b2929fcc2e15b77e44e35945c19'
2024-04-21 00:24:56,672 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:56,678 [ 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-21 00:24:56,707 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:56,710 [ scc.git] DEBUG src/main/java/ome/util/actions/PostgresSqlAction.java | 17 ++++++++++++++++-
2024-04-21 00:24:56,710 [ scc.git] DEBUG 1 file changed, 16 insertions(+), 1 deletion(-)
2024-04-21 00:24:57,042 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:57,044 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9e284c2e5a7bbb845906c2799693af75ec42bebc'
2024-04-21 00:24:57,051 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:57,058 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 100 (Bump Bio-Formats to version 7.3.0) 9e284c2e5a7bbb845906c2799693af75ec42bebc'
2024-04-21 00:24:57,098 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:24:57,100 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:24:57,103 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:24:57,103 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:24:57,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:24:57,454 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:24:57,496 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:24:57,497 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:24:57,505 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:24:57,559 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:24:57,568 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc9366a0> has no local changes
2024-04-21 00:24:57,569 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-model
Already up to date.
Merged PRs:
- PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
- PR 100 dgault 'Bump Bio-Formats to version 7.3.0'
Generated by OMERO-build-push#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:24:57,582 [ scc.git] DEBUG [detached HEAD 249bfdb] merge master -Dorg -Ssuccess-only
2024-04-21 00:24:57,583 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:24:57,583 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:24:58,005 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2024-04-21 00:24:58,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None
2024-04-21 00:24:58,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-04-21 00:24:59,426 [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-21 00:24:59,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-04-21 00:25:00,306 [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-21 00:25:00,307 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:00,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2024-04-21 00:25:01,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2024-04-21 00:25:01,272 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-04-21 00:25:01,272 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:25:01,272 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-04-21 00:25:01,272 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:01,272 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:01,278 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:25:01,283 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:25:01,284 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:25:01,290 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:25:01,296 [ scc.git] DEBUG Already up to date.
2024-04-21 00:25:01,296 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-04-21 00:25:01,723 [ scc.git] DEBUG From https://github.com/ome/omero-renderer
2024-04-21 00:25:01,723 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-04-21 00:25:01,729 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:25:01,729 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:01,730 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:01,736 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751'
2024-04-21 00:25:01,741 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:01,747 [ 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-21 00:25:01,774 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:25:01,775 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:25:01,778 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:25:01,778 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:25:01,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:01,940 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:25:01,984 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:01,985 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:01,991 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:25:02,036 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:25:02,044 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc0f0b80> has no local changes
2024-04-21 00:25:02,045 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:25:02,064 [ scc.git] DEBUG [detached HEAD b7c3f66] merge master -Dorg -Ssuccess-only
2024-04-21 00:25:02,065 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:02,065 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:25:02,483 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2024-04-21 00:25:02,941 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None
2024-04-21 00:25:03,441 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-04-21 00:25:03,905 [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-21 00:25:04,404 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-04-21 00:25:04,827 [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-21 00:25:04,828 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:05,299 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2024-04-21 00:25:05,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2024-04-21 00:25:05,767 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:25:05,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-04-21 00:25:05,767 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:05,767 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:05,773 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:25:05,778 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:25:05,778 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:25:05,783 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:25:05,788 [ scc.git] DEBUG Already up to date.
2024-04-21 00:25:05,789 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head'
2024-04-21 00:25:06,192 [ scc.git] DEBUG From https://github.com/ome/omero-romio
2024-04-21 00:25:06,192 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD
2024-04-21 00:25:06,197 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:25:06,198 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:06,198 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:06,204 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d'
2024-04-21 00:25:06,211 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:06,217 [ 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-21 00:25:06,237 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:25:06,238 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:25:06,241 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:25:06,241 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:25:06,386 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:06,388 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:25:06,439 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:06,440 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:06,445 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:25:06,491 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:25:06,497 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc0f09d0> has no local changes
2024-04-21 00:25:06,498 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:25:06,507 [ scc.git] DEBUG [detached HEAD 1e2c661] merge master -Dorg -Ssuccess-only
2024-04-21 00:25:06,508 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:06,508 [ scc.repo] DEBUG ## PRs found:
2024-04-21 00:25:07,015 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2024-04-21 00:25:07,480 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None
2024-04-21 00:25:07,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-04-21 00:25:08,437 [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-21 00:25:08,897 [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-21 00:25:09,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-04-21 00:25:09,732 [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-21 00:25:09,733 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits'
2024-04-21 00:25:10,173 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None
2024-04-21 00:25:10,661 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None
2024-04-21 00:25:11,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None
2024-04-21 00:25:11,610 [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-21 00:25:12,077 [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-21 00:25:12,555 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8 HTTP/1.1" 200 None
2024-04-21 00:25:12,963 [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-21 00:25:12,964 [ scc.repo] DEBUG - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28'
2024-04-21 00:25:13,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2024-04-21 00:25:13,866 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2024-04-21 00:25:14,322 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2024-04-21 00:25:14,787 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2024-04-21 00:25:15,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-04-21 00:25:15,732 [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-21 00:25:16,222 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-04-21 00:25:16,658 [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-21 00:25:16,659 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2024-04-21 00:25:17,104 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None
2024-04-21 00:25:17,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-04-21 00:25:18,069 [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-21 00:25:18,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-04-21 00:25:18,969 [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-21 00:25:18,971 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:19,413 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2024-04-21 00:25:19,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2024-04-21 00:25:20,373 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-04-21 00:25:20,823 [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-21 00:25:21,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-04-21 00:25:21,715 [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-21 00:25:21,716 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-04-21 00:25:21,717 [ scc.repo] DEBUG ## Branches found:
2024-04-21 00:25:21,717 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-04-21 00:25:21,718 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:21,718 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:21,723 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-04-21 00:25:21,728 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-04-21 00:25:21,728 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-04-21 00:25:21,734 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-04-21 00:25:21,739 [ scc.git] DEBUG Already up to date.
2024-04-21 00:25:21,739 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2024-04-21 00:25:22,188 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-21 00:25:22,188 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2024-04-21 00:25:22,195 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head'
2024-04-21 00:25:22,570 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-21 00:25:22,570 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD
2024-04-21 00:25:22,575 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2024-04-21 00:25:22,955 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-21 00:25:22,956 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2024-04-21 00:25:22,962 [ scc.git] DEBUG Calling 'git fetch origin pull/175/head'
2024-04-21 00:25:23,368 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-21 00:25:23,368 [ scc.git] DEBUG * branch refs/pull/175/head -> FETCH_HEAD
2024-04-21 00:25:23,373 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head'
2024-04-21 00:25:23,740 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-04-21 00:25:23,740 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD
2024-04-21 00:25:23,744 [ scc.git] DEBUG ## Unique users: []
2024-04-21 00:25:23,745 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:23,745 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:23,750 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-04-21 00:25:23,756 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:23,760 [ 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-21 00:25:24,033 [ 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-21 00:25:24,033 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:25:24,033 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2024-04-21 00:25:24,034 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-04-21 00:25:24,034 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-04-21 00:25:24,042 [ scc.git] DEBUG Calling 'git reset --hard f67fdb63410655c6d5a5fc5e566149479bfaa8bc'
2024-04-21 00:25:24,052 [ scc.git] DEBUG HEAD is now at f67fdb63 Merge pull request #168 from scuniff/bug-167
2024-04-21 00:25:24,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:24,202 [ scc.git] DEBUG Calling 'git merge-base f67fdb63410655c6d5a5fc5e566149479bfaa8bc 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-04-21 00:25:24,209 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..f67fdb63410655c6d5a5fc5e566149479bfaa8bc'
2024-04-21 00:25:24,215 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#40](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/). See the [console output](https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/consoleText) for more details.
Possible conflicts:
- Upstream changes
- build.gradle
- .travis.yml
--conflicts
2024-04-21 00:25:24,218 [ scc.config] DEBUG Found github.token
2024-04-21 00:25:24,219 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2024-04-21 00:25:24,219 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374'
2024-04-21 00:25:24,224 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:24,228 [ 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-21 00:25:24,286 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:25:24,287 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:25:24,290 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:25:24,290 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:25:24,609 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:24,610 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2024-04-21 00:25:24,617 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:24,622 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2024-04-21 00:25:24,647 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:25:24,650 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2024-04-21 00:25:24,651 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:25:25,022 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:25,023 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...b7aa23dcea14e8ec5556f9a18f0e32f6a03fcce8'
2024-04-21 00:25:25,031 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:25,037 [ 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-21 00:25:25,096 [ scc.git] DEBUG Auto-merging build.gradle
2024-04-21 00:25:25,097 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:25:25,100 [ scc.git] DEBUG build.gradle | 2 +-
2024-04-21 00:25:25,100 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-04-21 00:25:25,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:25,431 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff'
2024-04-21 00:25:25,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:25,443 [ 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-21 00:25:25,489 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-04-21 00:25:25,492 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++--
2024-04-21 00:25:25,492 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2024-04-21 00:25:25,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:25,835 [ scc.git] DEBUG Calling 'git submodule update'
2024-04-21 00:25:25,879 [ scc.git] DEBUG Get sha1 of %s
2024-04-21 00:25:25,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-04-21 00:25:25,886 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:25:25,930 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:25:25,940 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebc100fd0> has no local changes
2024-04-21 00:25:25,941 [ 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#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:25:25,952 [ scc.git] DEBUG [detached HEAD fbf881a8] merge master -Dorg -Ssuccess-only
2024-04-21 00:25:25,953 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:25,953 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-04-21 00:25:26,013 [ scc.config] DEBUG Found submodule.omero-blitz.url
2024-04-21 00:25:26,243 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:26,253 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2024-04-21 00:25:26,257 [ scc.config] DEBUG Found submodule.omero-common.url
2024-04-21 00:25:26,640 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:26,651 [ scc.config] DEBUG Found submodule.omero-common.branch
2024-04-21 00:25:26,656 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2024-04-21 00:25:27,049 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:27,062 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2024-04-21 00:25:27,066 [ scc.config] DEBUG Found submodule.omero-model.url
2024-04-21 00:25:27,461 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:27,470 [ scc.config] DEBUG Found submodule.omero-model.branch
2024-04-21 00:25:27,474 [ scc.config] DEBUG Found submodule.omero-renderer.url
2024-04-21 00:25:27,865 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:27,876 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2024-04-21 00:25:27,881 [ scc.config] DEBUG Found submodule.omero-romio.url
2024-04-21 00:25:28,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:28,280 [ scc.config] DEBUG Found submodule.omero-romio.branch
2024-04-21 00:25:28,283 [ scc.config] DEBUG Found submodule.omero-server.url
2024-04-21 00:25:28,678 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-04-21 00:25:28,687 [ scc.config] DEBUG Found submodule.omero-server.branch
2024-04-21 00:25:28,687 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-04-21 00:25:28,721 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f1ebed72490> has local changes
2024-04-21 00:25:28,721 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-build
Already up to date.
Merged PRs:
- PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
Repository: ome/omero-blitz
Excluded PRs:
- PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft)
Already up to date.
Merged PRs:
- PR 119 dominikl 'Take Ice and omero sysenv variables into account'
- PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 132 jburel 'Fix javadoc warning'
- PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()'
Repository: ome/omero-common
Excluded PRs:
- PR 40 jburel 'set classifier' (exclude comment)
- PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 42 jburel 'include all'
- PR 43 sbesson 'Mark omero.security.ignore_case as production property'
Repository: ome/omero-gateway-java
Excluded PRs:
- PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier)
- PR 30 jburel 'Import image' (exclude comment)
Already up to date.
Merged PRs:
- PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-model
Already up to date.
Merged PRs:
- PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
- PR 100 dgault 'Bump Bio-Formats to version 7.3.0'
Repository: ome/omero-renderer
Excluded PRs:
- PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
Already up to date.
Merged PRs:
- PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-romio
Excluded PRs:
- PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
Already up to date.
Merged PRs:
- PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
Repository: ome/omero-server
Excluded PRs:
- PR 166 kkoz 'Experimenter group cache' (stage: draft)
- PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
Already up to date.
Merged PRs:
- PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
- PR 152 jburel 'Set class in doc'
- PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28'
- PR 177 chris-allan 'Swap default min and background thread limits'
Conflicting PRs (not included):
- PR 61 joshmoore 'Pass user executor to rendering tasks'
Generated by OMERO-build-push#40 (https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-build-push/40/)'
2024-04-21 00:25:28,731 [ scc.git] DEBUG [detached HEAD 1ca9c44] merge master -Dorg -Ssuccess-only
2024-04-21 00:25:28,731 [ scc.merge] INFO Repository: ome/omero-build
2024-04-21 00:25:28,732 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2024-04-21 00:25:28,732 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,732 [ scc.merge] INFO
2024-04-21 00:25:28,732 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 185 dependabot[bot] 'Bump omero-server from `82d598f` to `f67fdb6`'
2024-04-21 00:25:28,732 [ scc.merge] INFO
2024-04-21 00:25:28,732 [ scc.merge] INFO Repository: ome/omero-blitz
2024-04-21 00:25:28,732 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft)
2024-04-21 00:25:28,732 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,732 [ scc.merge] INFO
2024-04-21 00:25:28,732 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 148 sbesson 'Fix ordering of OriginalFile objects registered in saveFileset()'
2024-04-21 00:25:28,732 [ scc.merge] INFO
2024-04-21 00:25:28,732 [ scc.merge] INFO Repository: ome/omero-common
2024-04-21 00:25:28,732 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2024-04-21 00:25:28,732 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,732 [ scc.merge] INFO
2024-04-21 00:25:28,732 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 42 jburel 'include all'
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property'
2024-04-21 00:25:28,732 [ scc.merge] INFO
2024-04-21 00:25:28,732 [ scc.merge] INFO Repository: ome/omero-gateway-java
2024-04-21 00:25:28,732 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:25:28,732 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier)
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2024-04-21 00:25:28,733 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Repository: ome/omero-model
2024-04-21 00:25:28,733 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 99 sbesson 'PostgresSqlAction.prepareSession: disable the processing of JDBC parameter metadata'
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 100 dgault 'Bump Bio-Formats to version 7.3.0'
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Repository: ome/omero-renderer
2024-04-21 00:25:28,733 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2024-04-21 00:25:28,733 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Repository: ome/omero-romio
2024-04-21 00:25:28,733 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2024-04-21 00:25:28,733 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Repository: ome/omero-server
2024-04-21 00:25:28,733 [ scc.merge] INFO Excluded PRs:
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2024-04-21 00:25:28,733 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2024-04-21 00:25:28,733 [ scc.merge] INFO Already up to date.
2024-04-21 00:25:28,733 [ scc.merge] INFO
2024-04-21 00:25:28,733 [ scc.merge] INFO Merged PRs:
2024-04-21 00:25:28,734 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-04-21 00:25:28,734 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2024-04-21 00:25:28,734 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28'
2024-04-21 00:25:28,734 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits'
2024-04-21 00:25:28,734 [ scc.merge] INFO
2024-04-21 00:25:28,734 [ scc.merge] INFO Conflicting PRs (not included):
2024-04-21 00:25:28,734 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-04-21 00:25:28,734 [ scc.merge] INFO
2024-04-21 00:25:28,734 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-04-21 00:25:28,734 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,738 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-04-21 00:25:28,738 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:28,742 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-04-21 00:25:28,742 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:28,746 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-04-21 00:25:28,746 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:28,750 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-04-21 00:25:28,750 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:28,754 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-04-21 00:25:28,754 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:28,758 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-04-21 00:25:28,758 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-04-21 00:25:28,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-04-21 00:25:28,763 [ scc.git] DEBUG Calling 'git remote'
2024-04-21 00:25:28,768 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
Update component versions
Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-server from 5.6.10 to 5.6.11-SNAPSHOT
Updating omero-model from 5.6.13 to 5.6.14-SNAPSHOT
Updating omero-blitz from 5.7.2 to 5.7.3-SNAPSHOT
Updating formats-gpl from 7.3.0 to 8.0.0-SNAPSHOT
Updating omero-romio from 5.7.5 to 5.7.6-SNAPSHOT
Updating omero-common from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-renderer from 5.5.15 to 5.5.16-SNAPSHOT
Commit all component version changes
Entering 'omero-blitz'
Entering 'omero-common'
Entering 'omero-gateway-java'
Entering 'omero-model'
Entering 'omero-renderer'
Entering 'omero-romio'
Entering 'omero-server'
Entering 'omero-blitz'
[detached HEAD d07af0fa] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD 8575420] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD 1a818e1] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD cbd6183] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD 78cd17a] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD 2389609] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD 4f188a56] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD a3d12f3] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2024-04-21 00:26:05,018 [ 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