Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 348891 - org.eclipse.jgit_0.12.1.jar contribution to /releases/staging
Summary: org.eclipse.jgit_0.12.1.jar contribution to /releases/staging
Status: RESOLVED FIXED
Alias: None
Product: PTP
Classification: Tools
Component: RDT.sync (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 critical (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-06-09 09:22 EDT by Markus Knauer CLA
Modified: 2012-05-23 16:53 EDT (History)
5 users (show)

See Also:


Attachments
JGit dependency problem (1.01 KB, patch)
2011-06-09 11:07 EDT, Markus Knauer CLA
g.watson: iplog+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Markus Knauer CLA 2011-06-09 09:22:31 EDT
At the moment I can find an old version of the org.eclipse.jgit_0.12.1.jar bundle in /releases/staging that *must* be removed (see http://dev.eclipse.org/mhonarc/lists/cross-project-issues-dev/msg06191.html). Apart from being in the Simultaneous Release repository, it is at least included the Parallel Tools Package. The [j,e]git team provides a fixed 1.0.0 version of the very same bundle so the question remains which project contributes this bundle.

By looking into content.jar...

-rw-rw-r-- 1 david_williams callistoadmin 2271298 2011-06-09 03:28 /releases/staging/content.jar

I could only find the org.eclipse.ptp.rdt.sync feature that requires this bundle.

    <unit id='org.eclipse.ptp.rdt.sync.feature.group' version='5.0.0.201106081903' singleton='false'>
      <requires size='7'>
         <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.jgit' range='[0.12.1,0.12.1]'/>

All other requirements are using the correct 1.0.0.x version.
Comment 1 Greg Watson CLA 2011-06-09 09:38:34 EDT
Markus, any idea where this would be coming from? None of the plugins in the feature have a specific requirement for 0.12.1. The only place I can see it is in the build script where it is copied into the update site. I can try removing this to see what happens.
Comment 2 Greg Watson CLA 2011-06-09 09:42:30 EDT
Re-running build with this removed...
Comment 3 Markus Knauer CLA 2011-06-09 10:16:36 EDT
(In reply to comment #1)
> Markus, any idea where this would be coming from?

Not really. Maybe it is pulled in by a feature-include with version number 0.0.0 and got replaced during the build with the version from the target.
Comment 4 Markus Knauer CLA 2011-06-09 11:07:44 EDT
Created attachment 197699 [details]
JGit dependency problem

I think a change in the org.eclipse.ptp.rdt.sync feature like the attached one in the patch could help. I removed the bundle org.eclipse.jgit from the list of plug-ins and moved it to the list of dependencies.

Of course, that does mean that a user installing this feature must have access to a repository containing org.eclipse.jgit which would not be included in your own repository any more, but this is probably acceptable (and what you want) since everything is available from the Indigo repository anyway. Speaking of this, that is the reason for the checkbox "Contact all update sites during install to find required software" in the install dialog.
Comment 5 Greg Watson CLA 2011-06-09 11:27:08 EDT
I'm running a build right now that has the plugin removed but doesn't have the <requires> entry. Do you think this is ok, or should I restart the build?
Comment 6 Greg Watson CLA 2011-06-09 11:37:10 EDT
No need to answer that. The build failed because of unsatisfied imports (jgit). Rebuilding...
Comment 7 Markus Knauer CLA 2011-06-09 11:40:29 EDT
(In reply to comment #6)
> No need to answer that. The build failed because of unsatisfied imports (jgit).

Yepp, that is half-expected. Do you have org.eclipse.jgit in your target that you are using for your build? And which kind of build are you using? PDE, Buckminster, Maven, ...?
Comment 8 Greg Watson CLA 2011-06-09 11:53:44 EDT
It still failed. I'm using a PDE build. I think I need to have jgit in my target as you suggest. I do this for CDT, RSE and a few other things, so will try adding jgit.
Comment 9 Greg Watson CLA 2011-06-09 11:56:56 EDT
Any idea where I can get it from? The latest in downloads/jgit/maven/org/eclipse/jgit/org.eclipse.jgit seems to be 0.9.3.
Comment 10 Markus Knauer CLA 2011-06-09 12:05:17 EDT
(In reply to comment #9)
> Any idea where I can get it from? The latest in
> downloads/jgit/maven/org/eclipse/jgit/org.eclipse.jgit seems to be 0.9.3.

org.eclipse.jgit_1.0.0.201106090707-r.jar from releases/staging would be a candidate (http://download.eclipse.org/releases/staging/aggregate/plugins/org.eclipse.jgit_1.0.0.201106090707-r.jar).
Comment 11 Markus Knauer CLA 2011-06-09 12:13:18 EDT
The longer answer could be: Many projects are building against a target that is a sub-set of /releases/staging; if they don't use this as an input, it is expected that it they use something that is compatible with what is there. Sometimes it helps to look in the .b3aggrcon files, in that case it is the "egit" contribution file /org.eclipse.indigo.build/egit.b3aggrcon.

(Good luck for the rebuild, I hope it finishes successful now!)
Comment 12 Greg Watson CLA 2011-06-09 13:12:57 EDT
Build is finished and installed in update site. Looks good so far. We'll need to kick off another indigo aggregation I guess.
Comment 13 Markus Knauer CLA 2011-06-09 14:50:04 EDT
I checked your repository at /tools/ptp/updates/indigo/, especially content.jar, and all looks good to me now. 
Let's cross fingers for the /releases/staging repository build and for the package build... ;-)
Comment 14 Roland Schulz CLA 2011-06-14 13:14:59 EDT
my understanding is this is fixed, correct?
Comment 15 Markus Knauer CLA 2011-06-15 17:29:25 EDT
Yepp, confirmed in Indigo RC4 last week and today in /releases/staging (==RC5).