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

Update Target Platform to 2021-03 Release. #1691

Merged
merged 1 commit into from
Mar 19, 2021
Merged

Update Target Platform to 2021-03 Release. #1691

merged 1 commit into from
Mar 19, 2021

Conversation

rgrunber
Copy link
Contributor

  • Use 4.19 P-build for Java 16 support
  • javax.xml bundle no longer required by platform

Signed-off-by: Roland Grunberg [email protected]

@rgrunber rgrunber added this to the End March 2021 milestone Mar 16, 2021
@rgrunber rgrunber self-assigned this Mar 16, 2021
@rgrunber
Copy link
Contributor Author

Not exactly sure what happened with the javax.xml bundle, but when I tried to build with 2021-03 the product build complained that it wasn't in the target platform. Since we don't specify it directly in the target file, I think it could only be left out if things we depend upon no longer depend on it, and if that's the case, we may as well drop it.

snjeza
snjeza reviewed Mar 16, 2021
View reviewed changes
Copy link
Contributor

@snjeza snjeza left a comment

Choose a reason for hiding this comment

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

Could you add a JDK 16 test? See 5327f23

testforstephen
testforstephen reviewed Mar 17, 2021
View reviewed changes
org.eclipse.jdt.ls.product/languageServer.product
@@ -21,7 +21,6 @@
</vm>

<plugins>
<plugin id="javax.xml"/>
Copy link
Contributor

Choose a reason for hiding this comment

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

Need update the launch files as well.

image

@testforstephen
Copy link
Contributor

Not exactly sure what happened with the javax.xml bundle, but when I tried to build with 2021-03 the product build complained that it wasn't in the target platform. Since we don't specify it directly in the target file, I think it could only be left out if things we depend upon no longer depend on it, and if that's the case, we may as well drop it.

When using the dependency analysis feature to show the dependents of java.xml, below is the result.
image

And then check eclipse.jdt.ls distro bits, "org.apache.xerces" is not included there, so looks like "java.xml" is not required by the runtime.

@rgrunber
Copy link
Contributor Author

rgrunber commented Mar 17, 2021 •
edited
Loading

Quick note : The rtstubs.jar file for '15' matches rtstubs15.jar (Java 1.5) and not rtstubs_15.jar (Java 15) from eclipse.jdt.ui/org.eclipse.jdt.ui.tests/testresources. I can probably fix this as part of this change. It's likely not causing any problems as we're not making any assertions about particular packages.

@snjeza snjeza mentioned this pull request Mar 17, 2021
Merged
@rgrunber rgrunber force-pushed the update-tp-2021-03 branch from 3e0a8b5 to a16228e Compare March 17, 2021 20:18
@rgrunber
Copy link
Contributor Author

May need to adjust some tests. Looking into it.

@rgrunber rgrunber force-pushed the update-tp-2021-03 branch from a16228e to 0900eb6 Compare March 18, 2021 03:55
@rgrunber
Copy link
Contributor Author

So feature preview can only be enabled when using the latest compliance level (16), but then why did the 2 testcases in CompletionHandlerTest work with compliance set at 14 when we supported Java 15 ?

@testforstephen
Copy link
Contributor

That two test cases should be added while we enable Java 14 support. It's used to test Java 14 new feature record.

@rgrunber
Update Target Platform to 2021-03 Release.
84691c9 
- Use 4.19 P-build for Java 16 support
- javax.xml bundle no longer required by platform
- Add test cases
- Adjust compliance to 16 on tests with feature preview enabled
- Fix rtstubs.jar for Java 15

Signed-off-by: Roland Grunberg <[email protected]>
@rgrunber rgrunber force-pushed the update-tp-2021-03 branch from 0900eb6 to 84691c9 Compare March 18, 2021 15:53
@rgrunber
Copy link
Contributor Author

rgrunber commented Mar 18, 2021 •
edited
Loading

test this please

Update : I think the change should be good. There are build failures because 4.19-I-builds has disappeared now that the next release is beginning, and this should also fix that now. If there's any issues though, I can push a partial fix that at least bumps to 2021-03 (while holding off on the Java 16 parts) if there are remaining concerns.

@testforstephen testforstephen mentioned this pull request Mar 19, 2021
Closed
@testforstephen testforstephen linked an issue Mar 19, 2021 that may be closed by this pull request
Build Error #1693
Closed
testforstephen
testforstephen approved these changes Mar 19, 2021
View reviewed changes
Copy link
Contributor

@testforstephen testforstephen left a comment

Choose a reason for hiding this comment

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

Have a try at the new TP, i didn't observe any issue yet. Feel free to merge it.

@fbricon fbricon merged commit 3756738 into eclipse-jdtls:master Mar 19, 2021
@rgrunber rgrunber deleted the update-tp-2021-03 branch March 19, 2021 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@testforstephen testforstephen testforstephen approved these changes

@snjeza snjeza snjeza approved these changes

Assignees

@rgrunber rgrunber

Labels
None yet
Projects
None yet
Milestone
Mid April 2021
Development

Successfully merging this pull request may close these issues.

Build Error
4 participants
@rgrunber @testforstephen @snjeza @fbricon