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-14 16:02:39,509 [ scc.config] DEBUG Found github.token
2024-03-14 16:02:39,512 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-03-14 16:02:39,767 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:02:40,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:02:40,600 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-03-14 16:02:40,601 [ scc.gh] DEBUG 4858 remaining from 5000 (Reset at 16:03
2024-03-14 16:02:40,602 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:02:40,606 [ scc.git] DEBUG Check current status
2024-03-14 16:02:40,606 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:40,611 [ scc.git] DEBUG 9adcfe2 Merge pull request #182 from ome/dependabot/submodules/omero-server-d094154
2024-03-14 16:02:40,611 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:40,653 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-14 16:02:40,656 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-14 16:02:40,659 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-14 16:02:40,663 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-14 16:02:40,666 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-14 16:02:40,669 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-14 16:02:40,672 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-14 16:02:40,676 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:02:41,118 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-03-14 16:02:41,636 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:02:42,058 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:02:42,479 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:02:42,905 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:02:42,906 [ scc.git] DEBUG Resetting...
2024-03-14 16:02:42,906 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-03-14 16:02:42,912 [ scc.git] DEBUG HEAD is now at 9adcfe2 Merge pull request #182 from ome/dependabot/submodules/omero-server-d094154
2024-03-14 16:02:42,912 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-03-14 16:02:42,970 [ scc.git] DEBUG Check current status
2024-03-14 16:02:42,970 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:42,974 [ scc.git] DEBUG 9adcfe2 Merge pull request #182 from ome/dependabot/submodules/omero-server-d094154
2024-03-14 16:02:42,974 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:43,016 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-14 16:02:43,020 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-14 16:02:43,023 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-14 16:02:43,026 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-14 16:02:43,028 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-14 16:02:43,031 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-14 16:02:43,034 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-14 16:02:43,035 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-03-14 16:02:43,035 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-03-14 16:02:43,035 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-03-14 16:02:43,035 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-03-14 16:02:43,035 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-03-14 16:02:43,035 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:02:43,353 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-03-14 16:02:43,354 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:02:43,354 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:02:43,354 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:02:43,358 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:02:43,361 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:02:43,362 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:02:43,366 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:02:43,370 [ scc.git] DEBUG Already up to date.
2024-03-14 16:02:43,370 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:02:43,370 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:02:43,370 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:02:43,374 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:02:43,418 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:02:43,418 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:02:43,423 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:02:43,533 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fa8c4f89430> has no local changes
2024-03-14 16:02:43,533 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:02:43,567 [ scc.git] DEBUG [detached HEAD 4aaa148] merge master -Dorg -Snone
2024-03-14 16:02:43,567 [ scc.merge] INFO Repository: ome/omero-build
2024-03-14 16:02:43,567 [ scc.merge] INFO Already up to date.
2024-03-14 16:02:43,567 [ scc.merge] INFO
2024-03-14 16:02:43,567 [ scc.merge] INFO
2024-03-14 16:02:43,568 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-14 16:02:43,568 [ 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-14 16:02:47,888 [ scc.config] DEBUG Found github.token
2024-03-14 16:02:47,891 [urllib3.conn] DEBUG Starting new HTTPS connection (1): api.github.com:443
2024-03-14 16:02:48,139 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:02:48,577 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:02:48,994 [urllib3.conn] DEBUG https://api.github.com:443 "GET /rate_limit HTTP/1.1" 200 None
2024-03-14 16:02:48,995 [ scc.gh] DEBUG 4850 remaining from 5000 (Reset at 16:03
2024-03-14 16:02:48,996 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:02:49,000 [ scc.git] DEBUG Check current status
2024-03-14 16:02:49,000 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:49,004 [ scc.git] DEBUG 4aaa148 merge master -Dorg -Snone
2024-03-14 16:02:49,004 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:49,043 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-14 16:02:49,046 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-14 16:02:49,049 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-14 16:02:49,051 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-14 16:02:49,054 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-14 16:02:49,056 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-14 16:02:49,059 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-14 16:02:49,063 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:02:49,464 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build HTTP/1.1" 200 None
2024-03-14 16:02:49,930 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:02:50,358 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:02:50,925 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:02:51,381 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:02:51,382 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:02:51,434 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-03-14 16:02:51,434 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:02:51,438 [ scc.git] DEBUG Check current status
2024-03-14 16:02:51,438 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:51,441 [ scc.git] DEBUG 1c874820 revert to snapshot
2024-03-14 16:02:51,442 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:51,480 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:02:51,852 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz HTTP/1.1" 200 None
2024-03-14 16:02:52,288 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:02:52,704 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:02:53,116 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:02:53,538 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:02:53,540 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:02:53,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:02:53,578 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-03-14 16:02:53,578 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:02:53,582 [ scc.git] DEBUG Check current status
2024-03-14 16:02:53,583 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:53,586 [ scc.git] DEBUG d19036d revert to snapshot
2024-03-14 16:02:53,586 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:53,629 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:02:54,085 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common HTTP/1.1" 200 None
2024-03-14 16:02:54,556 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:02:54,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:02:55,388 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:02:55,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:02:55,795 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:02:55,832 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:02:55,833 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-03-14 16:02:55,833 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:02:55,836 [ scc.git] DEBUG Check current status
2024-03-14 16:02:55,836 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:55,840 [ scc.git] DEBUG 7b601e0 revert to snapshot
2024-03-14 16:02:55,840 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:55,881 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:02:56,293 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java HTTP/1.1" 200 None
2024-03-14 16:02:56,754 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:02:57,204 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:02:57,617 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:02:58,044 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:02:58,046 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:02:58,082 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:02:58,084 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-03-14 16:02:58,084 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:02:58,087 [ scc.git] DEBUG Check current status
2024-03-14 16:02:58,087 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:02:58,091 [ scc.git] DEBUG 032b6c7 revert to snapshot
2024-03-14 16:02:58,091 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:02:58,134 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:02:58,528 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model HTTP/1.1" 200 None
2024-03-14 16:02:58,973 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:02:59,384 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:02:59,794 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:03:00,207 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:03:00,208 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:00,245 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:00,246 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-03-14 16:03:00,246 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:03:00,249 [ scc.git] DEBUG Check current status
2024-03-14 16:03:00,250 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:03:00,253 [ scc.git] DEBUG a239fb6 revert to snapshot
2024-03-14 16:03:00,253 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:03:00,293 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:03:00,695 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer HTTP/1.1" 200 None
2024-03-14 16:03:01,147 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:03:01,579 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:03:02,080 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:03:02,492 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:03:02,493 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:02,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:02,535 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-03-14 16:03:02,536 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:03:02,539 [ scc.git] DEBUG Check current status
2024-03-14 16:03:02,539 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:03:02,543 [ scc.git] DEBUG 1d30faf revert to snapshot
2024-03-14 16:03:02,543 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:03:02,586 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:03:02,984 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio HTTP/1.1" 200 None
2024-03-14 16:03:03,436 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:03:03,851 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:03:04,286 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:03:04,707 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:03:04,709 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:04,752 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:04,753 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-03-14 16:03:04,753 [ scc.git] DEBUG Calling 'git rev-parse --show-toplevel'
2024-03-14 16:03:04,757 [ scc.git] DEBUG Check current status
2024-03-14 16:03:04,758 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:03:04,762 [ scc.git] DEBUG d094154d Merge pull request #171 from scuniff/bug-170
2024-03-14 16:03:04,762 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:03:04,807 [ scc.config] DEBUG Found remote.origin.url
2024-03-14 16:03:05,206 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server HTTP/1.1" 200 None
2024-03-14 16:03:05,667 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome HTTP/1.1" 200 None
2024-03-14 16:03:06,090 [urllib3.conn] DEBUG https://api.github.com:443 "GET /orgs/ome/members HTTP/1.1" 200 None
2024-03-14 16:03:06,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=2 HTTP/1.1" 200 None
2024-03-14 16:03:06,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /organizations/1831717/members?page=3 HTTP/1.1" 200 None
2024-03-14 16:03:06,933 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:06,974 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:06,974 [ scc.git] DEBUG Resetting...
2024-03-14 16:03:06,975 [ scc.git] DEBUG Calling 'git reset --hard HEAD'
2024-03-14 16:03:06,981 [ scc.git] DEBUG HEAD is now at 4aaa148 merge master -Dorg -Snone
2024-03-14 16:03:06,981 [ scc.git] DEBUG Calling 'git submodule update --recursive'
2024-03-14 16:03:07,038 [ scc.git] DEBUG Check current status
2024-03-14 16:03:07,038 [ scc.git] DEBUG Calling 'git log --oneline -n 1 HEAD'
2024-03-14 16:03:07,042 [ scc.git] DEBUG 4aaa148 merge master -Dorg -Snone
2024-03-14 16:03:07,042 [ scc.git] DEBUG Calling 'git submodule status'
2024-03-14 16:03:07,084 [ scc.git] DEBUG 1c87482083913a1ff77409ebe94ac5518e3db94f omero-blitz (v5.7.2-1-g1c874820)
2024-03-14 16:03:07,088 [ scc.git] DEBUG d19036d541d12d8a9d1c7368810c1c026a2dc5c3 omero-common (v5.6.4-1-gd19036d)
2024-03-14 16:03:07,091 [ scc.git] DEBUG 7b601e02fbb045fe9b12d9437edd262863579065 omero-gateway-java (v5.9.0-1-g7b601e0)
2024-03-14 16:03:07,094 [ scc.git] DEBUG 032b6c7ad3b9621a2e4748388684fc00ed797331 omero-model (v5.6.13-1-g032b6c7)
2024-03-14 16:03:07,096 [ scc.git] DEBUG a239fb6e6f4e490493a64661e9b0644454bab9f2 omero-renderer (v5.5.15-1-ga239fb6)
2024-03-14 16:03:07,099 [ scc.git] DEBUG 1d30fafc4e06c5511cfbb24c25a753925ffb2eb4 omero-romio (v5.7.5-1-g1d30faf)
2024-03-14 16:03:07,101 [ scc.git] DEBUG d094154d749b5a41d8bf976e5a648b06fdc16930 omero-server (v5.6.10-3-gd094154d)
2024-03-14 16:03:07,102 [ scc.merge] INFO Merging Pull Request(s) based on master
2024-03-14 16:03:07,102 [ scc.merge] INFO Including Pull Request(s) opened by any public member of the organization
2024-03-14 16:03:07,102 [ scc.merge] INFO Including Pull Request(s) labelled as include or dependencies
2024-03-14 16:03:07,102 [ scc.merge] INFO Excluding Pull Request(s) staged as draft
2024-03-14 16:03:07,102 [ scc.merge] INFO Excluding Pull Request(s) labelled as exclude or breaking
2024-03-14 16:03:07,102 [ scc.merge] INFO Excluding Pull Request(s) without successful status
2024-03-14 16:03:07,103 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:07,367 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-build/pulls HTTP/1.1" 200 2
2024-03-14 16:03:07,368 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:07,368 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:07,368 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:07,372 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:07,377 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:07,377 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:07,382 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:07,387 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:07,387 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:07,387 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:07,387 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:07,391 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:07,438 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:07,438 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:07,443 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:08,036 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/pulls HTTP/1.1" 200 None
2024-03-14 16:03:08,510 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142 HTTP/1.1" 200 None
2024-03-14 16:03:08,975 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/142/comments HTTP/1.1" 200 None
2024-03-14 16:03:09,449 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132 HTTP/1.1" 200 None
2024-03-14 16:03:09,894 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/132/comments HTTP/1.1" 200 None
2024-03-14 16:03:10,389 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3 HTTP/1.1" 200 None
2024-03-14 16:03:10,835 [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-14 16:03:11,325 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3 HTTP/1.1" 200 None
2024-03-14 16:03:11,743 [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-14 16:03:11,744 [ scc.repo] DEBUG - PR 132 jburel 'Fix javadoc warning'
2024-03-14 16:03:12,237 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/131 HTTP/1.1" 200 None
2024-03-14 16:03:12,726 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-03-14 16:03:13,164 [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-14 16:03:13,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/112d3abc997c6cda0078483bb91786e37a3f1f87 HTTP/1.1" 200 None
2024-03-14 16:03:14,074 [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-14 16:03:14,074 [ scc.repo] DEBUG - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:03:14,550 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119 HTTP/1.1" 200 None
2024-03-14 16:03:14,993 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/issues/119/comments HTTP/1.1" 200 None
2024-03-14 16:03:15,534 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-03-14 16:03:15,988 [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-14 16:03:16,443 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-blitz/commits/4ef8809efaee231eb83e45e64a852a9808bc4723 HTTP/1.1" 200 None
2024-03-14 16:03:16,861 [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-14 16:03:16,862 [ scc.repo] DEBUG - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-03-14 16:03:16,862 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:16,862 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-03-14 16:03:16,863 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:16,863 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:16,868 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:16,871 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:16,872 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:16,876 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:16,880 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:16,881 [ scc.git] DEBUG Calling 'git fetch origin pull/119/head'
2024-03-14 16:03:17,464 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-03-14 16:03:17,464 [ scc.git] DEBUG * branch refs/pull/119/head -> FETCH_HEAD
2024-03-14 16:03:17,466 [ scc.git] DEBUG Calling 'git fetch origin pull/131/head'
2024-03-14 16:03:18,043 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-03-14 16:03:18,043 [ scc.git] DEBUG * branch refs/pull/131/head -> FETCH_HEAD
2024-03-14 16:03:18,046 [ scc.git] DEBUG Calling 'git fetch origin pull/132/head'
2024-03-14 16:03:18,631 [ scc.git] DEBUG From https://github.com/ome/omero-blitz
2024-03-14 16:03:18,632 [ scc.git] DEBUG * branch refs/pull/132/head -> FETCH_HEAD
2024-03-14 16:03:18,634 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:18,634 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:18,634 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:18,638 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4ef8809efaee231eb83e45e64a852a9808bc4723'
2024-03-14 16:03:18,644 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:18,647 [ 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-14 16:03:18,662 [ scc.git] DEBUG Auto-merging src/main/java/omero/client.java
2024-03-14 16:03:18,663 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:18,666 [ scc.git] DEBUG src/main/java/omero/client.java | 6 ++++++
2024-03-14 16:03:18,666 [ scc.git] DEBUG 1 file changed, 6 insertions(+)
2024-03-14 16:03:18,829 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:18,830 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...112d3abc997c6cda0078483bb91786e37a3f1f87'
2024-03-14 16:03:18,836 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:18,839 [ 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-14 16:03:18,852 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:18,854 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:18,856 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:18,856 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:19,240 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:19,241 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3'
2024-03-14 16:03:19,248 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:19,252 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 132 (Fix javadoc warning) bbc8b2a14a2e38ee61abd750f5a01f13dd7977f3'
2024-03-14 16:03:19,267 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:19,269 [ scc.git] DEBUG src/main/slice/omero/api/ThumbnailStore.ice | 2 +-
2024-03-14 16:03:19,269 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:19,656 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:19,657 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:19,697 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:19,698 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:19,702 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:19,739 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:03:19,748 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef80329760> has no local changes
2024-03-14 16:03:19,748 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:03:19,760 [ scc.git] DEBUG [detached HEAD 99a9ef70] merge master -Dorg -Ssuccess-only
2024-03-14 16:03:19,761 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:19,761 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:20,180 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/pulls HTTP/1.1" 200 None
2024-03-14 16:03:20,646 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42 HTTP/1.1" 200 None
2024-03-14 16:03:21,108 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/42/comments HTTP/1.1" 200 None
2024-03-14 16:03:21,602 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-03-14 16:03:22,101 [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-14 16:03:22,595 [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-14 16:03:23,098 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/92e4d3ee9bd655e531156415863a1defa7d0ab39 HTTP/1.1" 200 None
2024-03-14 16:03:23,515 [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-14 16:03:23,515 [ scc.repo] DEBUG - PR 42 jburel 'include all'
2024-03-14 16:03:23,997 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/issues/39 HTTP/1.1" 200 None
2024-03-14 16:03:24,520 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-03-14 16:03:24,983 [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-14 16:03:25,499 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-common/commits/4a9d6c24778791d07f2c42951a5c1a6e3c711007 HTTP/1.1" 200 None
2024-03-14 16:03:25,915 [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-14 16:03:25,916 [ scc.repo] DEBUG - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:03:25,916 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:25,916 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-03-14 16:03:25,916 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:25,916 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:25,921 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:25,926 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:25,926 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:25,930 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:25,935 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:25,935 [ scc.git] DEBUG Calling 'git fetch origin pull/39/head'
2024-03-14 16:03:26,573 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-03-14 16:03:26,573 [ scc.git] DEBUG * branch refs/pull/39/head -> FETCH_HEAD
2024-03-14 16:03:26,576 [ scc.git] DEBUG Calling 'git fetch origin pull/42/head'
2024-03-14 16:03:27,346 [ scc.git] DEBUG From https://github.com/ome/omero-common
2024-03-14 16:03:27,347 [ scc.git] DEBUG * branch refs/pull/42/head -> FETCH_HEAD
2024-03-14 16:03:27,348 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:27,349 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:27,349 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:27,353 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4a9d6c24778791d07f2c42951a5c1a6e3c711007'
2024-03-14 16:03:27,357 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:27,361 [ 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-14 16:03:27,370 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:27,370 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:27,372 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:27,373 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:27,535 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:27,536 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-03-14 16:03:27,541 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:27,545 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 42 (include all) 92e4d3ee9bd655e531156415863a1defa7d0ab39'
2024-03-14 16:03:27,555 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:27,557 [ scc.git] DEBUG publish.gradle | 17 +----------------
2024-03-14 16:03:27,557 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 16 deletions(-)
2024-03-14 16:03:27,949 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:27,951 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:27,987 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:27,987 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:27,991 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:28,028 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:03:28,034 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef80329df0> has no local changes
2024-03-14 16:03:28,034 [ 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'
Generated by OMERO-build-push#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:03:28,042 [ scc.git] DEBUG [detached HEAD 743d0e7] merge master -Dorg -Ssuccess-only
2024-03-14 16:03:28,043 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:28,043 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:28,524 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/pulls HTTP/1.1" 200 None
2024-03-14 16:03:28,979 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86 HTTP/1.1" 200 None
2024-03-14 16:03:29,451 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/86/comments HTTP/1.1" 200 None
2024-03-14 16:03:29,898 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/69 HTTP/1.1" 200 None
2024-03-14 16:03:30,395 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-03-14 16:03:30,855 [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-14 16:03:31,377 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/commits/91d77158637953fa8fd1bdcd6a6a738b064b536c HTTP/1.1" 200 None
2024-03-14 16:03:31,792 [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-14 16:03:31,793 [ scc.repo] DEBUG - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:03:32,244 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30 HTTP/1.1" 200 None
2024-03-14 16:03:32,753 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-gateway-java/issues/30/comments HTTP/1.1" 200 None
2024-03-14 16:03:32,755 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:32,755 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-03-14 16:03:32,755 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:32,755 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:32,759 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:32,764 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:32,764 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:32,769 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:32,775 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:32,775 [ scc.git] DEBUG Calling 'git fetch origin pull/69/head'
2024-03-14 16:03:33,353 [ scc.git] DEBUG From https://github.com/ome/omero-gateway-java
2024-03-14 16:03:33,353 [ scc.git] DEBUG * branch refs/pull/69/head -> FETCH_HEAD
2024-03-14 16:03:33,355 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:33,355 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:33,355 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:33,359 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...91d77158637953fa8fd1bdcd6a6a738b064b536c'
2024-03-14 16:03:33,363 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:33,367 [ 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-14 16:03:33,375 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:33,376 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:33,377 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:33,378 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:33,548 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:33,549 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:33,591 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:33,591 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:33,595 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:33,637 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:03:33,643 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef80329250> has no local changes
2024-03-14 16:03:33,644 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:03:33,652 [ scc.git] DEBUG [detached HEAD 45265c7] merge master -Dorg -Ssuccess-only
2024-03-14 16:03:33,653 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:33,653 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:34,082 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/pulls HTTP/1.1" 200 None
2024-03-14 16:03:34,513 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/98 HTTP/1.1" 200 None
2024-03-14 16:03:35,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/8d3794cfa717070cced73b37c194d6552042366d HTTP/1.1" 200 None
2024-03-14 16:03:35,517 [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-14 16:03:35,978 [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-14 16:03:36,419 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/8d3794cfa717070cced73b37c194d6552042366d HTTP/1.1" 200 None
2024-03-14 16:03:36,825 [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-14 16:03:36,825 [ scc.repo] DEBUG - PR 98 dgault 'Bump Bio-Formats to version 7.2.0'
2024-03-14 16:03:37,273 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90 HTTP/1.1" 200 None
2024-03-14 16:03:37,730 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/issues/90/comments HTTP/1.1" 200 None
2024-03-14 16:03:38,224 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-03-14 16:03:38,677 [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-14 16:03:39,160 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-model/commits/3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5 HTTP/1.1" 200 None
2024-03-14 16:03:39,576 [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-14 16:03:39,576 [ scc.repo] DEBUG - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:03:39,576 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:39,577 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-03-14 16:03:39,577 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:39,577 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:39,581 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:39,584 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:39,585 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:39,589 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:39,593 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:39,593 [ scc.git] DEBUG Calling 'git fetch origin pull/90/head'
2024-03-14 16:03:40,188 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-03-14 16:03:40,188 [ scc.git] DEBUG * branch refs/pull/90/head -> FETCH_HEAD
2024-03-14 16:03:40,190 [ scc.git] DEBUG Calling 'git fetch origin pull/98/head'
2024-03-14 16:03:40,757 [ scc.git] DEBUG From https://github.com/ome/omero-model
2024-03-14 16:03:40,757 [ scc.git] DEBUG * branch refs/pull/98/head -> FETCH_HEAD
2024-03-14 16:03:40,760 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:40,760 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:40,760 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:40,764 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3b7c1e081d7d729f9e86b69bfb6f7c26ffd608b5'
2024-03-14 16:03:40,769 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:40,773 [ 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-14 16:03:40,783 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:40,783 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:40,786 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:40,786 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:40,963 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:40,966 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...8d3794cfa717070cced73b37c194d6552042366d'
2024-03-14 16:03:40,972 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:40,976 [ 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-14 16:03:40,985 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:40,986 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:40,988 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:40,988 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:41,408 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:41,409 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:41,448 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:41,448 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:41,452 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:41,488 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:03:41,494 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef802e4760> has no local changes
2024-03-14 16:03:41,494 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:03:41,502 [ scc.git] DEBUG [detached HEAD a651167] merge master -Dorg -Ssuccess-only
2024-03-14 16:03:41,502 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:41,503 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:41,934 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/pulls HTTP/1.1" 200 None
2024-03-14 16:03:42,394 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/23 HTTP/1.1" 200 None
2024-03-14 16:03:42,890 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-03-14 16:03:43,412 [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-14 16:03:43,906 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/commits/4431628b7553af56df3e6dceb1241be4b2e6a751 HTTP/1.1" 200 None
2024-03-14 16:03:44,312 [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-14 16:03:44,313 [ scc.repo] DEBUG - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:03:44,765 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10 HTTP/1.1" 200 None
2024-03-14 16:03:45,248 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-renderer/issues/10/comments HTTP/1.1" 200 None
2024-03-14 16:03:45,250 [ scc.repo] DEBUG # ... Exclude label: exclude
2024-03-14 16:03:45,250 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:45,250 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-03-14 16:03:45,250 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:45,250 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:45,255 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:45,259 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:45,259 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:45,264 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:45,268 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:45,268 [ scc.git] DEBUG Calling 'git fetch origin pull/23/head'
2024-03-14 16:03:46,836 [ scc.git] DEBUG From https://github.com/ome/omero-renderer
2024-03-14 16:03:46,836 [ scc.git] DEBUG * branch refs/pull/23/head -> FETCH_HEAD
2024-03-14 16:03:46,839 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:46,839 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:46,839 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:46,844 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...4431628b7553af56df3e6dceb1241be4b2e6a751'
2024-03-14 16:03:46,849 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:46,853 [ 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-14 16:03:46,862 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:46,862 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:46,865 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:46,865 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:47,017 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:47,018 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:47,058 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:47,059 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:47,063 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:47,101 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:03:47,107 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef802df9d0> has no local changes
2024-03-14 16:03:47,107 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:03:47,114 [ scc.git] DEBUG [detached HEAD a51cc53] merge master -Dorg -Ssuccess-only
2024-03-14 16:03:47,114 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:47,115 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:47,666 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/pulls HTTP/1.1" 200 None
2024-03-14 16:03:47,919 [urllib3.conn] DEBUG Resetting dropped connection: api.github.com
2024-03-14 16:03:48,230 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/41 HTTP/1.1" 200 None
2024-03-14 16:03:48,734 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-03-14 16:03:49,201 [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-14 16:03:49,697 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/commits/3e957802ff410901610d23f11c9f2a7db50fa19d HTTP/1.1" 200 None
2024-03-14 16:03:50,183 [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-14 16:03:50,184 [ scc.repo] DEBUG - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:03:50,620 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14 HTTP/1.1" 200 None
2024-03-14 16:03:51,122 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-romio/issues/14/comments HTTP/1.1" 200 None
2024-03-14 16:03:51,123 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:03:51,123 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-03-14 16:03:51,123 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:51,124 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:51,128 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:03:51,132 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:03:51,133 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:03:51,138 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:03:51,144 [ scc.git] DEBUG Already up to date.
2024-03-14 16:03:51,144 [ scc.git] DEBUG Calling 'git fetch origin pull/41/head'
2024-03-14 16:03:51,739 [ scc.git] DEBUG From https://github.com/ome/omero-romio
2024-03-14 16:03:51,739 [ scc.git] DEBUG * branch refs/pull/41/head -> FETCH_HEAD
2024-03-14 16:03:51,742 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:03:51,742 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:51,742 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:51,747 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e957802ff410901610d23f11c9f2a7db50fa19d'
2024-03-14 16:03:51,752 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:51,756 [ 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-14 16:03:51,765 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:03:51,766 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:03:51,768 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:03:51,768 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:03:51,933 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:03:51,934 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:03:51,970 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:03:51,971 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:03:51,975 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:03:52,013 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:03:52,021 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef80285af0> has no local changes
2024-03-14 16:03:52,021 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:03:52,030 [ scc.git] DEBUG [detached HEAD e8d2b89] merge master -Dorg -Ssuccess-only
2024-03-14 16:03:52,030 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:03:52,030 [ scc.repo] DEBUG ## PRs found:
2024-03-14 16:03:52,635 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/pulls HTTP/1.1" 200 None
2024-03-14 16:03:53,117 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/177 HTTP/1.1" 200 None
2024-03-14 16:03:53,612 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-03-14 16:03:54,092 [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-14 16:03:54,584 [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-14 16:03:55,033 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/cf9c8fe79dfeb4ae0664876dccc7623f56de05ff HTTP/1.1" 200 None
2024-03-14 16:03:55,463 [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-14 16:03:55,464 [ scc.repo] DEBUG - PR 177 chris-allan 'Swap default min and background thread limits'
2024-03-14 16:03:55,940 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/176 HTTP/1.1" 200 None
2024-03-14 16:03:56,426 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/176/comments HTTP/1.1" 200 None
2024-03-14 16:03:57,016 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/6c1426b72fb6ff05453aeccbc1fbf3848d13e638 HTTP/1.1" 200 None
2024-03-14 16:03:57,743 [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-14 16:03:58,207 [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-14 16:03:58,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/6c1426b72fb6ff05453aeccbc1fbf3848d13e638 HTTP/1.1" 200 None
2024-03-14 16:03:59,106 [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-14 16:03:59,107 [ scc.repo] DEBUG - PR 176 chris-allan 'Session bean actions should happen at `SYSTEM` priority'
2024-03-14 16:03:59,565 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175 HTTP/1.1" 200 None
2024-03-14 16:04:00,047 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/175/comments HTTP/1.1" 200 None
2024-03-14 16:04:00,518 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/168 HTTP/1.1" 200 None
2024-03-14 16:04:01,013 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/168/comments HTTP/1.1" 200 None
2024-03-14 16:04:01,489 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166 HTTP/1.1" 200 None
2024-03-14 16:04:01,932 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/166/comments HTTP/1.1" 200 None
2024-03-14 16:04:02,455 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152 HTTP/1.1" 200 None
2024-03-14 16:04:02,936 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/152/comments HTTP/1.1" 200 None
2024-03-14 16:04:03,494 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-03-14 16:04:04,385 [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-14 16:04:04,958 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/3e65b9de901fc160c380da602def943206fe9b1d HTTP/1.1" 200 None
2024-03-14 16:04:05,392 [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-14 16:04:05,393 [ scc.repo] DEBUG - PR 152 jburel 'Set class in doc'
2024-03-14 16:04:05,874 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/151 HTTP/1.1" 200 None
2024-03-14 16:04:06,387 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-03-14 16:04:06,872 [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-14 16:04:07,368 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374 HTTP/1.1" 200 None
2024-03-14 16:04:07,802 [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-14 16:04:07,802 [ scc.repo] DEBUG - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:08,301 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61 HTTP/1.1" 200 None
2024-03-14 16:04:08,764 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/issues/61/comments HTTP/1.1" 200 None
2024-03-14 16:04:09,328 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-03-14 16:04:09,804 [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-14 16:04:10,429 [urllib3.conn] DEBUG https://api.github.com:443 "GET /repos/ome/omero-server/commits/9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf HTTP/1.1" 200 None
2024-03-14 16:04:10,879 [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-14 16:04:10,879 [ scc.repo] DEBUG - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-03-14 16:04:10,880 [ scc.repo] DEBUG ## Branches found:
2024-03-14 16:04:10,880 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-03-14 16:04:10,880 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:04:10,880 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:10,885 [ scc.git] DEBUG Calling 'git show-ref --verify --quiet refs/remotes/origin/master'
2024-03-14 16:04:10,890 [ scc.git] DEBUG ## Merging base to ensure closed PRs are included.
2024-03-14 16:04:10,890 [ scc.git] DEBUG Calling 'git log --oneline --first-parent HEAD..origin/master'
2024-03-14 16:04:10,896 [ scc.git] DEBUG Calling 'git merge --ff-only origin/master'
2024-03-14 16:04:10,901 [ scc.git] DEBUG Already up to date.
2024-03-14 16:04:10,901 [ scc.git] DEBUG Calling 'git fetch origin pull/61/head'
2024-03-14 16:04:11,704 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-14 16:04:11,704 [ scc.git] DEBUG * branch refs/pull/61/head -> FETCH_HEAD
2024-03-14 16:04:11,706 [ scc.git] DEBUG Calling 'git fetch origin pull/151/head'
2024-03-14 16:04:12,304 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-14 16:04:12,304 [ scc.git] DEBUG * branch refs/pull/151/head -> FETCH_HEAD
2024-03-14 16:04:12,307 [ scc.git] DEBUG Calling 'git fetch origin pull/152/head'
2024-03-14 16:04:12,897 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-14 16:04:12,897 [ scc.git] DEBUG * branch refs/pull/152/head -> FETCH_HEAD
2024-03-14 16:04:12,900 [ scc.git] DEBUG Calling 'git fetch origin pull/176/head'
2024-03-14 16:04:13,488 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-14 16:04:13,488 [ scc.git] DEBUG * branch refs/pull/176/head -> FETCH_HEAD
2024-03-14 16:04:13,491 [ scc.git] DEBUG Calling 'git fetch origin pull/177/head'
2024-03-14 16:04:14,094 [ scc.git] DEBUG From https://github.com/ome/omero-server
2024-03-14 16:04:14,094 [ scc.git] DEBUG * branch refs/pull/177/head -> FETCH_HEAD
2024-03-14 16:04:14,096 [ scc.git] DEBUG ## Unique users: []
2024-03-14 16:04:14,097 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:04:14,097 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:14,102 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-03-14 16:04:14,108 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:14,114 [ 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-14 16:04:14,132 [ 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-14 16:04:14,133 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:04:14,133 [ scc.git] DEBUG CONFLICT (content): Merge conflict in build.gradle
2024-03-14 16:04:14,133 [ scc.git] DEBUG Automatic merge failed; fix conflicts and then commit the result.
2024-03-14 16:04:14,134 [ scc.git] DEBUG Calling 'git diff --name-only --diff-filter=U'
2024-03-14 16:04:14,141 [ scc.git] DEBUG Calling 'git reset --hard d094154d749b5a41d8bf976e5a648b06fdc16930'
2024-03-14 16:04:14,150 [ scc.git] DEBUG HEAD is now at d094154d Merge pull request #171 from scuniff/bug-170
2024-03-14 16:04:14,314 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:14,315 [ scc.git] DEBUG Calling 'git merge-base d094154d749b5a41d8bf976e5a648b06fdc16930 9eea4c38f3603bbfb29d2b1a45883767f9f1ffaf'
2024-03-14 16:04:14,323 [ scc.git] DEBUG Calling 'git diff --name-only dee098f9c5138f2e746928fb31973abfe33d1718..d094154d749b5a41d8bf976e5a648b06fdc16930'
2024-03-14 16:04:14,328 [ scc.git] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
Conflicting PR. Removed from build [OMERO-build-push#1](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/). See the [console output](https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/consoleText) for more details.
Possible conflicts:
- Upstream changes
- .travis.yml
- build.gradle
--conflicts
2024-03-14 16:04:14,332 [ scc.config] DEBUG Found github.token
2024-03-14 16:04:14,333 [ scc.git] DEBUG Not adding comment to issue #61, already --conflicts.
2024-03-14 16:04:14,333 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...f40ba7bb3d2fcfcb8e47ab4c6fe5edea79ac1374'
2024-03-14 16:04:14,338 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:14,342 [ 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-14 16:04:14,357 [ scc.git] DEBUG Auto-merging build.gradle
2024-03-14 16:04:14,358 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:04:14,361 [ scc.git] DEBUG build.gradle | 2 +-
2024-03-14 16:04:14,361 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:04:14,729 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:14,730 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...3e65b9de901fc160c380da602def943206fe9b1d'
2024-03-14 16:04:14,737 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:14,741 [ scc.git] DEBUG Calling 'git merge --no-ff -m merge master -Dorg -Ssuccess-only: PR 152 (Set class in doc) 3e65b9de901fc160c380da602def943206fe9b1d'
2024-03-14 16:04:14,760 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:04:14,763 [ scc.git] DEBUG src/main/java/ome/api/local/LocalSession.java | 2 +-
2024-03-14 16:04:14,763 [ scc.git] DEBUG 1 file changed, 1 insertion(+), 1 deletion(-)
2024-03-14 16:04:15,161 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:15,163 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...6c1426b72fb6ff05453aeccbc1fbf3848d13e638'
2024-03-14 16:04:15,171 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:15,176 [ 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-14 16:04:15,194 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:04:15,198 [ scc.git] DEBUG src/main/java/ome/services/sessions/SessionBean.java | 15 ++++++++-------
2024-03-14 16:04:15,198 [ scc.git] DEBUG .../ome/server/utests/sessions/SessionBeanUnitTest.java | 4 ++--
2024-03-14 16:04:15,198 [ scc.git] DEBUG 2 files changed, 10 insertions(+), 9 deletions(-)
2024-03-14 16:04:15,576 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:15,577 [ scc.git] DEBUG Calling 'git diff --name-only HEAD...cf9c8fe79dfeb4ae0664876dccc7623f56de05ff'
2024-03-14 16:04:15,583 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:15,588 [ 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-14 16:04:15,607 [ scc.git] DEBUG Merge made by the 'ort' strategy.
2024-03-14 16:04:15,610 [ scc.git] DEBUG src/main/resources/omero-server.properties | 4 ++--
2024-03-14 16:04:15,610 [ scc.git] DEBUG 1 file changed, 2 insertions(+), 2 deletions(-)
2024-03-14 16:04:15,983 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:15,985 [ scc.git] DEBUG Calling 'git submodule update'
2024-03-14 16:04:16,028 [ scc.git] DEBUG Get sha1 of %s
2024-03-14 16:04:16,028 [ scc.git] DEBUG Calling 'git rev-parse HEAD'
2024-03-14 16:04:16,033 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:04:16,076 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:04:16,085 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef80289490> has no local changes
2024-03-14 16:04:16,085 [ 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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:04:16,096 [ scc.git] DEBUG [detached HEAD 7bb9427c] merge master -Dorg -Ssuccess-only
2024-03-14 16:04:16,096 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:16,097 [ scc.git] DEBUG Calling 'git submodule --quiet foreach echo $path'
2024-03-14 16:04:16,149 [ scc.config] DEBUG Found submodule.omero-blitz.url
2024-03-14 16:04:16,399 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:16,410 [ scc.config] DEBUG Found submodule.omero-blitz.branch
2024-03-14 16:04:16,414 [ scc.config] DEBUG Found submodule.omero-common.url
2024-03-14 16:04:16,834 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:16,843 [ scc.config] DEBUG Found submodule.omero-common.branch
2024-03-14 16:04:16,848 [ scc.config] DEBUG Found submodule.omero-gateway-java.url
2024-03-14 16:04:17,268 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:17,280 [ scc.config] DEBUG Found submodule.omero-gateway-java.branch
2024-03-14 16:04:17,285 [ scc.config] DEBUG Found submodule.omero-model.url
2024-03-14 16:04:17,691 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:17,701 [ scc.config] DEBUG Found submodule.omero-model.branch
2024-03-14 16:04:17,705 [ scc.config] DEBUG Found submodule.omero-renderer.url
2024-03-14 16:04:18,101 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:18,111 [ scc.config] DEBUG Found submodule.omero-renderer.branch
2024-03-14 16:04:18,116 [ scc.config] DEBUG Found submodule.omero-romio.url
2024-03-14 16:04:18,512 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:18,523 [ scc.config] DEBUG Found submodule.omero-romio.branch
2024-03-14 16:04:18,528 [ scc.config] DEBUG Found submodule.omero-server.url
2024-03-14 16:04:18,926 [urllib3.conn] DEBUG https://api.github.com:443 "GET /user HTTP/1.1" 200 None
2024-03-14 16:04:18,936 [ scc.config] DEBUG Found submodule.omero-server.branch
2024-03-14 16:04:18,937 [ scc.git] DEBUG Calling 'git status --porcelain'
2024-03-14 16:04:18,975 [ scc.git] DEBUG <scc.git.GitRepository object at 0x7fef8138f430> has local changes
2024-03-14 16:04:18,975 [ 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'
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#1 (https://BRANCHCI.openmicroscopy.org/jenkins/job/OMERO-build-push/1/)'
2024-03-14 16:04:18,985 [ scc.git] DEBUG [detached HEAD e6fb282] merge master -Dorg -Ssuccess-only
2024-03-14 16:04:18,985 [ scc.merge] INFO Repository: ome/omero-build
2024-03-14 16:04:18,986 [ scc.git] DEBUG 8 files changed, 14 insertions(+), 14 deletions(-)
2024-03-14 16:04:18,986 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,986 [ scc.merge] INFO
2024-03-14 16:04:18,986 [ scc.merge] INFO
2024-03-14 16:04:18,986 [ scc.merge] INFO Repository: ome/omero-blitz
2024-03-14 16:04:18,986 [ scc.merge] INFO Excluded PRs:
2024-03-14 16:04:18,986 [ scc.merge] INFO - PR 142 sbesson 'Add Gradle wrapper infrastructure' (stage: draft)
2024-03-14 16:04:18,986 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,986 [ scc.merge] INFO
2024-03-14 16:04:18,986 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,986 [ scc.merge] INFO - PR 119 dominikl 'Take Ice and omero sysenv variables into account'
2024-03-14 16:04:18,986 [ scc.merge] INFO - PR 131 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,986 [ scc.merge] INFO - PR 132 jburel 'Fix javadoc warning'
2024-03-14 16:04:18,986 [ scc.merge] INFO
2024-03-14 16:04:18,986 [ scc.merge] INFO Repository: ome/omero-common
2024-03-14 16:04:18,986 [ scc.merge] INFO Excluded PRs:
2024-03-14 16:04:18,986 [ scc.merge] INFO - PR 40 jburel 'set classifier' (exclude comment)
2024-03-14 16:04:18,987 [ scc.merge] INFO - PR 29 dominikl 'Add method to get pixel min max' (exclude comment)
2024-03-14 16:04:18,987 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,987 [ scc.merge] INFO
2024-03-14 16:04:18,987 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,987 [ scc.merge] INFO - PR 39 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,987 [ scc.merge] INFO - PR 42 jburel 'include all'
2024-03-14 16:04:18,987 [ scc.merge] INFO
2024-03-14 16:04:18,987 [ scc.merge] INFO Repository: ome/omero-gateway-java
2024-03-14 16:04:18,987 [ scc.merge] INFO Excluded PRs:
2024-03-14 16:04:18,987 [ scc.merge] INFO - PR 86 Rdornier 'Fix bug when connecting to multiple servers' (user: Rdornier)
2024-03-14 16:04:18,987 [ scc.merge] INFO - PR 30 jburel 'Import image' (exclude comment)
2024-03-14 16:04:18,987 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,987 [ scc.merge] INFO
2024-03-14 16:04:18,987 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,987 [ scc.merge] INFO - PR 69 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,987 [ scc.merge] INFO
2024-03-14 16:04:18,987 [ scc.merge] INFO Repository: ome/omero-model
2024-03-14 16:04:18,987 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,987 [ scc.merge] INFO
2024-03-14 16:04:18,987 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,988 [ scc.merge] INFO - PR 90 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,988 [ scc.merge] INFO - PR 98 dgault 'Bump Bio-Formats to version 7.2.0'
2024-03-14 16:04:18,988 [ scc.merge] INFO
2024-03-14 16:04:18,988 [ scc.merge] INFO Repository: ome/omero-renderer
2024-03-14 16:04:18,988 [ scc.merge] INFO Excluded PRs:
2024-03-14 16:04:18,988 [ scc.merge] INFO - PR 10 joshmoore 'Allow passing ExecutorService to region task' (label: exclude)
2024-03-14 16:04:18,988 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,988 [ scc.merge] INFO
2024-03-14 16:04:18,988 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,988 [ scc.merge] INFO - PR 23 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,988 [ scc.merge] INFO
2024-03-14 16:04:18,988 [ scc.merge] INFO Repository: ome/omero-romio
2024-03-14 16:04:18,988 [ scc.merge] INFO Excluded PRs:
2024-03-14 16:04:18,988 [ scc.merge] INFO - PR 14 chris-allan 'Bye bye commons-io' (exclude comment)
2024-03-14 16:04:18,988 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,988 [ scc.merge] INFO
2024-03-14 16:04:18,988 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,988 [ scc.merge] INFO - PR 41 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,988 [ scc.merge] INFO
2024-03-14 16:04:18,988 [ scc.merge] INFO Repository: ome/omero-server
2024-03-14 16:04:18,988 [ scc.merge] INFO Excluded PRs:
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 175 sbesson 'Bump org.postgresql:postgresql to version 42.2.28' (stage: draft)
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 168 scuniff '#167 equals() comparing objects of different types' (user: scuniff)
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 166 kkoz 'Experimenter group cache' (stage: draft)
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 116 dominikl 'Add method to get pixel min max' (exclude comment)
2024-03-14 16:04:18,989 [ scc.merge] INFO Already up to date.
2024-03-14 16:04:18,989 [ scc.merge] INFO
2024-03-14 16:04:18,989 [ scc.merge] INFO Merged PRs:
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 151 jburel 'bump org.openmicroscopy.project 5.6.0'
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 152 jburel 'Set class in doc'
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 176 chris-allan 'Session bean actions should happen at `SYSTEM` priority'
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 177 chris-allan 'Swap default min and background thread limits'
2024-03-14 16:04:18,989 [ scc.merge] INFO
2024-03-14 16:04:18,989 [ scc.merge] INFO Conflicting PRs (not included):
2024-03-14 16:04:18,989 [ scc.merge] INFO - PR 61 joshmoore 'Pass user executor to rendering tasks'
2024-03-14 16:04:18,989 [ scc.merge] INFO
2024-03-14 16:04:18,989 [ scc.merge] DEBUG Cleaning remote branches created for merging
2024-03-14 16:04:18,989 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:18,994 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-blitz
2024-03-14 16:04:18,995 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:18,999 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:19,000 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-common
2024-03-14 16:04:19,000 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:19,004 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:19,005 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-gateway-java
2024-03-14 16:04:19,005 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:19,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:19,010 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-model
2024-03-14 16:04:19,010 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:19,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:19,015 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-renderer
2024-03-14 16:04:19,015 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:19,021 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:19,022 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-romio
2024-03-14 16:04:19,022 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:19,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push
2024-03-14 16:04:19,028 [ scc.git] DEBUG cd /home/omero/workspace/OMERO-build-push/omero-server
2024-03-14 16:04:19,028 [ scc.git] DEBUG Calling 'git remote'
2024-03-14 16:04:19,034 [ 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 f033192d] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
Entering 'omero-common'
[detached HEAD 731bfab] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-gateway-java'
[detached HEAD d2dbaaf] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-model'
[detached HEAD 13ce29e] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-renderer'
[detached HEAD 3c51d15] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-romio'
[detached HEAD 78738a9] Update component versions
1 file changed, 1 insertion(+), 1 deletion(-)
Entering 'omero-server'
[detached HEAD 87434470] Update component versions
1 file changed, 2 insertions(+), 2 deletions(-)
[detached HEAD d492193] Update component versions
7 files changed, 7 insertions(+), 7 deletions(-)
2024-03-14 16:04:56,488 [ scc.push] INFO Merged branch pushed to https://github.com/snoopycrimecop/omero-build/tree/merge_ci
![[Jenkins]](/jenkins/static/550c3bc3/images/svgs/logo.svg){kind=logo}
