This Bugzilla instance is deprecated, and most Eclipse projects now use GitHub or Eclipse GitLab. Please see the deprecation plan for details.
Bug 517063 - [JUnit 5] Add JUnit 5 bundles to Orbit
Summary: [JUnit 5] Add JUnit 5 bundles to Orbit
Status: RESOLVED FIXED
Alias: None
Product: Orbit
Classification: Tools
Component: bundles (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: Oxygen.1a   Edit
Assignee: Noopur Gupta CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 488566 518239
  Show dependency tree
 
Reported: 2017-05-22 07:07 EDT by Noopur Gupta CLA
Modified: 2017-10-04 07:20 EDT (History)
7 users (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Comment 1 Eclipse Genie CLA 2017-05-23 08:39:55 EDT
New Gerrit change created: https://git.eclipse.org/r/97765
Comment 2 Noopur Gupta CLA 2017-05-23 08:50:05 EDT
(In reply to Eclipse Genie from comment #1)
> New Gerrit change created: https://git.eclipse.org/r/97765

This adds JUnit 5.0.0-M4 bundles to Orbit.

I have followed the steps from https://wiki.eclipse.org/Orbit/Adding_Bundles_To_Orbit_In_5_Minutes.

No changes are made to osgi.bnd files yet.

I have tested the binary bundles generated by the local build and they work fine. 

Please let me know if further changes are required.
Comment 3 Noopur Gupta CLA 2017-05-31 05:48:27 EDT
Any update on this?
Comment 5 Noopur Gupta CLA 2017-06-14 09:13:43 EDT
(In reply to Eclipse Genie from comment #4)
> Gerrit change https://git.eclipse.org/r/97765 was merged to [master].
> Commit:
> http://git.eclipse.org/c/orbit/orbit-recipes.git/commit/?id=d805e096318181f85e8c6cecb26f52e198652527
> 

Thanks, Roland. I have tested the JUnit 5 M4 JARs from http://download.eclipse.org/tools/orbit/N-builds/N20170609191750/ and they look good.
Comment 6 Eclipse Genie CLA 2017-07-05 11:53:51 EDT
New Gerrit change created: https://git.eclipse.org/r/100747
Comment 7 Noopur Gupta CLA 2017-07-05 11:56:39 EDT
(In reply to Eclipse Genie from comment #6)
> New Gerrit change created: https://git.eclipse.org/r/100747

The JUnit 5 team released Milestone 5 on July 4, 2017.

This Gerrit requests the addition of JUnit 5.0.0-M5 bundles to Orbit.
Comment 9 Noopur Gupta CLA 2017-07-07 06:12:38 EDT
(In reply to Eclipse Genie from comment #8)
> Gerrit change https://git.eclipse.org/r/100747 was merged to [master].
> Commit:
> http://git.eclipse.org/c/orbit/orbit-recipes.git/commit/?id=0feebe6344b14ecdec0de2abc058f59ee676a260
> 

Thanks, Roland.

I have tested the JUnit 5.0.0-M5 JARs from the build and they look good.
Comment 10 Eclipse Genie CLA 2017-07-19 05:54:09 EDT
New Gerrit change created: https://git.eclipse.org/r/101507
Comment 11 Noopur Gupta CLA 2017-07-19 06:00:25 EDT
(In reply to Eclipse Genie from comment #10)
> New Gerrit change created: https://git.eclipse.org/r/101507

JUnit 5.0.0-M6 has been released on July 18, 2017.

This Gerrit requests the addition of JUnit 5.0.0-M6 bundles to Orbit after the CQs are updated and approved.
Comment 13 Eclipse Genie CLA 2017-08-04 03:40:40 EDT
New Gerrit change created: https://git.eclipse.org/r/102510
Comment 14 Noopur Gupta CLA 2017-08-04 03:42:32 EDT
(In reply to Eclipse Genie from comment #13)
> New Gerrit change created: https://git.eclipse.org/r/102510

JUnit 5.0.0-RC2 was released on July 30, 2017.

This Gerrit requests the addition of JUnit 5.0.0-RC2 bundles to Orbit after the CQs are updated and approved.
Comment 16 Roland Grunberg CLA 2017-08-10 09:40:19 EDT
M6 is in Photon M1, and RC2 will currently be destined for M2. I'm guessing we'll have a GA of Junit 5 by then.
Comment 17 Noopur Gupta CLA 2017-08-10 09:44:50 EDT
(In reply to Roland Grunberg from comment #16)
> M6 is in Photon M1, and RC2 will currently be destined for M2. I'm guessing
> we'll have a GA of Junit 5 by then.

Yes, JUnit 5 GA is scheduled for September 6. So, we will have it for M2.
Comment 18 Eclipse Genie CLA 2017-08-24 02:41:35 EDT
New Gerrit change created: https://git.eclipse.org/r/103593
Comment 19 Noopur Gupta CLA 2017-08-24 02:46:49 EDT
(In reply to Eclipse Genie from comment #18)
> New Gerrit change created: https://git.eclipse.org/r/103593

JUnit 5.0.0-RC3 has been released on August 23, 2017.

This Gerrit requests the addition of JUnit 5.0.0-RC3 bundles to Orbit after the CQs are updated and approved as Type B to prepare for the GA.
Comment 21 Eclipse Genie CLA 2017-09-10 16:18:06 EDT
New Gerrit change created: https://git.eclipse.org/r/104814
Comment 22 Noopur Gupta CLA 2017-09-10 16:23:26 EDT
(In reply to Eclipse Genie from comment #21)
> New Gerrit change created: https://git.eclipse.org/r/104814

JUnit 5 GA release has been published on September 10, 2017.

This Gerrit requests the addition of JUnit 5.0.0 bundles to Orbit after the CQs are updated and approved.
Comment 23 Noopur Gupta CLA 2017-09-10 19:21:55 EDT
(In reply to Noopur Gupta from comment #22)
> (In reply to Eclipse Genie from comment #21)
> > New Gerrit change created: https://git.eclipse.org/r/104814
> 
> JUnit 5 GA release has been published on September 10, 2017.
> 
> This Gerrit requests the addition of JUnit 5.0.0 bundles to Orbit after the
> CQs are updated and approved.

JUnit 5 GA release has the following major changes:
- Adds a new bundle "org.apiguardian": https://github.com/junit-team/junit5/issues/436
- Changes the license to EPL v2.0: https://github.com/junit-team/junit5/issues/1045

The corresponding changes have been done in the Gerrit patch.
Comment 25 Noopur Gupta CLA 2017-09-12 04:54:40 EDT
The latest build after merging JUnit 5 GA changes does not create a source JAR for the newly added "org.apiguardian" bundle.

I have tried creating the build once again to see if it is resolved but we still have the same issue.

Building locally on my system creates the source JAR as well.

I am not sure where the problem is. Any ideas?
Comment 26 Roland Grunberg CLA 2017-09-12 11:14:09 EDT
My guess from looking at the nightly is that org.apiguardian ends up in the final repository because it is a requirement of other bundles from the junit stack.

However, because it was never explicitly added to the aggregationfeature/feature.xml , the source bundle doesn't end up in the final repository. I'll fix this.
Comment 27 Eclipse Genie CLA 2017-09-12 11:17:51 EDT
New Gerrit change created: https://git.eclipse.org/r/104987
Comment 29 Roland Grunberg CLA 2017-09-12 12:03:32 EDT
I've built http://download.eclipse.org/tools/orbit/downloads/drops/I20170912154950/repository ( http://download.eclipse.org/tools/orbit/downloads/drops/I20170912154950/ )

Can you confirm this resolves your issue ? I can see the apiguardian source now being detected. Is this I-build sufficient and then having the fix make it in for M3 ?
Comment 30 Dani Megert CLA 2017-09-12 12:06:27 EDT
(In reply to Roland Grunberg from comment #29)
> Is this I-build sufficient and then having the fix make
> it in for M3 ?

We want to ship JUnit 5 support with M2 (due this Friday for us), so, we need it for M2 asap.
Comment 31 Noopur Gupta CLA 2017-09-12 12:15:53 EDT
(In reply to Roland Grunberg from comment #26)
> However, because it was never explicitly added to the
> aggregationfeature/feature.xml , the source bundle doesn't end up in the
> final repository. I'll fix this.

Thanks, Roland. This was missed.

(In reply to Roland Grunberg from comment #29)
> I've built
> http://download.eclipse.org/tools/orbit/downloads/drops/I20170912154950/repository
> ( http://download.eclipse.org/tools/orbit/downloads/drops/I20170912154950/ )
> 
> Can you confirm this resolves your issue ? I can see the apiguardian source
> now being detected. 

Yes, this should resolve the issue. 

(In reply to Dani Megert from comment #30)
> (In reply to Roland Grunberg from comment #29)
> > Is this I-build sufficient and then having the fix make
> > it in for M3 ?
> 
> We want to ship JUnit 5 support with M2 (due this Friday for us), so, we
> need it for M2 asap.

We can use this I-build to ship it with our M2.

I have one more question: To ship these JARs with Oxygen.1a, do we need to add all these changes to the R4_7 branch of Orbit (if it exists)? We are currently using the same I-build for our R4_7 branch also which works fine.
Comment 32 Roland Grunberg CLA 2017-09-12 12:31:22 EDT
> (In reply to Dani Megert from comment #30)
> > (In reply to Roland Grunberg from comment #29)
> > > Is this I-build sufficient and then having the fix make
> > > it in for M3 ?
> > 
> > We want to ship JUnit 5 support with M2 (due this Friday for us), so, we
> > need it for M2 asap.
> 
> We can use this I-build to ship it with our M2.

If you can use the I-build great, if not I can post to orbit-dev that I intend to update our contribution to M2 and I'll kick off an S-build to be used as the newer contribution. I don't think this should be an issue as the older build will still be around. The metadata for all bundles will still be the same with the only difference being org.apiguardian is now present.

> I have one more question: To ship these JARs with Oxygen.1a, do we need to
> add all these changes to the R4_7 branch of Orbit (if it exists)? We are
> currently using the same I-build for our R4_7 branch also which works fine.

Oxygen.1 is almost RC4 complete so I think it's too late to backport to R4_7, build and expect any projects to adopt that. We finalized this contribution around RC2. If it works then I suppose you could even refer to a Photon milestone build for that content but you would have to be careful you don't drag in any other unintended bundles.
Comment 33 Noopur Gupta CLA 2017-09-12 13:14:15 EDT
(In reply to Roland Grunberg from comment #32)

Having an S-build for Orbit M2 with these changes would be great as I'll also be able to use it right away with our R4_7 branch.
Comment 34 Dani Megert CLA 2017-09-13 03:05:29 EDT
(In reply to Roland Grunberg from comment #32)
> Oxygen.1 is almost RC4 complete so I think it's too late to backport to
> R4_7, build and expect any projects to adopt that. We finalized this
> contribution around RC2. If it works then I suppose you could even refer to
> a Photon milestone build for that content but you would have to be careful
> you don't drag in any other unintended bundles.

Just to clarify: we don't plan to ship JUnit 5 with Oxygen 1, but with the upcoming Oxygen 1a which is reserved for Java 9 and JUnit 5 changes. Since we're done with Oxygen 1, we start to merge things into R4_7_maintenance for Oxygen 1a.
Comment 35 Dani Megert CLA 2017-09-13 03:06:53 EDT
(In reply to Dani Megert from comment #34)
> (In reply to Roland Grunberg from comment #32)
> > Oxygen.1 is almost RC4 complete so I think it's too late to backport to
> > R4_7, build and expect any projects to adopt that. We finalized this
> > contribution around RC2. If it works then I suppose you could even refer to
> > a Photon milestone build for that content but you would have to be careful
> > you don't drag in any other unintended bundles.
> 
> Just to clarify: we don't plan to ship JUnit 5 with Oxygen 1, but with the
> upcoming Oxygen 1a which is reserved for Java 9 and JUnit 5 changes. Since
> we're done with Oxygen 1, we start to merge things into R4_7_maintenance for
> Oxygen 1a.

So, ideally, Orbit would produce an Oxygen 1a with the updated JUnit stuff.

I hope that clarified things.
Comment 36 Dani Megert CLA 2017-09-13 03:08:16 EDT
(In reply to Noopur Gupta from comment #33)
> (In reply to Roland Grunberg from comment #32)
> 
> Having an S-build for Orbit M2 with these changes would be great

+1. We would need that today in order to produce our RC for sign-off tomorrow.
Thanks.
Comment 37 Roland Grunberg CLA 2017-09-13 10:11:57 EDT
(In reply to Dani Megert from comment #35)
> So, ideally, Orbit would produce an Oxygen 1a with the updated JUnit stuff.
> 
> I hope that clarified things.

Yes, sorry for the confusion. I just read the information on cross-project-issues. Yes, in that case, the junit changes (along with any Java 9 relevant changes) should be backported to R4_7 . We can then do a Oxygen.1a release.
Comment 38 Eclipse Genie CLA 2017-09-14 13:06:18 EDT
New Gerrit change created: https://git.eclipse.org/r/105158
Comment 39 Eclipse Genie CLA 2017-09-15 02:14:21 EDT
New Gerrit change created: https://git.eclipse.org/r/105171
Comment 40 Eclipse Genie CLA 2017-09-15 02:14:33 EDT
New Gerrit change created: https://git.eclipse.org/r/105172
Comment 43 Noopur Gupta CLA 2017-09-16 05:32:59 EDT
The latest S-build is now being used for our master and R4_7 branches.

Roland, please let me know when Orbit R4_7 is open for contribution.
Comment 44 Roland Grunberg CLA 2017-09-18 13:07:49 EDT
R4_7 is open for contributions targeting Oxygen.1a . I'll announce to orbit-dev in case there are others whose changes fit the "Java 9 Support" category.

In particular I would look at step (3) of https://wiki.eclipse.org/Orbit/Adding_Bundles_to_Orbit#Adding_Bundles_To_A_Maintenance_Release . This is necessary for backports (for now) to ensure that the qualifier used for the change matches master. Otherwise the cherry-picked change will take a completely new qualifier and would appear to have changes newer than even master.
Comment 45 Noopur Gupta CLA 2017-09-19 05:15:15 EDT
(In reply to Roland Grunberg from comment #44)
> R4_7 is open for contributions targeting Oxygen.1a . I'll announce to
> orbit-dev in case there are others whose changes fit the "Java 9 Support"
> category.
> 
> In particular I would look at step (3) of
> https://wiki.eclipse.org/Orbit/Adding_Bundles_to_Orbit#Adding_Bundles_To_A_Maintenance_Release
> . This is necessary for backports (for now) to ensure that the qualifier
> used for the change matches master. Otherwise the cherry-picked change will
> take a completely new qualifier and would appear to have changes newer than
> even master.

Created https://git.eclipse.org/r/#/c/105351.
Comment 47 Roland Grunberg CLA 2017-09-19 16:42:37 EDT
You could try http://download.eclipse.org/tools/orbit/downloads/drops/M20170919201930/repository ( http://download.eclipse.org/tools/orbit/downloads/drops/M20170919201930/ ). This will likely become our Oxygen.1a RC1 in Orbit.
Comment 48 Noopur Gupta CLA 2017-09-22 09:44:31 EDT
(In reply to Roland Grunberg from comment #47)
> You could try
> http://download.eclipse.org/tools/orbit/downloads/drops/M20170919201930/repository
> ( http://download.eclipse.org/tools/orbit/downloads/drops/M20170919201930/
> ). This will likely become our Oxygen.1a RC1 in Orbit.

Thanks Roland and sorry for the delay in response. Got occupied with Java 9 release work. The bundle versions in M-build are same as in master so it looks good. I will test and update.
Comment 49 Noopur Gupta CLA 2017-09-26 12:05:32 EDT
(In reply to Noopur Gupta from comment #48)
> The bundle versions in M-build are same as in master so it
> looks good. I will test and update.

I have tested the bundles from the M-build and everything looks good.

Roland, please let me know when the R-build is available.

Also, it would be good to create a target milestone of Oxygen.1a for this bug.
Comment 50 Roland Grunberg CLA 2017-10-03 14:45:21 EDT
I've just declared the R-build (see orbit-dev mailing list) and http://download.eclipse.org/tools/orbit/downloads/ .
Comment 51 Eclipse Genie CLA 2017-10-04 05:38:51 EDT
New Gerrit change created: https://git.eclipse.org/r/106190
Comment 52 Noopur Gupta CLA 2017-10-04 05:45:43 EDT
(In reply to Roland Grunberg from comment #50)
> I've just declared the R-build (see orbit-dev mailing list) and
> http://download.eclipse.org/tools/orbit/downloads/ .

Thanks, Roland. 

(In reply to Eclipse Genie from comment #51)
> New Gerrit change created: https://git.eclipse.org/r/106190

This uses the new R-build in eclipse-sdk-prereqs.target.