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

[issue-78] EL expressions that contain unnecessary parentheses fail #79

Merged
merged 1 commit into from Dec 11, 2019

Conversation

tmiyargi
Copy link
Contributor

Added change from https://svn.apache.org/viewvc?view=revision&revision=1571242
Regenerated the parser and added a test.

Copy link
Contributor

@markt-asf markt-asf left a comment

Choose a reason for hiding this comment

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

The code this has been copied from is ALv2 licensed. Using ALv2 code comes with certain requirements around attribution that have not been met in this PR.
Also, the PR removes a license header from a file. Granted that file is generated and arguably doesn't need a header but I do not think it should be removed as part of this PR. If it is removed at all, it needs to be under a separate PR.

Copy link
Contributor

@markt-asf markt-asf left a comment

Choose a reason for hiding this comment

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

Changes requested as per my previous comment

@tmiyargi
Copy link
Contributor Author

All changes are now in place, headers included and I have signed the Contributor Agreement.

@markt-asf
Copy link
Contributor

I did obtain clarification that, for auto-generated files, the license of the output should be the same as the license for the input.

The additional licensing changes don't look right to me but I am not sufficiently well-versed in Eclipse procedures for pulling in ALv2 licensed content to determine if the proposed PR has done this correctly.

@bshannon
Copy link

@markt-asf It looks like you were the author of the original fix to the Apache code.
Why don't you just apply that fix, which you still own, to the EE4J code,
under the Eclipse license?

@tmiyargi
Copy link
Contributor Author

@markt-asf @bshannon should I close this PR then so you can add the changes yourselves?

@bshannon
Copy link

@markt-asf, it's up to you. Can you just apply your fix, under the Eclipse license?

@DennisBayer
Copy link

Hi there,

any updates on this issue @markt-asf ? Additionally, is there any timeline for a release which would contain this fix?

Best regards
Dennis

@tmiyargi
Copy link
Contributor Author

I've reworked the fix so it is no longer a copy. I hope you can merge it now.

@tmiyargi tmiyargi force-pushed the issue-78 branch 3 times, most recently from beeb9d9 to 3d169b5 Compare April 25, 2019 16:32
@bshannon bshannon dismissed markt-asf’s stale review May 8, 2019 23:57

@markt-asf has stopped responding

@bshannon bshannon requested review from arjantijms and ruolli May 8, 2019 23:59
@bshannon
Copy link

bshannon commented May 9, 2019

It looks like @markt-asf has checked out of this project since he's not responding.
I've dismissed his review. We should consider removing him as a Committer.

The latest changes contain a lot of gratuitous formatting changes, is that because
these files were regenerated? Unfortunately, that makes it harder to review the
changes.

In any event, this needs review by someone more familiar with this code. I've added
some other reviewers who might be able to help.

@tmiyargi
Copy link
Contributor Author

tmiyargi commented May 9, 2019

@bshannon Two files have been changed the others are regenerated using JavaCC. Thank you for looking into this.

@markt-asf
Copy link
Contributor

My interest in EL at Eclipse is limited to the API.
Contributing to the implementation is not an itch I have any motivation to scratch.
The sole reason for my commenting on this PR was to point out that the original PR did not meet the requirements of the open source license of the project from which it was copied.

@bshannon
Copy link

bshannon commented May 9, 2019

The sole reason for my commenting on this PR was to point out that the original PR did not meet the requirements of the open source license of the project from which it was copied.

Which you could've solved by contributing your fix to this project as well.
That would've been simple for you to do. It's disappointing that you're
not willing to do so.

Signed-off-by: tmiyar <tmiyargi@redhat.com>
@tmiyargi
Copy link
Contributor Author

Done rebase and solved conflicts, @arjantijms, @ruolli could you have a look?

@bmaxwell
Copy link

@arjantijms / @ruolli any updates on if this change is acceptable?

@rmartinc
Copy link
Contributor

Hi,

The only real changes in this PR are in the following files:

  • impl/src/main/java/com/sun/el/parser/ELParser.jjt
  • src/test/java/org/glassfish/el/test/ELProcessorTest.java
  • src/test/java/org/glassfish/el/test/LambdaTest.java
  • src/test/java/org/glassfish/el/test/OperatorTest.java

All the other changes are result of executing the ant with the file impl/build.xml, which in turns executes JavaCC and regenerates the Java files for the EL parser. Maybe you feel more comfortable if only the modified files are included in the PR, the review will be easier. Later you can re-execute the ant and re-generate the auto-generated files by your own. WDYT?

@rmartinc
Copy link
Contributor

Hi,

Sorry again for asking about this, but can we do something to move the PR forward? I proposed to send just one commit but maybe it's better if two commits are sent in the PR (the real modifications and then another one with the automatic ones). @tmiyargi cannot work more on the issue, so we'll need to send another PR for this.

Thanks!

Copy link

@bshannon bshannon left a comment

Choose a reason for hiding this comment

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

It seems that the people competent to review this (which doesn't include me) do not have the time to review this. I'm just going to approve and merge this, and we'll let the customers tell us if we got this wrong by filing bug reports.

Sorry this has taken so long.

@bshannon bshannon merged commit e0125c0 into jakartaee:master Dec 11, 2019
@rmartinc
Copy link
Contributor

rmartinc commented Dec 12, 2019

Waiting for 3.0.4 relase then. Thanks a lot @bshannon !!!

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.

None yet

6 participants