Console Output
+ 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-03-20 09:42:08,792 [ scc.config] DEBUG Found github.token
2024-03-20 09:42:08,795 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-03-20 09:42:09,024 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:09,431 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:09,835 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-03-20 09:42:09,836 [ scc.gh] DEBUG 4336 remaining from 5000 (Reset at 10:03
2024-03-20 09:42:09,837 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:09,841 [ scc.git] DEBUG Check current status
2024-03-20 09:42:09,841 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:09,845 [ scc.git] DEBUG 9adcfe2 Merge pull request #182 from ome/dependabot/submodules/omero-server-d094154
2024-03-20 09:42:09,845 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:09,887 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-20 09:42:09,890 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-20 09:42:09,894 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-20 09:42:09,897 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-20 09:42:09,900 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-20 09:42:09,903 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-20 09:42:09,906 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-20 09:42:09,912 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:10,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-03-20 09:42:10,739 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:11,152 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:11,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:12,000 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:12,001 [ scc.git] DEBUG Resetting...
2024-03-20 09:42:12,001 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-03-20 09:42:12,007 [ scc.git] DEBUG HEAD is now at 9adcfe2 Merge pull request #182 from ome/dependabot/submodules/omero-server-d094154
2024-03-20 09:42:12,008 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-03-20 09:42:12,062 [ scc.git] DEBUG Check current status
2024-03-20 09:42:12,063 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:12,066 [ scc.git] DEBUG 9adcfe2 Merge pull request #182 from ome/dependabot/submodules/omero-server-d094154
2024-03-20 09:42:12,067 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:12,104 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-20 09:42:12,107 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-20 09:42:12,109 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-20 09:42:12,112 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-20 09:42:12,114 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-20 09:42:12,117 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-20 09:42:12,120 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-20 09:42:12,120 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-03-20 09:42:12,121 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-03-20 09:42:12,121 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-03-20 09:42:12,121 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-03-20 09:42:12,121 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-03-20 09:42:12,121 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:42:12,427 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-03-20 09:42:12,428 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:42:12,428 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:12,428 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:12,432 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:42:12,435 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:42:12,436 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:42:12,439 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:42:12,442 [ scc.git] DEBUG Already up to date.
2024-03-20 09:42:12,442 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:42:12,443 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:12,443 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:12,446 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:42:12,483 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:12,483 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:12,487 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:42:12,567 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f8bd6581d30> has no local changes
2024-03-20 09:42:12,568 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Snone
Repository: ome/omero-build
Already up to date.
Generated by OMERO-build-push#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:42:12,599 [ scc.git] DEBUG [detached HEAD a47f398] merge master -Dorg -Snone
2024-03-20 09:42:12,599 [ scc.merge] INFO Repository: ome/omero-build
2024-03-20 09:42:12,599 [ scc.merge] INFO Already up to date.
2024-03-20 09:42:12,599 [ scc.merge] INFO
2024-03-20 09:42:12,600 [ scc.merge] INFO
2024-03-20 09:42:12,600 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-20 09:42:12,600 [ 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-03-20 09:42:15,926 [ scc.config] DEBUG Found github.token
2024-03-20 09:42:15,929 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-03-20 09:42:16,187 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:16,585 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:16,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-03-20 09:42:16,984 [ scc.gh] DEBUG 4328 remaining from 5000 (Reset at 10:03
2024-03-20 09:42:16,985 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:16,989 [ scc.git] DEBUG Check current status
2024-03-20 09:42:16,989 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:16,992 [ scc.git] DEBUG a47f398 merge master -Dorg -Snone
2024-03-20 09:42:16,992 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:17,031 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-20 09:42:17,034 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-20 09:42:17,037 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-20 09:42:17,039 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-20 09:42:17,042 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-20 09:42:17,045 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-20 09:42:17,047 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-20 09:42:17,051 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:17,470 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-03-20 09:42:17,907 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:18,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:18,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:19,157 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:19,158 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:19,205 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-03-20 09:42:19,205 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:19,209 [ scc.git] DEBUG Check current status
2024-03-20 09:42:19,209 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:19,213 [ scc.git] DEBUG 1c874820 revert to snapshot
2024-03-20 09:42:19,213 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:19,252 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:19,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2024-03-20 09:42:20,064 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:20,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:20,900 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:21,318 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:21,319 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:21,354 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:21,355 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-03-20 09:42:21,355 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:21,358 [ scc.git] DEBUG Check current status
2024-03-20 09:42:21,358 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:21,361 [ scc.git] DEBUG d19036d revert to snapshot
2024-03-20 09:42:21,362 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:21,399 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:21,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2024-03-20 09:42:22,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:22,702 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:23,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:23,531 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:23,533 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:23,568 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:23,569 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-03-20 09:42:23,569 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:23,573 [ scc.git] DEBUG Check current status
2024-03-20 09:42:23,573 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:23,576 [ scc.git] DEBUG 7b601e0 revert to snapshot
2024-03-20 09:42:23,577 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:23,615 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:23,974 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2024-03-20 09:42:24,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:24,858 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:25,271 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:25,683 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:25,684 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:25,721 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:25,722 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-03-20 09:42:25,722 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:25,726 [ scc.git] DEBUG Check current status
2024-03-20 09:42:25,726 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:25,730 [ scc.git] DEBUG 032b6c7 revert to snapshot
2024-03-20 09:42:25,730 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:25,770 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:26,149 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2024-03-20 09:42:26,593 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:27,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:27,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:27,887 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:27,888 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:27,924 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:27,925 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-03-20 09:42:27,925 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:27,928 [ scc.git] DEBUG Check current status
2024-03-20 09:42:27,928 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:27,932 [ scc.git] DEBUG a239fb6 revert to snapshot
2024-03-20 09:42:27,932 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:27,972 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:28,374 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2024-03-20 09:42:28,820 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:29,239 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:29,649 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:30,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:30,069 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:30,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:30,110 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-03-20 09:42:30,110 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:30,114 [ scc.git] DEBUG Check current status
2024-03-20 09:42:30,115 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:30,119 [ scc.git] DEBUG 1d30faf revert to snapshot
2024-03-20 09:42:30,119 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:30,161 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:30,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2024-03-20 09:42:31,019 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:31,435 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:31,857 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:32,270 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:32,271 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:32,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:32,308 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-03-20 09:42:32,308 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-20 09:42:32,312 [ scc.git] DEBUG Check current status
2024-03-20 09:42:32,312 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:32,315 [ scc.git] DEBUG d094154d Merge pull request #171 from scuniff/bug-170
2024-03-20 09:42:32,315 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:32,358 [ scc.config] DEBUG Found remote.origin.url
2024-03-20 09:42:32,776 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2024-03-20 09:42:33,242 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-20 09:42:33,658 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-20 09:42:34,068 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-20 09:42:34,486 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-20 09:42:34,487 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:34,527 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:34,527 [ scc.git] DEBUG Resetting...
2024-03-20 09:42:34,527 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-03-20 09:42:34,534 [ scc.git] DEBUG HEAD is now at a47f398 merge master -Dorg -Snone
2024-03-20 09:42:34,534 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-03-20 09:42:34,593 [ scc.git] DEBUG Check current status
2024-03-20 09:42:34,593 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-20 09:42:34,597 [ scc.git] DEBUG a47f398 merge master -Dorg -Snone
2024-03-20 09:42:34,598 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-20 09:42:34,638 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-20 09:42:34,640 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-20 09:42:34,643 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-20 09:42:34,646 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-20 09:42:34,649 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-20 09:42:34,651 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-20 09:42:34,654 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-20 09:42:34,655 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-03-20 09:42:34,655 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-03-20 09:42:34,656 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-03-20 09:42:34,656 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-03-20 09:42:34,656 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-03-20 09:42:34,656 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-03-20 09:42:34,656 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:42:34,916 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-03-20 09:42:34,916 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:42:34,916 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:34,917 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:34,921 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:42:34,925 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:42:34,926 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:42:34,930 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:42:34,935 [ scc.git] DEBUG Already up to date.
2024-03-20 09:42:34,935 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:42:34,936 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:34,936 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:34,940 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:42:34,982 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:34,983 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:34,986 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:42:35,466 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2024-03-20 09:42:35,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None
2024-03-20 09:42:36,396 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None
2024-03-20 09:42:36,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2024-03-20 09:42:37,316 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2024-03-20 09:42:37,819 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3 HTTP/1.1" 200 None
2024-03-20 09:42:38,275 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-20 09:42:38,802 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3 HTTP/1.1" 200 None
2024-03-20 09:42:39,216 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:42:39,216 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2024-03-20 09:42:39,653 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None
2024-03-20 09:42:40,159 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-03-20 09:42:40,594 [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-03-20 09:42:41,074 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-03-20 09:42:41,497 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/112d3abc997c6cda0078483bb91786e37a3f1f87?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:42:41,498 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:42:41,946 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2024-03-20 09:42:42,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2024-03-20 09:42:42,902 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-03-20 09:42:43,357 [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-03-20 09:42:43,845 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-03-20 09:42:44,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/statuses/4ef8809efaee231eb83e45e64a852a9808bc4723?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:42:44,269 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-03-20 09:42:44,269 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:42:44,269 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-03-20 09:42:44,269 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:44,269 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:44,274 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:42:44,279 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:42:44,279 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:42:44,283 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:42:44,288 [ scc.git] DEBUG Already up to date.
2024-03-20 09:42:44,288 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2024-03-20 09:42:44,730 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-03-20 09:42:44,730 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2024-03-20 09:42:44,735 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-20 09:42:45,131 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-03-20 09:42:45,131 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-20 09:42:45,136 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2024-03-20 09:42:45,554 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-03-20 09:42:45,554 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2024-03-20 09:42:45,559 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:42:45,559 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:45,559 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:45,563 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-03-20 09:42:45,568 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:45,572 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 119 (Take Ice and omero sysenv variables into account) 4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-03-20 09:42:45,593 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2024-03-20 09:42:45,594 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:42:45,597 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2024-03-20 09:42:45,597 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-03-20 09:42:45,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:45,755 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87'
2024-03-20 09:42:45,762 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:45,766 [ 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-03-20 09:42:45,780 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:42:45,781 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:42:45,784 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:42:45,784 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:42:46,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:46,161 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3'
2024-03-20 09:42:46,167 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:46,172 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3'
2024-03-20 09:42:46,186 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:42:46,188 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2024-03-20 09:42:46,188 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:42:46,598 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:46,599 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:42:46,636 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:46,636 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:46,640 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:46,680 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:42:46,688 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c3eedc0> has no local changes
2024-03-20 09:42:46,689 [ 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'
Generated by OMERO-build-push#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:42:46,698 [ scc.git] DEBUG [detached HEAD bc6ccd1d] merge master -Dorg -Ssuccess-only
2024-03-20 09:42:46,699 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:46,699 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:42:47,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2024-03-20 09:42:47,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/43 HTTP/1.1" 200 None
2024-03-20 09:42:48,119 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None
2024-03-20 09:42:48,565 [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-03-20 09:42:49,128 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/38d376c831b5d3ea1b8806c5791df403555fc170 HTTP/1.1" 200 None
2024-03-20 09:42:49,562 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/38d376c831b5d3ea1b8806c5791df403555fc170?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:42:49,563 [ scc.repo] DEBUG - PR 43 sbesson 'Mark omero.security.ignore_case as production property'
2024-03-20 09:42:50,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2024-03-20 09:42:50,453 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2024-03-20 09:42:50,943 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-03-20 09:42:51,439 [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-03-20 09:42:54,021 [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-03-20 09:42:54,516 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-03-20 09:42:54,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/92e4d3ee9bd655e531156415863a1defa7d0ab39?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:42:54,941 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2024-03-20 09:42:55,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None
2024-03-20 09:42:55,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-03-20 09:42:56,327 [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-03-20 09:42:56,850 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-03-20 09:42:57,263 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/statuses/4a9d6c24778791d07f2c42951a5c1a6e3c711007?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:42:57,263 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:42:57,264 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:42:57,264 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-03-20 09:42:57,264 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:57,264 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:57,269 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:42:57,273 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:42:57,273 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:42:57,277 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:42:57,282 [ scc.git] DEBUG Already up to date.
2024-03-20 09:42:57,282 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head'
2024-03-20 09:42:57,697 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-03-20 09:42:57,697 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD
2024-03-20 09:42:57,702 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2024-03-20 09:42:58,107 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-03-20 09:42:58,107 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2024-03-20 09:42:58,112 [ scc.git] DEBUG Calling 'git fetch origin pull/43/head'
2024-03-20 09:42:58,686 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-03-20 09:42:58,686 [ scc.git] DEBUG * branch refs/pull/43/head -> FETCH_HEAD
2024-03-20 09:42:58,688 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:42:58,688 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:58,688 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:58,692 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007'
2024-03-20 09:42:58,697 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:58,701 [ 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-03-20 09:42:58,724 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:42:58,725 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:42:58,728 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:42:58,728 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:42:58,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:58,887 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-03-20 09:42:58,892 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:58,896 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-03-20 09:42:58,907 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:42:58,909 [ scc.git] DEBUG publish.gradle | 17 +----------------
2024-03-20 09:42:58,909 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2024-03-20 09:42:59,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:59,289 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...38d376c831b5d3ea1b8806c5791df403555fc170'
2024-03-20 09:42:59,294 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:59,299 [ 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-03-20 09:42:59,308 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:42:59,310 [ scc.git] DEBUG src/main/resources/omero-common.properties | 1 -
2024-03-20 09:42:59,310 [ scc.git] DEBUG 1 file changed, 1 deletion(-)
2024-03-20 09:42:59,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:42:59,692 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:42:59,728 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:42:59,728 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:42:59,732 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:42:59,770 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:42:59,777 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c3ee4c0> has no local changes
2024-03-20 09:42:59,777 [ 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#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:42:59,784 [ scc.git] DEBUG [detached HEAD c3c31ba] merge master -Dorg -Ssuccess-only
2024-03-20 09:42:59,784 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:42:59,784 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:43:00,281 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2024-03-20 09:43:00,733 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None
2024-03-20 09:43:01,215 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None
2024-03-20 09:43:01,716 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None
2024-03-20 09:43:02,212 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-03-20 09:43:02,680 [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-03-20 09:43:03,176 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-03-20 09:43:03,587 [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-03-20 09:43:03,587 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:04,032 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2024-03-20 09:43:04,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2024-03-20 09:43:04,541 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:43:04,541 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-03-20 09:43:04,541 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:04,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:04,545 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:43:04,549 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:43:04,549 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:43:04,554 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:43:04,558 [ scc.git] DEBUG Already up to date.
2024-03-20 09:43:04,558 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-03-20 09:43:04,967 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-03-20 09:43:04,967 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-03-20 09:43:04,971 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:43:04,972 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:04,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:04,975 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c'
2024-03-20 09:43:04,981 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:04,985 [ 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-03-20 09:43:05,030 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:05,030 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:05,033 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:43:05,033 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:05,213 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:05,215 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:43:05,252 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:05,253 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:05,257 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:43:05,302 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:43:05,308 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c3eedf0> has no local changes
2024-03-20 09:43:05,309 [ 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#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:43:05,316 [ scc.git] DEBUG [detached HEAD 7422ab2] merge master -Dorg -Ssuccess-only
2024-03-20 09:43:05,316 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:05,317 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:43:05,772 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None
2024-03-20 09:43:06,227 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/98 HTTP/1.1" 200 None
2024-03-20 09:43:06,740 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/8d3794cfa717070cced73b37c194d6552042366d HTTP/1.1" 200 None
2024-03-20 09:43:07,235 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/8d3794cfa717070cced73b37c194d6552042366d/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-20 09:43:07,713 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/8d3794cfa717070cced73b37c194d6552042366d/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-20 09:43:08,190 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/8d3794cfa717070cced73b37c194d6552042366d HTTP/1.1" 200 None
2024-03-20 09:43:08,591 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/8d3794cfa717070cced73b37c194d6552042366d?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:08,591 [ scc.repo] DEBUG - PR 98 dgault 'Bump Bio-Formats to version 7.2.0'
2024-03-20 09:43:09,028 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None
2024-03-20 09:43:09,488 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None
2024-03-20 09:43:09,991 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-03-20 09:43:10,446 [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-03-20 09:43:10,876 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-03-20 09:43:11,298 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/statuses/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:11,299 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:11,299 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:43:11,299 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-03-20 09:43:11,299 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:11,299 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:11,304 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:43:11,307 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:43:11,307 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:43:11,312 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:43:11,316 [ scc.git] DEBUG Already up to date.
2024-03-20 09:43:11,317 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-03-20 09:43:11,744 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-03-20 09:43:11,744 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-03-20 09:43:11,749 [ scc.git] DEBUG Calling 'git fetch origin pull/98/head'
2024-03-20 09:43:12,145 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-03-20 09:43:12,145 [ scc.git] DEBUG * branch refs/pull/98/head -> FETCH_HEAD
2024-03-20 09:43:12,149 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:43:12,150 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:12,150 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:12,154 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5'
2024-03-20 09:43:12,159 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:12,163 [ 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-03-20 09:43:12,184 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:12,184 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:12,187 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:43:12,187 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:12,340 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:12,341 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8d3794cfa717070cced73b37c194d6552042366d'
2024-03-20 09:43:12,346 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:12,350 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 98 (Bump Bio-Formats to version 7.2.0) 8d3794cfa717070cced73b37c194d6552042366d'
2024-03-20 09:43:12,368 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:12,369 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:12,371 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:43:12,371 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:12,745 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:12,748 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:43:12,784 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:12,785 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:12,789 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:43:12,824 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:43:12,830 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c4101f0> has no local changes
2024-03-20 09:43:12,830 [ 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 98 dgault 'Bump Bio-Formats to version 7.2.0'
Generated by OMERO-build-push#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:43:12,837 [ scc.git] DEBUG [detached HEAD 74b9816] merge master -Dorg -Ssuccess-only
2024-03-20 09:43:12,837 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:12,837 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:43:13,285 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2024-03-20 09:43:13,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None
2024-03-20 09:43:14,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-03-20 09:43:14,708 [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-03-20 09:43:15,211 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-03-20 09:43:15,627 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/statuses/4431628b7553af56df3e6dceb1241be4b2e6a751?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:15,628 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:16,093 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2024-03-20 09:43:16,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2024-03-20 09:43:16,605 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-03-20 09:43:16,605 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:43:16,605 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-03-20 09:43:16,605 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:16,606 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:16,610 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:43:16,613 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:43:16,613 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:43:16,619 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:43:16,623 [ scc.git] DEBUG Already up to date.
2024-03-20 09:43:16,624 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-03-20 09:43:17,024 [ scc.git] DEBUG From https://github.com/ome/omero-renderer
2024-03-20 09:43:17,025 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-03-20 09:43:17,029 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:43:17,029 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:17,029 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:17,033 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751'
2024-03-20 09:43:17,037 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:17,040 [ 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-03-20 09:43:17,213 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:17,213 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:17,216 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:43:17,216 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:17,385 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:17,387 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:43:17,422 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:17,422 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:17,427 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:43:17,462 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:43:17,468 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c3ffa00> has no local changes
2024-03-20 09:43:17,468 [ 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#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:43:17,475 [ scc.git] DEBUG [detached HEAD b04c140] merge master -Dorg -Ssuccess-only
2024-03-20 09:43:17,476 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:17,476 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:43:17,923 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2024-03-20 09:43:18,400 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None
2024-03-20 09:43:18,972 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-03-20 09:43:19,428 [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-03-20 09:43:19,927 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-03-20 09:43:20,345 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/statuses/3e957802ff410901610d23f11c9f2a7db50fa19d?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:20,346 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:20,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2024-03-20 09:43:21,255 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2024-03-20 09:43:21,256 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:43:21,256 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-03-20 09:43:21,257 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:21,257 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:21,261 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:43:21,265 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:43:21,265 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:43:21,269 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:43:21,273 [ scc.git] DEBUG Already up to date.
2024-03-20 09:43:21,273 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head'
2024-03-20 09:43:21,679 [ scc.git] DEBUG From https://github.com/ome/omero-romio
2024-03-20 09:43:21,680 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD
2024-03-20 09:43:21,686 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:43:21,686 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:21,686 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:21,690 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d'
2024-03-20 09:43:21,694 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:21,697 [ 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-03-20 09:43:21,712 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:21,712 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:21,715 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:43:21,715 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:21,880 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:21,881 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:43:21,925 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:21,926 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:21,931 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:43:21,973 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:43:21,979 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c3a7040> has no local changes
2024-03-20 09:43:21,979 [ 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#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:43:21,987 [ scc.git] DEBUG [detached HEAD 0b97250] merge master -Dorg -Ssuccess-only
2024-03-20 09:43:21,988 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:21,988 [ scc.repo] DEBUG ## PRs found:
2024-03-20 09:43:22,572 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2024-03-20 09:43:23,029 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None
2024-03-20 09:43:23,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-03-20 09:43:24,006 [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-03-20 09:43:24,465 [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-03-20 09:43:24,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-03-20 09:43:25,375 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:25,375 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits'
2024-03-20 09:43:25,838 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/176 HTTP/1.1" 200 None
2024-03-20 09:43:26,278 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/176/comments HTTP/1.1" 200 None
2024-03-20 09:43:26,795 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/6c1426b72fb6ff05453aeccbc1fbf3848d13e638 HTTP/1.1" 200 None
2024-03-20 09:43:27,416 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/6c1426b72fb6ff05453aeccbc1fbf3848d13e638/check-suites?app_id=15368&per_page=1 HTTP/1.1" 200 None
2024-03-20 09:43:28,189 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/6c1426b72fb6ff05453aeccbc1fbf3848d13e638/check-suites?app_id=15368 HTTP/1.1" 200 None
2024-03-20 09:43:28,621 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/6c1426b72fb6ff05453aeccbc1fbf3848d13e638 HTTP/1.1" 200 None
2024-03-20 09:43:29,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/6c1426b72fb6ff05453aeccbc1fbf3848d13e638?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:29,034 [ scc.repo] DEBUG - PR 176 chris-allan 'Session bean actions should happen at `SYSTEM` priority'
2024-03-20 09:43:29,481 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None
2024-03-20 09:43:29,938 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None
2024-03-20 09:43:30,397 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/168 HTTP/1.1" 200 None
2024-03-20 09:43:30,860 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/168/comments HTTP/1.1" 200 None
2024-03-20 09:43:31,324 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2024-03-20 09:43:31,788 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2024-03-20 09:43:32,284 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2024-03-20 09:43:32,718 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2024-03-20 09:43:33,209 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-03-20 09:43:33,669 [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-03-20 09:43:34,148 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-03-20 09:43:34,574 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/3e65b9de901fc160c380da602def943206fe9b1d?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:34,574 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2024-03-20 09:43:35,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None
2024-03-20 09:43:35,604 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-03-20 09:43:36,032 [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-03-20 09:43:36,554 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-03-20 09:43:36,982 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:36,983 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:37,438 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2024-03-20 09:43:37,885 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2024-03-20 09:43:38,402 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-03-20 09:43:38,856 [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-03-20 09:43:39,323 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-03-20 09:43:39,746 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/statuses/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf?per_page=1 HTTP/1.1" 200 2
2024-03-20 09:43:39,747 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-03-20 09:43:39,748 [ scc.repo] DEBUG ## Branches found:
2024-03-20 09:43:39,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-03-20 09:43:39,748 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:39,748 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:39,753 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-20 09:43:39,757 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-20 09:43:39,757 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-20 09:43:39,761 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-20 09:43:39,765 [ scc.git] DEBUG Already up to date.
2024-03-20 09:43:39,765 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2024-03-20 09:43:40,292 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-20 09:43:40,292 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2024-03-20 09:43:40,297 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head'
2024-03-20 09:43:40,713 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-20 09:43:40,713 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD
2024-03-20 09:43:40,718 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2024-03-20 09:43:41,142 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-20 09:43:41,142 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2024-03-20 09:43:41,147 [ scc.git] DEBUG Calling 'git fetch origin pull/176/head'
2024-03-20 09:43:41,534 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-20 09:43:41,534 [ scc.git] DEBUG * branch refs/pull/176/head -> FETCH_HEAD
2024-03-20 09:43:41,538 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head'
2024-03-20 09:43:41,946 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-20 09:43:41,946 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD
2024-03-20 09:43:41,950 [ scc.git] DEBUG ## Unique users: []
2024-03-20 09:43:41,951 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:41,951 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:41,955 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-03-20 09:43:41,962 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:41,966 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 61 (Pass user executor to rendering tasks) 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-03-20 09:43:42,034 [ scc.git] DEBUG CONFLICT (modify/delete): .travis.yml deleted in HEAD and modified in 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf. Version 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf of .travis.yml left in tree.
2024-03-20 09:43:42,034 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:42,034 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2024-03-20 09:43:42,036 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-20 09:43:42,036 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-20 09:43:42,043 [ scc.git] DEBUG Calling 'git reset --hard d094154d749b5a41d8bf976e5a648b06fdc16930'
2024-03-20 09:43:42,052 [ scc.git] DEBUG HEAD is now at d094154d Merge pull request #171 from scuniff/bug-170
2024-03-20 09:43:42,201 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:42,203 [ scc.git] DEBUG Calling 'git merge-base d094154d749b5a41d8bf976e5a648b06fdc16930 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-03-20 09:43:42,209 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..d094154d749b5a41d8bf976e5a648b06fdc16930'
2024-03-20 09:43:42,214 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#6](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .travis.yml
- build.gradle
--conflicts
2024-03-20 09:43:42,217 [ scc.config] DEBUG Found github.token
2024-03-20 09:43:42,218 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2024-03-20 09:43:42,218 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374'
2024-03-20 09:43:42,222 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:42,226 [ 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-03-20 09:43:42,253 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-20 09:43:42,254 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:42,256 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-20 09:43:42,257 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:42,607 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:42,608 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2024-03-20 09:43:42,615 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:42,619 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2024-03-20 09:43:42,655 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:42,658 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2024-03-20 09:43:42,658 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-20 09:43:43,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:43,018 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c1426b72fb6ff05453aeccbc1fbf3848d13e638'
2024-03-20 09:43:43,024 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:43,029 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 176 (Session bean actions should happen at `SYSTEM` priority) 6c1426b72fb6ff05453aeccbc1fbf3848d13e638'
2024-03-20 09:43:43,056 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:43,059 [ scc.git] DEBUG src/main/java/ome/services/sessions/SessionBean.java | 15 ++++++++-------
2024-03-20 09:43:43,059 [ scc.git] DEBUG .../ome/server/utests/sessions/SessionBeanUnitTest.java | 4 ++--
2024-03-20 09:43:43,059 [ scc.git] DEBUG 2 files changed, 10 insertions(+), 9 deletions(-)
2024-03-20 09:43:43,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:43,409 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff'
2024-03-20 09:43:43,414 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:43,418 [ 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-03-20 09:43:43,433 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-20 09:43:43,436 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++--
2024-03-20 09:43:43,436 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2024-03-20 09:43:43,818 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:43,819 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-20 09:43:43,859 [ scc.git] DEBUG Get sha1 of %s
2024-03-20 09:43:43,859 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-20 09:43:43,863 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:43:43,899 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:43:43,909 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9c3ab4f0> has no local changes
2024-03-20 09:43:43,909 [ scc.git] DEBUG Calling 'git commit --allow-empty -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-server
Excluded PRs:
- PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' (stage: draft)
- PR 168 scuniff '#167 equals() comparing objects of different types' (user: scuniff)
- 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 176 chris-allan 'Session bean actions should happen at `SYSTEM` priority'
- 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#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:43:43,920 [ scc.git] DEBUG [detached HEAD ed08f4e7] merge master -Dorg -Ssuccess-only
2024-03-20 09:43:43,920 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:43,920 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-20 09:43:43,969 [ scc.config] DEBUG Found submodule.omero-blitz.url
2024-03-20 09:43:44,220 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:44,230 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2024-03-20 09:43:44,233 [ scc.config] DEBUG Found submodule.omero-common.url
2024-03-20 09:43:44,631 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:44,640 [ scc.config] DEBUG Found submodule.omero-common.branch
2024-03-20 09:43:44,645 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2024-03-20 09:43:45,038 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:45,047 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2024-03-20 09:43:45,050 [ scc.config] DEBUG Found submodule.omero-model.url
2024-03-20 09:43:45,439 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:45,448 [ scc.config] DEBUG Found submodule.omero-model.branch
2024-03-20 09:43:45,453 [ scc.config] DEBUG Found submodule.omero-renderer.url
2024-03-20 09:43:45,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:45,861 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2024-03-20 09:43:45,864 [ scc.config] DEBUG Found submodule.omero-romio.url
2024-03-20 09:43:46,269 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:46,279 [ scc.config] DEBUG Found submodule.omero-romio.branch
2024-03-20 09:43:46,284 [ scc.config] DEBUG Found submodule.omero-server.url
2024-03-20 09:43:46,679 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-20 09:43:46,688 [ scc.config] DEBUG Found submodule.omero-server.branch
2024-03-20 09:43:46,688 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-20 09:43:46,726 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7f0b9f70fd30> has local changes
2024-03-20 09:43:46,727 [ scc.git] DEBUG Calling 'git commit -a -n -m merge master -Dorg -Ssuccess-only
Repository: ome/omero-build
Already up to date.
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'
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 98 dgault 'Bump Bio-Formats to version 7.2.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 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' (stage: draft)
- PR 168 scuniff '#167 equals() comparing objects of different types' (user: scuniff)
- 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 176 chris-allan 'Session bean actions should happen at `SYSTEM` priority'
- 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#6 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/6/)'
2024-03-20 09:43:46,736 [ scc.git] DEBUG [detached HEAD 059ca2c] merge master -Dorg -Ssuccess-only
2024-03-20 09:43:46,736 [ scc.merge] INFO Repository: ome/omero-build
2024-03-20 09:43:46,737 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2024-03-20 09:43:46,737 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,737 [ scc.merge] INFO
2024-03-20 09:43:46,737 [ scc.merge] INFO
2024-03-20 09:43:46,737 [ scc.merge] INFO Repository: ome/omero-blitz
2024-03-20 09:43:46,737 [ scc.merge] INFO Excluded PRs:
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft)
2024-03-20 09:43:46,737 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,737 [ scc.merge] INFO
2024-03-20 09:43:46,737 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2024-03-20 09:43:46,737 [ scc.merge] INFO
2024-03-20 09:43:46,737 [ scc.merge] INFO Repository: ome/omero-common
2024-03-20 09:43:46,737 [ scc.merge] INFO Excluded PRs:
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2024-03-20 09:43:46,737 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,737 [ scc.merge] INFO
2024-03-20 09:43:46,737 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,737 [ scc.merge] INFO - PR 42 jburel 'include all'
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 43 sbesson 'Mark omero.security.ignore_case as production property'
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Repository: ome/omero-gateway-java
2024-03-20 09:43:46,738 [ scc.merge] INFO Excluded PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier)
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2024-03-20 09:43:46,738 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Repository: ome/omero-model
2024-03-20 09:43:46,738 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 98 dgault 'Bump Bio-Formats to version 7.2.0'
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Repository: ome/omero-renderer
2024-03-20 09:43:46,738 [ scc.merge] INFO Excluded PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2024-03-20 09:43:46,738 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Repository: ome/omero-romio
2024-03-20 09:43:46,738 [ scc.merge] INFO Excluded PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2024-03-20 09:43:46,738 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,738 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,738 [ scc.merge] INFO
2024-03-20 09:43:46,738 [ scc.merge] INFO Repository: ome/omero-server
2024-03-20 09:43:46,739 [ scc.merge] INFO Excluded PRs:
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' (stage: draft)
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 168 scuniff '#167 equals() comparing objects of different types' (user: scuniff)
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2024-03-20 09:43:46,739 [ scc.merge] INFO Already up to date.
2024-03-20 09:43:46,739 [ scc.merge] INFO
2024-03-20 09:43:46,739 [ scc.merge] INFO Merged PRs:
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 176 chris-allan 'Session bean actions should happen at `SYSTEM` priority'
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits'
2024-03-20 09:43:46,739 [ scc.merge] INFO
2024-03-20 09:43:46,739 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-20 09:43:46,739 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-03-20 09:43:46,739 [ scc.merge] INFO
2024-03-20 09:43:46,739 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-20 09:43:46,739 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,743 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-03-20 09:43:46,744 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,747 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:46,748 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-03-20 09:43:46,748 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:46,751 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-03-20 09:43:46,752 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:46,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-03-20 09:43:46,755 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:46,759 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-03-20 09:43:46,759 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:46,763 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-03-20 09:43:46,764 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-20 09:43:46,767 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-03-20 09:43:46,767 [ scc.git] DEBUG Calling 'git remote'
2024-03-20 09:43:46,771 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
Update component versions
Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-server from 5.6.10 to 5.6.11-SNAPSHOT
Updating omero-model from 5.6.13 to 5.6.14-SNAPSHOT
Updating omero-blitz from 5.7.2 to 5.7.3-SNAPSHOT
Updating formats-gpl from 7.2.0 to 8.0.0-SNAPSHOT
Updating omero-romio from 5.7.5 to 5.7.6-SNAPSHOT
Updating omero-common from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-common-test from 5.6.4 to 5.6.5-SNAPSHOT
Updating omero-renderer from 5.5.15 to 5.5.16-SNAPSHOT
Commit all component version changes
Entering 'omero-blitz'
Entering 'omero-common'
Entering 'omero-gateway-java'
Entering 'omero-model'
Entering 'omero-renderer'
Entering 'omero-romio'
Entering 'omero-server'
Entering 'omero-blitz'
[detached HEAD b52cf46c] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD 0a59b8c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD c4c3a8d] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD 092db7c] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD 32ffd8f] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD 0947731] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD d05576e1] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD e3809d1] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2024-03-20 09:44:23,569 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-build/tree/merge_ci
![[Jenkins]](/jenkins/static/695419c3/images/svgs/logo.svg){kind=logo}
