Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 379747 - Pull request for Platform from CBI
Summary: Pull request for Platform from CBI
Status: RESOLVED FIXED
Alias: None
Product: Platform
Classification: Eclipse Project
Component: Releng (show other bugs)
Version: 4.2   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: 4.2 RC3   Edit
Assignee: Paul Webster CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 380051
Blocks:
  Show dependency tree
 
Reported: 2012-05-16 15:39 EDT by Paul Webster CLA
Modified: 2016-01-09 08:21 EST (History)
10 users (show)

See Also:
john.arthorne: review+

Attachments
help (757.42 KB, patch)
2016-01-09 08:21 EST, kaizoku Fuccetz CLA 		Kaizokumuda: review?
Details | Diff
View All 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 Paul Webster CLA 2012-05-16 15:39:09 EDT 
This is the request to merge in the pom.xml files from the CBI forks to the Platform repos.

eclipse.platform.common.git
eclipse.platform.debug.git
eclipse.platform.git
eclipse.platform.releng.git
eclipse.platform.resources.git
eclipse.platform.runtime.git
eclipse.platform.swt.binaries.git
eclipse.platform.swt.git
eclipse.platform.team.git
eclipse.platform.text.git
eclipse.platform.ua.git
eclipse.platform.ui.git

PW
Comment 1 Paul Webster CLA 2012-05-16 15:40:54 EDT 
Also includes eclipse.platform.releng.eclipsebuilder.git

PW
Comment 2 Thanh Ha CLA 2012-05-19 11:39:03 EDT 
CBI commits for review


R3 eclipse.platform:
7ad77417b8e6106a43a95f52c0a31a8ff4014e92
http://git.eclipse.org/c/cbi/eclipse.platform.git/commit/?h=R3_cbipoms&id=7ad77417b8e6106a43a95f52c0a31a8ff4014e92


R4 eclipse.platform:
6139bfa6b3a6147ec4413235efc4a951dc4607e6
http://git.eclipse.org/c/cbi/eclipse.platform.git/commit/?h=R4_cbipoms&id=6139bfa6b3a6147ec4413235efc4a951dc4607e6


R3 eclipse.platform.common:
47add311e971441ec7cb5a407e3f54b0b2d14df7
http://git.eclipse.org/c/cbi/eclipse.platform.common.git/commit/?h=R3_cbipoms&id=47add311e971441ec7cb5a407e3f54b0b2d14df7


R4 eclipse.platform.common:
770c90f8c2b2ba46b2bb1c23a9efafa7eb78312d
http://git.eclipse.org/c/cbi/eclipse.platform.common.git/commit/?h=R4_cbipoms&id=770c90f8c2b2ba46b2bb1c23a9efafa7eb78312d


eclipse.platform.debug:
aee8dbd0920f8e5607b59ec63fb3fa51364618fa
http://git.eclipse.org/c/cbi/eclipse.platform.debug.git/commit/?h=cbipoms&id=aee8dbd0920f8e5607b59ec63fb3fa51364618fa


R3 eclipse.platform.releng:
01b171903bf4d1f31228bb40d8b23bbb711fc5f3
http://git.eclipse.org/c/cbi/eclipse.platform.releng.git/commit/?h=R3_cbipoms&id=01b171903bf4d1f31228bb40d8b23bbb711fc5f3


R4 eclipse.platform.releng:
a014eae7841ccc7bb0c114fca3c04667e092f3ce
http://git.eclipse.org/c/cbi/eclipse.platform.releng.git/commit/?h=R4_cbipoms&id=a014eae7841ccc7bb0c114fca3c04667e092f3ce


eclipse.platform.resources:
9a10a78cd5a25c01e1e14fc5f8fde906a2bff993
http://git.eclipse.org/c/cbi/eclipse.platform.resources.git/commit/?h=cbipoms&id=9a10a78cd5a25c01e1e14fc5f8fde906a2bff993


