Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(CO-625): briefcase removal #221

Merged
merged 6 commits into from
May 12, 2023
Merged

feat(CO-625): briefcase removal #221

merged 6 commits into from
May 12, 2023

Conversation

Polpetta
Copy link
Contributor

No description provided.

@Polpetta Polpetta added the enhancement New feature or request label May 12, 2023
@Polpetta Polpetta self-assigned this May 12, 2023
@frisonisland
Copy link
Contributor

@Polpetta probably I removed all qa unittest files in #217.
After you pushed everything try to recompile and push without linting the ZAttr* files

@Polpetta
Merge branch 'devel' into feature/CO-625-briefcase-removal
f44aa68 
# Conflicts:
#	client/src/main/java/com/zimbra/client/ZFeatures.java
#	common/src/main/java/com/zimbra/common/account/ZAttrProvisioning.java
#	store-conf/conf/rights/rights-adminconsole-domainadmin.xml
#	store-conf/conf/rights/rights-adminconsole.xml
#	store/src/main/java/com/zimbra/cs/account/ShareInfo.java
#	store/src/main/java/com/zimbra/cs/account/ZAttrAccount.java
#	store/src/main/java/com/zimbra/cs/account/ZAttrCos.java
#	store/src/main/java/com/zimbra/cs/account/ldap/upgrade/BUG_50465.java
#	store/src/main/java/com/zimbra/cs/account/ldap/upgrade/BUG_60640.java
#	store/src/main/java/com/zimbra/cs/service/ExternalUserProvServlet.java
#	store/src/test/java/com/zimbra/cs/octosync/PatchInputStreamTest.java
#	store/src/test/java/qa/unittest/TestDocument.java
#	store/src/test/java/qa/unittest/TestIndex.java
#	store/src/test/java/qa/unittest/TestLmtp.java
#	store/src/test/java/qa/unittest/TestUserServlet.java
#	store/src/test/java/qa/unittest/TestWaitSet.java
#	store/src/test/java/qa/unittest/TestZClient.java
#	store/src/test/java/qa/unittest/server/TestDocumentServer.java
@Polpetta Polpetta requested a review from flanciotti May 12, 2023 08:51
@Polpetta
Merge branch 'devel' into feature/CO-625-briefcase-removal
3774b38 
# Conflicts:
#	common/src/main/java/com/zimbra/common/account/ZAttrProvisioning.java
@Polpetta
Copy link
Contributor Author

@Polpetta probably I removed all qa unittest files in #217. After you pushed everything try to recompile and push without linting the ZAttr* files

I'm not linting ZAttr files, is pre-commit that checks them. I don't know why we have different results for the same setup 🤷

@frisonisland
Copy link
Contributor

@Polpetta probably I removed all qa unittest files in #217. After you pushed everything try to recompile and push without linting the ZAttr* files

I'm not linting ZAttr files, is pre-commit that checks them. I don't know why we have different results for the same setup shrug

I know, it's just annoying because if you compile it generates them then you push and it complains about linting every time. Maybe we can add them to the ignore list along with attrs.xml

@Polpetta
Copy link
Contributor Author

I know, it's just annoying because if you compile it generates them then you push and it complains about linting every time. Maybe we can add them to the ignore list along with attrs.xml

Yes, I think we should

keshavbhatt
keshavbhatt approved these changes May 12, 2023
View reviewed changes
Copy link
Member

@keshavbhatt keshavbhatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@keshavbhatt keshavbhatt self-requested a review May 12, 2023 10:52
keshavbhatt
keshavbhatt requested changes May 12, 2023
View reviewed changes
Copy link
Member

@keshavbhatt keshavbhatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix the failing test by removing Briefcase from

@Polpetta Polpetta requested a review from keshavbhatt May 12, 2023 10:53
@Polpetta
Copy link
Contributor Author

Yeah I missed it when removing all the briefcase searches

@keshavbhatt
Copy link
Member

There are still some references of removed attributes in this file GetInfoResponse.json
Please remove them to avoid confusion in future.

@Polpetta
Copy link
Contributor Author

It's a very old file and I can see there are already old, removed or discontinued attributes in there. No point to remove them and wait for another Jenkins approval. Merging as it is

@Polpetta Polpetta merged commit e475b7a into devel May 12, 2023
@Polpetta Polpetta deleted the feature/CO-625-briefcase-removal branch May 12, 2023 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@keshavbhatt keshavbhatt keshavbhatt approved these changes

@frisonisland frisonisland frisonisland approved these changes

@aheeva-yuliya aheeva-yuliya aheeva-yuliya approved these changes

@flanciotti flanciotti Awaiting requested review from flanciotti

Assignees

@Polpetta Polpetta

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Polpetta @frisonisland @keshavbhatt @aheeva-yuliya