Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 570843 - [16] Merge master branch to BETA_JAVA16 branch after M2
Summary: [16] Merge master branch to BETA_JAVA16 branch after M2
Status: RESOLVED FIXED
Alias: None
Product: JDT
Classification: Eclipse Project
Component: UI (show other bugs)
Version: 4.19   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: BETA J16   Edit
Assignee: Noopur Gupta CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 568025
  Show dependency tree
 
Reported: 2021-02-02 07:49 EST by Noopur Gupta CLA
Modified: 2021-02-03 03:08 EST (History)
3 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Noopur Gupta CLA 2021-02-02 07:49:18 EST 
Merge master branch to BETA_JAVA16 branch after M2.
Comment 1 Noopur Gupta CLA 2021-02-02 08:05:33 EST 
Merge is having conflicts due to these files:

- org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpTest15.java

- org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/InlineMethodTests14.java

These don't exist in the beta branch as in master and have been renamed to *16 (see bug 569614).

I have made some changes while merging. 

Kalyan, Fabrice: please check if your respective changes are still available in the updated files in beta branch.