Merge branch 'stable-3.0'

* stable-3.0:
  Prepare post 3.0.2-rc2 builds
  EGit v3.0.2.201309041250-rc2
  [historyView] Prevent nested merge and cherry-pick
  Update build to use CBI jarsigner plugin
  GitSyncObjectCache erroneously changes the sync state of resources
  Fix compare editor element label for "file not in commit"
  RepositoryAction: Only calculate isEnabled if relevant selection
changes
  Add refresh of linked folder to LinkedResourcesTest
  Fix inefficient implementation of GitScopeOperation
  [historyView] Prevent nested rebase
  Fix sorting of files in commit dialog tree
  Update to Orbit Kepler SR1 release R20130827064939
  Improve usability of "Create New Tag" dialog

Change-Id: I8d45613fa897bc89067861bf557ac7896806bff3
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 21 insertions, 16 deletions

diff --git a/tools/egit-developer-tools.p2f b/tools/egit-developer-tools.p2f
index 59d704f685..8a52a56d63 100644
--- a/tools/egit-developer-tools.p2f
+++ b/tools/egit-developer-tools.p2f
@@ -2,59 +2,64 @@
 <?p2f version='1.0.0'?>
 <p2f version='1.0.0'>
   <ius size='30'>
-    <iu id='org.apache.ant' name='Apache Ant' version='1.8.2.v20120109-1030'>
+    <iu id='org.apache.ant' name='Apache Ant' version='1.8.4.v201303080030'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.apache.commons.compress' name='Apache Commons Compress Plug-in' version='1.4.1.v201301140946'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.apache.log4j' name='Apache Jakarta log4j Plug-in' version='1.2.15.v201012070815'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.kohsuke.args4j' name='Args4j' version='2.0.21.v201301150030'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.hamcrest' name='Hamcrest Library of Matchers' version='1.1.0.v20090501071000'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
-    <iu id='javaewah' name='JavaEWAH' version='0.5.6.v201210150900'>
+    <iu id='javaewah' name='JavaEWAH' version='0.5.6.v201307211000'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.objenesis' name='org.objenesis' version='1.0.0.v201105211943'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.mockito' name='Java Mocking and Stubbing Framework' version='1.8.4.v201102171835'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='com.jcraft.jsch' name='JSch' version='0.1.46.v201205102330'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
-    <iu id='org.junit' name='JUnit' version='4.8.2.v4_8_2_v20110321-1705'>
+    <iu id='org.junit' name='JUnit' version='4.11.0.v201303080030'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='javax.servlet' name='javax.servlet' version='2.5.0.v201103041518'>
       <repositories size='1'>
-        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130118183705/repository/'/>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+      </repositories>
+    </iu>
+    <iu id='org.tukaani.xz' name='org.tukaani.xz' version='1.3.0.v201308270617'>
+      <repositories size='1'>
+        <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
       </repositories>
     </iu>
     <iu id='org.eclipse.jetty.bundles.f.feature.group' name='Jetty - Bundles: all the jetty bundles' version='7.6.0'>
@@ -72,12 +77,12 @@
         <repository location='http://download.eclipse.org/egit/updates-nightly'/>
       </repositories>
     </iu>
-    <iu id='org.eclipse.egit.import.feature.group' name='EGit Plug-in Import Support' version='0.0.0'>
+    <iu id='org.eclipse.jgit.feature.group' name='Eclipse JGit' version='0.0.0'>
       <repositories size='1'>
         <repository location='http://download.eclipse.org/egit/updates-nightly'/>
       </repositories>
     </iu>
-    <iu id='org.eclipse.jgit.feature.group' name='Eclipse JGit' version='0.0.0'>
+    <iu id='org.eclipse.jgit.java7.feature.group' name='Eclipse JGit optional Java 7 bundle' version='0.0.0'>
       <repositories size='1'>
         <repository location='http://download.eclipse.org/egit/updates-nightly'/>
       </repositories>