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.

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

Merged
merged 1 commit into from
Jan 13, 2021
Merged

(build) fix JDK 16/17 builds #278

merged 1 commit into from
Jan 13, 2021

Conversation

bmarwell
Copy link
Contributor

@bmarwell bmarwell commented Jan 11, 2021

  • Replaced a few EasyMock tests with Mockito where needed.
  • --illegal-access=permit for guice tests.
  • Remove JDK17-ea for now, no groovy support.

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

  • Make sure there is a JIRA issue filed
    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.
  • Each commit in the pull request should have a meaningful subject line and body.
  • Format the pull request title like [SHIRO-XXX] - Fixes bug in SessionManager,
    where you replace SHIRO-XXX with the appropriate JIRA issue. Best practice
    is to use the JIRA 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.
  • Run mvn clean install apache-rat:check 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.

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.

@bmarwell bmarwell requested review from fpapon and coheigea January 11, 2021 15:37
@bmarwell
Copy link
Contributor Author

Copy link
Member

@bdemers bdemers left a 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>
Copy link
Member

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>
Copy link
Member

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)

Comment on lines +1417 to +1422
<profile>
<id>jdk16</id>
<activation>
<jdk>[16,)</jdk>
</activation>
</profile>
Copy link
Member

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?

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.

LGTM

…illegal-access=permit for guice tests. Remove JDK17 for now.
@bmarwell bmarwell merged commit cf2d085 into apache:master Jan 13, 2021
@bmarwell bmarwell deleted the jdk16-17 branch January 13, 2021 07:14
@bmarwell bmarwell restored the jdk16-17 branch January 13, 2021 07:15
@bmarwell bmarwell deleted the jdk16-17 branch January 13, 2021 07:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants