-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.
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
(build) fix JDK 16/17 builds #278
Conversation
The PR will only fail for JDK 11, but will work on JDK 8 and 14:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a couple of minor nits, but looks good to me!
idea: we may want to make a note in the .github/template to look for conversions from easy-mock to mockito
(I'm not sure that's the best place for it) but it does bring focus to the effort (and adds a doc point as to why we are doing it). NOTE: that doesn't need to block this from getting merged though
<jdk>[16,)</jdk> | ||
</activation> | ||
<properties> | ||
<surefire.argLine>--illegal-access=permit</surefire.argLine> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: add a comment as to why this is needed (to give us a hint when to remove it in the future)
@@ -70,6 +70,10 @@ | |||
<!-- Replaced by the build number plugin at build time: --> | |||
<buildNumber>${user.name}-${maven.build.timestamp}</buildNumber> | |||
<jacoco.skip>true</jacoco.skip> | |||
<!--suppress CheckTagEmptyBody --> | |||
<surefire.argLine></surefire.argLine> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm guessing this works, but (if you haven't already) double-check to make sure the code coverage works (Jacoco sets the argLine
prop too)
<profile> | ||
<id>jdk16</id> | ||
<activation> | ||
<jdk>[16,)</jdk> | ||
</activation> | ||
</profile> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
delete the empty profile block?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…illegal-access=permit for guice tests. Remove JDK17 for now.
--illegal-access=permit
for guice tests.Following this checklist to help us incorporate your contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without pulling in other changes.
[SHIRO-XXX] - Fixes bug in SessionManager
,where you replace
SHIRO-XXX
with the appropriate JIRA issue. Best practiceis to use the JIRA issue title in the pull request title and in the first line of the commit message.
mvn clean install apache-rat:check
to make sure basic checks pass. A more thorough check will be performed on your pull request automatically.git rebase -i
.Trivial changes like typos do not require a JIRA 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.