Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 559687

Summary:	[14] Merge master to BETA_JAVA14 branch
Product:	[Eclipse Project] JDT	Reporter:	Noopur Gupta <noopur_gupta>
Component:	UI	Assignee:	Jeff Johnston <jjohnstn>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	daniel_megert, kalyan_prasad, manoj.palat, sarika.sinha
Version:	4.15
Target Milestone:	BETA J14
Hardware:	All
OS:	All
See Also:	https://git.eclipse.org/r/#/c/157055/ https://git.eclipse.org/r/#/c/156891/
Whiteboard:
Bug Depends on:	558313
Bug Blocks:

Description Noopur Gupta

2020-01-30 03:24:15 EST

Merge master to BETA_JAVA14 branch

Comment 1 Noopur Gupta

2020-01-30 03:46:34 EST

See bug 558313 comment #6.

Carsten/Jeff, please provide the Gerrit patch for the master to beta merge.

Comment 2 Jeff Johnston

2020-01-30 12:27:59 EST

(In reply to Noopur Gupta from comment #1)
> See bug 558313 comment #6.
> 
> Carsten/Jeff, please provide the Gerrit patch for the master to beta merge.

I have created gerrit:

https://git.eclipse.org/r/c/156891/

but it is failing to compile due to a missing JavaCore constant:

JavaCore.COMPILER_PB_ANNOTATED_TYPE_ARGUMENT_TO_UNANNOTATED

in org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java

It exists in org.eclipse.jdt.core master but not in BETA_JAVA14 branch.  So, I guess jdt.core needs to be merged first.

Comment 3 Noopur Gupta

2020-01-30 12:38:11 EST

(In reply to Jeff Johnston from comment #2)
> (In reply to Noopur Gupta from comment #1)
> > See bug 558313 comment #6.
> > 
> > Carsten/Jeff, please provide the Gerrit patch for the master to beta merge.
> 
> I have created gerrit:
> 
> https://git.eclipse.org/r/c/156891/
> 
> but it is failing to compile due to a missing JavaCore constant:
> 
> JavaCore.COMPILER_PB_ANNOTATED_TYPE_ARGUMENT_TO_UNANNOTATED
> 
> in
> org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ProblemSeveritiesConfigurationBlock.java
> 
> 
> It exists in org.eclipse.jdt.core master but not in BETA_JAVA14 branch.  So,
> I guess jdt.core needs to be merged first.

OK, thanks for checking. Kalyan, please inform jdt.core. We will release the UI patch after that.

Comment 4 Carsten Hammer

2020-01-30 13:48:31 EST

Thanks Jeff, for creating the gerrit!

Comment 5 Sarika Sinha

2020-01-31 00:26:22 EST

JDT Core will be able to merge on Monday, as some JCL changes needs to be evaluated while merging.

Comment 6 Sarika Sinha

2020-02-03 04:17:26 EST

(In reply to Sarika Sinha from comment #5)
> JDT Core will be able to merge on Monday, as some JCL changes needs to be
> evaluated while merging.

Done!

Comment 7 Noopur Gupta

2020-02-03 04:36:33 EST

(In reply to Jeff Johnston from comment #2)
> I have created gerrit:
> 
> https://git.eclipse.org/r/c/156891/

Released this Gerrit patch.

Comment 8 Noopur Gupta

2020-02-03 04:40:43 EST

https://git.eclipse.org/r/#/c/157055/
Patch for merging the changes done in master after the previous patch was created.

Comment 9 Noopur Gupta

2020-02-03 04:44:54 EST

(In reply to Noopur Gupta from comment #8)
> https://git.eclipse.org/r/#/c/157055/
> Patch for merging the changes done in master after the previous patch was
> created.

Released. Gerrit should work after the next Y-build.