eclipse.platform.runtime:
bceb9607b69ac1bf219b2dcf23637ae6121997b1
http://git.eclipse.org/c/cbi/eclipse.platform.runtime.git/commit/?h=cbipoms&id=bceb9607b69ac1bf219b2dcf23637ae6121997b1


eclipse.platform.swt:
7083c47702dae7855b34f60fb2e9511c13336fa0
http://git.eclipse.org/c/cbi/eclipse.platform.swt.git/commit/?h=cbipoms&id=7083c47702dae7855b34f60fb2e9511c13336fa0


eclipse.platform.team:
fed07a667a78d45d8326d9c6d826ddcaf49ee9b6
http://git.eclipse.org/c/cbi/eclipse.platform.team.git/commit/?h=cbipoms&id=fed07a667a78d45d8326d9c6d826ddcaf49ee9b6


eclipse.platform.text:
bdfcc3bebc8e6d51d83a5bb1754b4aef7a740ced
http://git.eclipse.org/c/cbi/eclipse.platform.text.git/commit/?h=cbipoms&id=bdfcc3bebc8e6d51d83a5bb1754b4aef7a740ced


eclipse.platform.ua:
c38b4ee63604d1043c9fac6f61f32c9890955b3c
http://git.eclipse.org/c/cbi/eclipse.platform.ua.git/commit/?h=cbipoms&id=c38b4ee63604d1043c9fac6f61f32c9890955b3c


R3 eclipse.platform.ui:
478fa78596c9f57858d1dbbe6dffd53596d5f474
http://git.eclipse.org/c/cbi/eclipse.platform.ui.git/commit/?h=R3_cbipoms&id=478fa78596c9f57858d1dbbe6dffd53596d5f474


