DESCRIPTION

[releng] p2.inf to make smartimport update the old importer fragment

org.eclipse.egit.ui.smartimport must override a possibly already
installed org.eclipse.egit.ui.importer fragment. Since old importer
fragments were lacking a host bundle version constraint, they might
otherwise be active even after an update and then cause conflicting
requirements, leading to a failure to resolve and activate the
org.eclipse.egit.ui bundle.

Bug: 487096
Change-Id: I4dd45d1cec4716f0a25d5fbbdde8054c3e5a65e8
Signed-off-by: Alayna Houston xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2016-05-15 20:35:49.000000000

Patch Set 2:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/8564/

-------------------------------------
author: Brenden Conley
date: 2016-05-15 21:00:42.000000000

Patch Set 2: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/8564/ : SUCCESS

-------------------------------------
author: Douglas Trujillo
date: 2016-05-15 21:12:54.000000000

Patch Set 2: Code-Review-1

I tried this:
* install Mars.2 committer package
* install EGit 4.3.1 from http://download.eclipse.org/egit/updates-4.3.1 including the old importer plugin into the Mars.2 installation
* built this version of EGit locally using maven
* tried to upgrade the Mars.2 installation

this failed with error [1], something seems wrong with this p2.inf

[1] eclipse.buildId=4.5.2.M20160212-1500
java.version=1.8.0_92
java.vendor=Oracle Corporation
BootLoader constants: OS=macosx, ARCH=x86_64, WS=cocoa, NL=en_US
Framework arguments:  -product org.eclipse.epp.package.committers.product -product org.eclipse.epp.package.committers.product -keyring /Users/d029788/.eclipse_keyring -showlocation
Command-line arguments:  -os macosx -ws cocoa -arch x86_64 -product org.eclipse.epp.package.committers.product -data file:/Users/d029788/Documents/workspace/testimporter/ -product org.eclipse.epp.package.committers.product -keyring /Users/d029788/.eclipse_keyring -showlocation

org.eclipse.core.jobs
Error
Sun May 15 23:01:46 CEST 2016
An internal error occurred during: "Fetching children of local egit".

java.lang.IllegalArgumentException: Cannot convert a org.eclipse.equinox.internal.p2.metadata.InstallableUnit into an iterator
	at org.eclipse.equinox.internal.p2.metadata.expression.RepeatableIterator.create(RepeatableIterator.java:37)
	at org.eclipse.equinox.internal.p2.metadata.expression.CollectionFilter.getInnerIterator(CollectionFilter.java:125)
	at org.eclipse.equinox.internal.p2.metadata.expression.CollectionFilter.evaluate(CollectionFilter.java:56)
	at org.eclipse.equinox.internal.p2.metadata.expression.MatchExpression.isMatch(MatchExpression.java:77)
	at org.eclipse.equinox.internal.p2.metadata.expression.MatchExpression.isMatch(MatchExpression.java:81)
	at org.eclipse.equinox.internal.p2.metadata.UpdateDescriptor.isUpdateOf(UpdateDescriptor.java:40)
	at org.eclipse.equinox.internal.p2.ui.query.AvailableIUWrapper.computeIUInformation(AvailableIUWrapper.java:93)
	at org.eclipse.equinox.internal.p2.ui.query.AvailableIUWrapper.shouldWrap(AvailableIUWrapper.java:68)
	at org.eclipse.equinox.internal.p2.ui.ElementWrapper.getElements(ElementWrapper.java:32)
	at org.eclipse.equinox.internal.p2.ui.model.QueriedElementWrapper.getElements(QueriedElementWrapper.java:89)
	at org.eclipse.equinox.internal.p2.ui.ElementQueryDescriptor.performQuery(ElementQueryDescriptor.java:66)
	at org.eclipse.equinox.internal.p2.ui.model.QueriedElement.fetchChildren(QueriedElement.java:104)
	at org.eclipse.equinox.internal.p2.ui.model.CategoryElement.fetchChildren(CategoryElement.java:125)
	at org.eclipse.equinox.internal.p2.ui.model.RemoteQueriedElement.fetchDeferredChildren(RemoteQueriedElement.java:37)
	at org.eclipse.ui.progress.DeferredTreeContentManager$1.run(DeferredTreeContentManager.java:232)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)

-------------------------------------
author: Douglas Trujillo
date: 2016-05-15 21:15:30.000000000

Patch Set 2:

@Pascal: can you help to get the p2.inf right ?

-------------------------------------
author: Gerrit Johnathan Pham
date: 2016-05-17 21:27:13.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
