Skip to content

[#1499] - Deleted Quartz module.#1581

Merged
fpapon merged 1 commit intoapache:3.xfrom
Himakar:feature_quartzmoduleremove
Aug 16, 2024
Merged

[#1499] - Deleted Quartz module.#1581
fpapon merged 1 commit intoapache:3.xfrom
Himakar:feature_quartzmoduleremove

Conversation

@Himakar
Copy link

@Himakar Himakar commented Jul 10, 2024

Fixes #1499 Quartz module deletion
The module was present in shiro/support folder

Following this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GitHub issue filed
    for the change (usually before you start working on it). Trivial changes like typos do not
    require a GitHub issue. Your pull request should address just this issue, without pulling in other changes.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [#XXX] - Fixes bug in SessionManager,
    where you replace #XXX with the appropriate GitHub issue. Best practice
    is to use the GitHub issue title in the pull request title and in the first line of the commit message.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • add fixes #XXX if merging the PR should close a related issue.
  • Run mvn verify to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.
  • If you have a group of commits related to the same change, please squash your commits into one and force push your branch using git rebase -i.
  • Committers: Make sure a milestone is set on the PR

Trivial changes like typos do not require a GitHub issue (javadoc, comments...).
In this case, just format the pull request title like [DOC] - Add javadoc in SessionManager.

If this is your first contribution, you have to read the Contribution Guidelines

If your pull request is about ~20 lines of code you don't need to sign an Individual Contributor License Agreement
if you are unsure please ask on the developers list.

To make clear that you license your contribution under the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.

@bdemers bdemers added the 3.x label Jul 10, 2024
@bdemers bdemers added this to the 3.0.0 milestone Jul 10, 2024
@bdemers bdemers removed the 3.x label Jul 10, 2024
@bdemers
Copy link
Member

bdemers commented Jul 10, 2024

Note: We need to wait until we cut the 3.x branch before merging this (but we can get it ready to go!).

My pref would be to hold off creating the branch until we have a few PRs lined up that depend on each (as to avoid any additional back porting), but... avoiding backporting might just be a dream 😆
(I'm also not trying to block anyone from cutting the 3.x branch if they are motivated) 😄

@lprimak
Copy link
Contributor

lprimak commented Jul 10, 2024

Yea, I think not having 3.x branch is starting to block things...

@lprimak
Copy link
Contributor

lprimak commented Jul 10, 2024

@Himakar Can you fix the failing build please? I think it's just a matter of removing quartz from the coverage module

Copy link
Contributor

@lprimak lprimak left a comment

Choose a reason for hiding this comment

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

Please restore the issue template. We need that for you to accept Apache CLA license agreement

@lprimak
Copy link
Contributor

lprimak commented Jul 11, 2024

Also, please squash the commits into one.
Otherwise, LGTM, thank you!

@lprimak
Copy link
Contributor

lprimak commented Jul 26, 2024

@Himakar Can you please fix the remaining issues as described above please?
Thank you!

@lprimak lprimak changed the base branch from main to 3.x August 4, 2024 02:19
@lprimak lprimak changed the title Issue #1499: Deleted Quartz module. [#1499] Deleted Quartz module. Aug 4, 2024
@lprimak lprimak changed the title [#1499] Deleted Quartz module. [#1499] - Deleted Quartz module. Aug 4, 2024
@lprimak lprimak self-assigned this Aug 4, 2024
@lprimak
Copy link
Contributor

lprimak commented Aug 4, 2024

@Himakar Any updates please?
We have created 3.x branch and can merge this if you make the necessary changes.
Thank you!

@lprimak lprimak linked an issue Aug 4, 2024 that may be closed by this pull request
2 tasks
@lprimak lprimak added the 3.x label Aug 4, 2024
@Himakar Himakar force-pushed the feature_quartzmoduleremove branch from 9f4f0c5 to 6e27f13 Compare August 5, 2024 15:24
@lprimak lprimak mentioned this pull request Aug 6, 2024
10 tasks
@lprimak
Copy link
Contributor

lprimak commented Aug 6, 2024

@Himakar Last thing you have to do is to click the CLA checkbox(es) and squash the commits.
Do you know how to do that?

@Himakar
Copy link
Author

Himakar commented Aug 7, 2024

Hi @lprimak, Could you please let me know hint on CLA checkboxes and squash part

@lprimak
Copy link
Contributor

lprimak commented Aug 8, 2024

  1. Just read the PR description. There are checkboxes there about license agreement. Read and click on the appropriate checkboxes.
  2. See https://stackoverflow.com/questions/5189560/how-do-i-squash-my-last-n-commits-together

@Himakar Himakar force-pushed the feature_quartzmoduleremove branch from 6e27f13 to 65e1a69 Compare August 8, 2024 16:20
@Himakar
Copy link
Author

Himakar commented Aug 8, 2024

I did squash and push latest squash to the Git Hub. Also i created a pull request (Is it not necessary to create Pull request every time i do changes)
Also i check the related checkboxes with respect to License agreement
@lprimak, Thank you very much for your patience. I learned some Git hub concepts because of you.
If still i need to do any changes, please let me know.
Thanks!!

@lprimak lprimak added CLA and removed pending-cla labels Aug 8, 2024
@lprimak
Copy link
Contributor

lprimak commented Aug 8, 2024

No problem! Somehow your squashed changes didn't "take" on this PR. Please don't create new PRs, and use this PR.
Please try squashing / force-push this PR again.

@lprimak
Copy link
Contributor

lprimak commented Aug 8, 2024

Also, I based this branch of the 3.x branch now, please make a note of that.

@lprimak
Copy link
Contributor

lprimak commented Aug 14, 2024

@Himakar Any updates? We are so close :)

@Himakar
Copy link
Author

Himakar commented Aug 15, 2024

Hi @lprimak ,
I can see the commit items in the pull request. Am i missing something else?

image

@lprimak
Copy link
Contributor

lprimak commented Aug 15, 2024

Your screenshot points to the closed PR. You need to squash commits on this PR. It still shows 7 commits.

Also, now there is a conflict that needs to be fixed

@fpapon
Copy link
Member

fpapon commented Aug 16, 2024

@Himakar I think you need to rebase your PR.

@Himakar Himakar force-pushed the feature_quartzmoduleremove branch from 65e1a69 to fbbab08 Compare August 16, 2024 12:41
@fpapon
Copy link
Member

fpapon commented Aug 16, 2024

@Himakar you are rebasing from main rather than 3.x branch, this is why you added more recent commit from main.
You need to be sync to 3.x branch and not main.

@Himakar Himakar force-pushed the feature_quartzmoduleremove branch from fbbab08 to 276994b Compare August 16, 2024 15:52
@Himakar
Copy link
Author

Himakar commented Aug 16, 2024

Hi @fpapon, Thanks for your help. Now i have rebased my branch from 3.x branch and pushed code.
Is this fine now?

@fpapon
Copy link
Member

fpapon commented Aug 16, 2024

The 4 commits from dependabot are from main and not from 3.x.
You can remove them with git rebase -i HEAD~5 and drop them.

Issue apache#1499: Removed Quartz dependency from coverage module

apache#1499: Restore white space after shiro-guice dependency in test-coverage pom.xml
@Himakar Himakar force-pushed the feature_quartzmoduleremove branch from 276994b to e16e9d0 Compare August 16, 2024 16:24
@fpapon fpapon self-requested a review August 16, 2024 16:26
Copy link
Member

@fpapon fpapon left a comment

Choose a reason for hiding this comment

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

Thanks for your contribution!

@fpapon fpapon merged commit a2a4132 into apache:3.x Aug 16, 2024
@Himakar
Copy link
Author

Himakar commented Aug 17, 2024

Hi @lprimak , @fpapon ,
Thank you for your help. It means a lot to me.
I am learning new concepts because of this task.
Thank you once again

@lprimak
Copy link
Contributor

lprimak commented Aug 17, 2024

Awesome! We are happy to help. Thanks and keep it up!

@fpapon
Copy link
Member

fpapon commented Aug 19, 2024

@Himakar you're welcome and don't hesitate to make other proposal!

@lprimak lprimak removed this from the 3.0.0 milestone Oct 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Enhancement] Remove Quartz module

5 participants