R4 eclipse.platform.ui:
c5eedd16e84e4d488b4e7fb2087c7c63b7bfaf4c
http://git.eclipse.org/c/cbi/eclipse.platform.ui.git/commit/?h=R4_cbipoms&id=c5eedd16e84e4d488b4e7fb2087c7c63b7bfaf4c
Comment 3 Pawel Piech CLA 2012-05-21 16:14:58 EDT 
(In reply to comment #2)
> eclipse.platform.debug:
> aee8dbd0920f8e5607b59ec63fb3fa51364618fa
> http://git.eclipse.org/c/cbi/eclipse.platform.debug.git/commit/?h=cbipoms&id=aee8dbd0920f8e5607b59ec63fb3fa51364618fa

Merged.  Thank You.
Comment 4 Paul Webster CLA 2012-05-21 19:33:20 EDT 
(In reply to comment #2)

> R3 eclipse.platform.ui:
> 478fa78596c9f57858d1dbbe6dffd53596d5f474
> http://git.eclipse.org/c/cbi/eclipse.platform.ui.git/commit/?h=R3_cbipoms&id=478fa78596c9f57858d1dbbe6dffd53596d5f474
> 
> 
> R4 eclipse.platform.ui:
> c5eedd16e84e4d488b4e7fb2087c7c63b7bfaf4c
> http://git.eclipse.org/c/cbi/eclipse.platform.ui.git/commit/?h=R4_cbipoms&id=c5eedd16e84e4d488b4e7fb2087c7c63b7bfaf4c

merged into master and R3_development.  Thanx.
PW
Comment 5 Paul Webster CLA 2012-05-21 19:47:22 EDT 
(In reply to comment #2)
> eclipse.platform.runtime:
> bceb9607b69ac1bf219b2dcf23637ae6121997b1
> http://git.eclipse.org/c/cbi/eclipse.platform.runtime.git/commit/?h=cbipoms&id=bceb9607b69ac1bf219b2dcf23637ae6121997b1
> 
> 
> eclipse.platform.ua:
> c38b4ee63604d1043c9fac6f61f32c9890955b3c
> http://git.eclipse.org/c/cbi/eclipse.platform.ua.git/commit/?h=cbipoms&id=c38b4ee63604d1043c9fac6f61f32c9890955b3c
> 
> 

Released to master
PW
Comment 6 Szymon Brandys CLA 2012-05-22 08:08:20 EDT 
(In reply to comment #2)

> eclipse.platform.resources:
> 9a10a78cd5a25c01e1e14fc5f8fde906a2bff993
> http://git.eclipse.org/c/cbi/eclipse.platform.resources.git/commit/?h=cbipoms&id=9a10a78cd5a25c01e1e14fc5f8fde906a2bff993

> eclipse.platform.team:
> fed07a667a78d45d8326d9c6d826ddcaf49ee9b6
> http://git.eclipse.org/c/cbi/eclipse.platform.team.git/commit/?h=cbipoms&id=fed07a667a78d45d8326d9c6d826ddcaf49ee9b6

Merged to master. I also merged non-pom changes for the team repo.
Comment 7 Bogdan Gheorghe CLA 2012-05-22 16:03:09 EDT 
Do I need R3 and R4 poms like UI for SWT?
Comment 8 Thanh Ha CLA 2012-05-22 16:09:30 EDT 
(In reply to comment #7)
> Do I need R3 and R4 poms like UI for SWT?

We used the same poms in both R3 and R4 branches for swt so I think you can pull the 1 commit into both branches.
Comment 9 Thanh Ha CLA 2012-05-22 16:17:41 EDT 
(In reply to comment #8)
> (In reply to comment #7)
> > Do I need R3 and R4 poms like UI for SWT?
> 
> We used the same poms in both R3 and R4 branches for swt so I think you can
> pull the 1 commit into both branches.

Actually SWT R4 branch does have one additional change that is missing from the R3 branch.

http://git.eclipse.org/c/cbi/eclipse.platform.swt.git/commit/?h=Juno_M7_R4&id=788ffcc0de6be595cccd30753077285dea2eab1b

The version for 4 bundles is different. Should I make a separate pull request for this or can you cherry-pick this change after you pull the poms into R4?
Comment 10 Bogdan Gheorghe CLA 2012-05-22 16:59:06 EDT 
I'll cherry pick the changes for R4.
Comment 11 Bogdan Gheorghe CLA 2012-05-22 17:07:45 EDT 
Thanh, do I need something for our eclipse.platform.swt.binaries.git repo (for both R3 or R4)?
Comment 12 Thanh Ha CLA 2012-05-22 17:14:40 EDT 
(In reply to comment #11)
> Thanh, do I need something for our eclipse.platform.swt.binaries.git repo (for
> both R3 or R4)?

No the CBI build does not yet include pom files for eclipse.platform.swt.binaries. There is another Bug 372794 tracking work on building the native swt items in the CBI build.
Comment 16 Paul Webster CLA 2012-05-25 11:24:50 EDT 
We still need to do:

R3 eclipse.platform.common:
47add311e971441ec7cb5a407e3f54b0b2d14df7
http://git.eclipse.org/c/cbi/eclipse.platform.common.git/commit/?h=R3_cbipoms&id=47add311e971441ec7cb5a407e3f54b0b2d14df7


R4 eclipse.platform.common:
770c90f8c2b2ba46b2bb1c23a9efafa7eb78312d
http://git.eclipse.org/c/cbi/eclipse.platform.common.git/commit/?h=R4_cbipoms&id=770c90f8c2b2ba46b2bb1c23a9efafa7eb78312d


R3 eclipse.platform.releng:
01b171903bf4d1f31228bb40d8b23bbb711fc5f3
http://git.eclipse.org/c/cbi/eclipse.platform.releng.git/commit/?h=R3_cbipoms&id=01b171903bf4d1f31228bb40d8b23bbb711fc5f3


R4 eclipse.platform.releng:
a014eae7841ccc7bb0c114fca3c04667e092f3ce
http://git.eclipse.org/c/cbi/eclipse.platform.releng.git/commit/?h=R4_cbipoms&id=a014eae7841ccc7bb0c114fca3c04667e092f3ce
Comment 19 John Arthorne CLA 2012-05-28 13:25:59 EDT 
Reviewed with Paul.
Comment 20 kaizoku Fuccetz CLA 2016-01-09 08:21:41 EST 
Created attachment 259095 [details]
help

help