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

Bug 379748

Summary: Pull request for Equinox from CBI
Product: [Eclipse Project] Platform Reporter: Paul Webster <pwebster>
Component: RelengAssignee: Platform-Releng-Inbox <platform-releng-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P3 CC: andrea.ross, igor, irbull, thanh.ha, tjwatson
Version: 4.2   
Target Milestone: 4.2.2   
Hardware: PC   
OS: Linux   
Whiteboard:
Bug Depends on: 379847, 380035, 380050    
Bug Blocks: 372792    

Description Paul Webster CLA 2012-05-16 15:41:30 EDT
This is the request to merge in the pom.xml files from the CBI forks to the
Equinox repos.

rt.equinox.binaries.git
rt.equinox.bundles.git
rt.equinox.framework.git
rt.equinox.incubator.git
rt.equinox.p2.git

PW
Comment 1 Thanh Ha CLA 2012-05-19 10:44:44 EDT
CBI commits for review


rt.equinox.bundles:
1a21a53c374b1f855c9c2e316644e3baa8a28487
http://git.eclipse.org/c/cbi/rt.equinox.bundles.git/commit/?h=cbipoms&id=1a21a53c374b1f855c9c2e316644e3baa8a28487

rt.equinox.framework:
2aa10c547c8e5a668a7e8b897ebe359a8d408736
http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/?h=cbipoms&id=2aa10c547c8e5a668a7e8b897ebe359a8d408736

rt.equinox.p2:
b6f1f1a7b48c543546eecb9c0813c5298c57330b
http://git.eclipse.org/c/cbi/rt.equinox.p2.git/commit/?h=cbipoms&id=b6f1f1a7b48c543546eecb9c0813c5298c57330b
Comment 2 Thomas Watson CLA 2012-05-21 17:17:03 EDT
Ian, can you take care of the p2 changes?
Comment 3 Thomas Watson CLA 2012-05-22 11:55:19 EDT
I have issues with all the commits suggested in the blocking bug 380050.  Does that mean these poms cannot be pulled in until we resolve the issues in bug 380050?
Comment 4 Paul Webster CLA 2012-05-22 11:59:40 EDT
Since we're cherry-picking the commit and it is orthogonal, the pom.xml commit doesn't have a technical dependency on the other commits.

PW
Comment 5 Thomas Watson CLA 2012-05-22 14:26:55 EDT
(In reply to comment #1)

> rt.equinox.framework:
> 2aa10c547c8e5a668a7e8b897ebe359a8d408736
> http://git.eclipse.org/c/cbi/rt.equinox.framework.git/commit/?h=cbipoms&id=2aa10c547c8e5a668a7e8b897ebe359a8d408736
> 


I released everything except for the following feature that does not exist:

features/rt.equinox.framework.site/pom.xml

Here is the commit:

http://git.eclipse.org/c/equinox/rt.equinox.framework.git/commit/?id=cf6a464cceefd396af4cc7c95b7aaf7e6da0c198

I also had to update the versions of several bundles that have not changed since indigo, I also updated the pom.xml versions to be in sync in commit:

http://git.eclipse.org/c/equinox/rt.equinox.framework.git/commit/?id=c2fb5ab24601e6da54cd87600d310a9abd1067b8
Comment 6 Thomas Watson CLA 2012-05-22 16:54:05 EDT
(In reply to comment #1)
> CBI commits for review
> 
> 
> rt.equinox.bundles:
> 1a21a53c374b1f855c9c2e316644e3baa8a28487
> http://git.eclipse.org/c/cbi/rt.equinox.bundles.git/commit/?h=cbipoms&id=1a21a53c374b1f855c9c2e316644e3baa8a28487

Released in commit:

http://git.eclipse.org/c/equinox/rt.equinox.bundles.git/commit/?id=0c5882ccdeac64265e04f4e74228549dd558f261

I also had to update the versions of several bundles that have not changed
since indigo, I also updated the pom.xml versions to be in sync in commit:

http://git.eclipse.org/c/equinox/rt.equinox.bundles.git/commit/?id=edc3a54d88d0423b69c6ab67e1c3ac7bded418e5
Comment 7 Ian Bull CLA 2012-05-24 02:04:05 EDT
I've cherry-picked this commit. Since p2 already had pom files, these changes just appeared to be matching the versions in the existing poms with the versions of the bundles.  

Tom, there were a few cases were the bundle didn't change since Indigo and Igor added a comment to the pom.  Should we increment the version for this?  In this case there was no change to the bundle at all (just a comment in a file that isn't even around at run-time.
Comment 8 John Arthorne CLA 2012-05-24 10:21:20 EDT
(In reply to comment #7)
> Tom, there were a few cases were the bundle didn't change since Indigo and Igor
> added a comment to the pom.  Should we increment the version for this?  In this
> case there was no change to the bundle at all (just a comment in a file that
> isn't even around at run-time.

If the bundle changed in any way, we need to increment the service (third) segment by 100 (in both pom and manifest).
Comment 9 Thomas Watson CLA 2012-05-24 10:35:38 EDT
I agree with John.  Must increment the version if any change happened.
Comment 10 Ian Bull CLA 2012-05-24 13:39:43 EDT
(In reply to comment #9)
> I agree with John.  Must increment the version if any change happened.

Ok, thanks guys. I've gone through all the bundles that were affected by this CBI pull request and if their version had not changed since Indigo (3.7.2) I updated the 3rd segment by 100.  I also updated the pom file.
Comment 11 John Arthorne CLA 2013-01-02 15:19:44 EST
It looks like all these patches have been consumed already.