Skip to content

merge roles into mainline develop for OMERO 5.4 series#5349

Merged
jburel merged 657 commits intodevelopfrom
roles
Jul 4, 2017
Merged

merge roles into mainline develop for OMERO 5.4 series#5349
jburel merged 657 commits intodevelopfrom
roles

Conversation

@mtbc
Copy link
Copy Markdown
Member

@mtbc mtbc commented Jun 28, 2017 •
edited
Loading

What this PR does

Merges commits back from roles into develop.

Testing this PR

CI jobs should not show regressions.

pwalczysko and others added 30 commits May 10, 2017 15:15
@pwalczysko
Fix all the remaining double-spaces in the code
88e0be2
@pwalczysko
Fix the third batch of Mark's comments
7de19ad
@pwalczysko
Do not use space after e.g. ImageI() - fix for the whole file
1fe7cab
@pwalczysko
Fix redundant @param isAdmin in javadoc in all the tests
a7dd039
@pwalczysko
Remove 2 redundant sentDataset variable declarations
3e50225
@pwalczysko
Remove a redundant if..else
d57b163
@pwalczysko
unsufficient -> insufficient
3917d9c
@pwalczysko
long.toString(-1) -> "-1"
2cbddc7
@pwalczysko
Remove redundant query
76b2757
@sbesson
Update Slack section to notify only when the success status is changed
35aa411 
See https://docs.travis-ci.com/user/notifications/#Configuring-slack-notifications
this should reduce the level of notifications (currently set to always)
@pwalczysko
Fix DEBUG statements in providers
4ca0897
@joshmoore
Merge pull request #5291 from sbesson/rebased/roles/slack_frequency
b43cb1e 
Update Slack section to notify only when the success status is changed (rebased onto roles)
@mtbc
Merge pull request #5272 from mtbc/roles-cleanup-beans
62332fd 
remove admin privileges bean from classes that no longer use it
@mtbc
Merge pull request #5281 from mtbc/roles-session-cache
5d82e91 
cache OMERO sessions in Hibernate query cache
@mtbc
Merge pull request #5273 from mtbc/roles-file-repo
3e01277 
enforce protection of OriginalFile.repo property via database triggers
@mtbc
Merge pull request #5266 from mtbc/fix-chgrp-chown
5c00e46 
adjust Chgrp2, Chown2 for roles
@pwalczysko
Refactor image1Other... patterned variables to avoid ambiguation with…
96eb7fd 
… ...10...
@mtbc
Merge pull request #5159 from pwalczysko/new-role-cleaned
29b4eed 
Cleanup to follow in later PRs.
@mtbc
Merge pull request #5284 from mtbc/check-for-user-group
025e76b 
more carefully prevent update/delete for user group
@mtbc
have Job no longer be a system type
a994ce5
@mtbc
remove graph traversal's special-casing for Jobs
1bec63c
@mtbc
upload jobs are owned by the importing user
89a0820
@mtbc
helper method for providing Boolean test case combinations
254ccd5
@mtbc
Merge tag 'v5.3.2' into HEAD
ea1354d 
Tag version 5.3.2

Conflicts:
	components/blitz/src/ome/services/blitz/fire/Registry.java
	components/blitz/src/ome/services/blitz/repo/RepositoryDaoImpl.java
	components/tools/OmeroJava/test/integration/AbstractServerImportTest.java
	components/tools/OmeroJava/test/integration/ManagedRepositoryTest.java
@pwalczysko
Add method for checking canPermissions, improve javadoc, improve test…
83971aa 
…Delete
@pwalczysko
Add canDelete test to testDelete and make the getPermissions method t…
2d9e014 
…o retrieve the object again
@pwalczysko
Add canLink tests to testCreateLinkImportSudo
30c714a
@pwalczysko
Add canEdit value check for testEdit
e8a85da
@pwalczysko
Add canChgrp tests to testChgrp
43b57d4
@pwalczysko
Add canChown checks to testChown
e6d7cda
@mtbc
Copy link
Copy Markdown
Member Author

mtbc commented Jun 28, 2017 •
edited
Loading

I am happy to sign a milestone tag but how I do so usefully I forget. I can do the git tag -s v5.4.0-m1 -m ... locally but what next? Once this is merged I could fetch and sign develop's HEAD and push the tag to my fork.

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 28, 2017

you can also use scc tag-release -s release (no v)

@jburel
Copy link
Copy Markdown
Member

jburel commented Jun 28, 2017

when ready one of us can tag and push to origin
cc @sbesson @joshmoore

@mtbc
Copy link
Copy Markdown
Member Author

mtbc commented Jun 29, 2017 •
edited
Loading

Not merged due to conflicts. Should we turn off the thing where non-breaking PRs also get included? I think that usually causes more trouble than it's worth.

@mtbc mtbc mentioned this pull request Jun 29, 2017
Merged
@mtbc
Copy link
Copy Markdown
Member Author

mtbc commented Jun 29, 2017 •
edited
Loading

Now that @will-moore has kindly excluded #5347 the next obstacle is,

ERROR:  PostgreSQL database server version 9.3.15 is less than OMERO prerequisite 9.4.0

This does have the pleasing side-effect of testing @rleigh-codelibre's version number pretty-printing.

@mtbc
temporarily revert PostgreSQL prerequisite to 9.3
8f83af4 
required to test on trout and eel before seabass is ready
@mtbc mtbc mentioned this pull request Jun 29, 2017
Merged
@mtbc
Merge pull request #5350 from mtbc/postgres-9.3
6d6a35b 
temporarily allow PostgreSQL 9.3
@mtbc mtbc closed this Jun 29, 2017
@mtbc mtbc reopened this Jun 29, 2017
@mtbc
Copy link
Copy Markdown
Member Author

mtbc commented Jun 30, 2017

CI failures seem largely unrelated to this PR, "breaking" is broken. Leaving for either @jburel or @joshmoore to decide to remove --breaking once they are back and able to check in with @sbesson.

@pwalczysko pwalczysko mentioned this pull request Jun 30, 2017
Merged
@mtbc mtbc mentioned this pull request Jul 3, 2017
Closed
4 tasks
@mtbc
Copy link
Copy Markdown
Member Author

mtbc commented Jul 3, 2017

After discussion, removed from breaking ready to test in mainline.

@jburel jburel added the develop label Jul 4, 2017
@mtbc
Copy link
Copy Markdown
Member Author

mtbc commented Jul 4, 2017 •
edited
Loading

This breaks OMERO-DEV-merge-cpp but I expect we can live with that briefly. #5358 fixes the C++ build for me locally so I'll run that through devspace CI once Travis passes (especially as it adds to test_permissions.py) then switch the base branch to develop once this PR is in.

@jburel
Copy link
Copy Markdown
Member

jburel commented Jul 4, 2017 •
edited
Loading

Merging this PR so we can move forward, I will tag when the PR fixing the c++ issue is in

@jburel jburel merged commit a430107 into develop Jul 4, 2017
@sbesson sbesson added this to the 5.4.0 milestone Oct 6, 2017
@joshmoore joshmoore deleted the roles branch November 21, 2017 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

develop

Projects

None yet

Milestone

5.4.0

Development

Successfully merging this pull request may close these issues.

6 participants

@mtbc @jburel @sbesson @pwalczysko @joshmoore @will-moore