I can do this for JBT, but for JBDS the eGit stuff is on the Extras site – not part of the base install.

Therefore either eGit must move to Core, along with the implied support, and be part of the base JBDS 5 install - or this new org.jboss.ide.eclipse.as.server.egit.integration.feature feature has to be omitted from the Core and only included on the Extras site as part of the JBDS Git Integration feature (or a second feature).

Does that make sense?

Should the org.jboss.ide.eclipse.as.server.egit.integration.feature be INCLUDED in the http://svn.jboss.org/repos/devstudio/trunk/extras/features/com.jboss.jbds.git.feature/ feature? Or should it exist in parallel on the Extras site?

1. git mirror moved to Core [1] from Extras [2], and rebuilt (corrupt metadata?)

[1] http://download.jboss.org/jbosstools/updates/indigo/SR0/
[2] http://download.jboss.org/jbosstools/updates/indigo/extras/SR0/

2. jgit/egit features and dependent 3rd party stuff added to JBT TP, spun locally, and committed. Spinning in Hudson now and will trigger downstream too. https://hudson.qa.jboss.com/hudson/job/jbosstools-3.3_trunk.target-platform/

3. Disabled feature/plugins in AS will be re-enabled and the AS site and the aggregate site for JBT; however, cannot get them to compile. See next comment.

Cannot compile your two new plugins against eGit 1.0, and am not sure where to get eGit 1.1 as the latest available on http://download.eclipse.org/egit/updates/ is 1.0.0.

Will attach patches which I'd apply locally to add the plugins and feature to the maven reactor then to the update site... but which don't work due to this compilation error:

[ERROR] Failed to execute goal org.eclipse.tycho:tycho-compiler-plugin:0.12.0:compile (default-compile) on project org.jboss.ide.eclipse.as.egit.core: Compilation failure: Compilation failure:

[ERROR] /home/nboldt/eclipse/workspace-jboss/jbosstools_trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java (at line 112):[-1,-1]

[ERROR] return new PushOperation(repository, remoteName, false, PUSH_TIMEOUT);

[ERROR] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

[ERROR] The constructor PushOperation(Repository, String, boolean, int) is undefined

manifest.patch - expands the requirement ranges to allow egit/jgit 1.0.

features-plugins-site.xml.patch - adds plugins & feature to maven reactor, then new feature to site.xml for inclusion in AS update site.

NOTE: will still need to add this new feature to the Aggregate site in http://anonsvn.jboss.org/repos/jbosstools/trunk/build/aggregate/site/site.xml

OK, found a better solution, which I'm committing. Added the latest nightly build of eGit 1.1 here:

http://download.jboss.org/jbosstools/updates/requirements/egit/1.1.0.201108230343/

And now I can compile everything – committed change to features/pom.xml, plugins/pom.xml, site/site.xml and aggregate site (http://anonsvn.jboss.org/repos/jbosstools/trunk/build/aggregate/site/site.xml).

Still need convincing that it's time to move up from eGit 1.0R to eGit 1.1N in the target platform, however.

oh, it was not intentional to rely on 1.1. I need some time to check why we actually depend on 1.1

I corrected the egit plugins we have (org.jboss.ide.eclipse.as.egit.*) to depend on EGit 1.0 in JBIDE-9585.

https://hudson.qa.jboss.com/hudson/view/DevStudio_Trunk/job/jbosstools-3.3_trunk.component--as/changes shows your changes and build is blue.

Have removed refs to 1.1N site in pom.xml files.