Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMatthias Sohn2015-02-24 23:01:39 +0000
committerMatthias Sohn2015-02-24 23:01:39 +0000
commit5ba2c73974998d926d4e7c63b75c6c40c79db4b0 (patch)
tree2cbcb0be5fba4893ac02421169276df7af8d4848 /tools
parentd55e3117deff4c47b6420c9b60df62494bbf91d3 (diff)
parentfbbf8e9ec2142efd71680fab331542a57c2dbd5f (diff)
downloadegit-5ba2c73974998d926d4e7c63b75c6c40c79db4b0.tar.gz
egit-5ba2c73974998d926d4e7c63b75c6c40c79db4b0.tar.xz
egit-5ba2c73974998d926d4e7c63b75c6c40c79db4b0.zip
Merge branch 'stable-3.7'
* stable-3.7: Add org.slf4j.api and slf4j-log4j bridge to target platforms Fix UI tests for platform versions newer than Kepler Use Target Platform Definition DSL to generate target platforms Leftover after review 42168: trailing space in StagingView Fix test error in StagingViewTest.testCommitSingleFile Close opened views on teardown to avoid broken StagingView tests Fix test error in StagingViewTest.testMergeConflict Refactoring the way how StagingView reacts on selection. Don't use ModalContext.run(..) during part activation event notification GitLightweightDecorator code cleanup part 1 Make welcome page contribution more consistent Don't apply fonts and colors if they are undefined in current theme Conflicts: tools/egit-developer-tools.p2f Change-Id: I5d892763c88ea23de6444795683af9a3d75fbddc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/egit-developer-tools.p2f99
1 files changed, 72 insertions, 27 deletions
diff --git a/tools/egit-developer-tools.p2f b/tools/egit-developer-tools.p2f
index b1936d385a..d1efd95170 100644
--- a/tools/egit-developer-tools.p2f
+++ b/tools/egit-developer-tools.p2f
@@ -1,70 +1,100 @@
<?xml version='1.0' encoding='UTF-8'?>
<?p2f version='1.0.0'?>
<p2f version='1.0.0'>
- <ius size='30'>
- <iu id='org.apache.ant' name='Apache Ant' version='1.8.4.v201303080030'>
+ <ius size='39'>
+ <iu id='org.apache.ant' name='Apache Ant' version='1.9.4.v201410062020'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
</repositories>
</iu>
- <iu id='org.apache.commons.compress' name='Apache Commons Compress Plug-in' version='1.4.1.v201301140946'>
+ <iu id='org.apache.commons.compress' name='Apache Commons Compress Plug-in' version='1.6.0.v201310281400'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/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/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/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/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
+ </repositories>
+ </iu>
+ <iu id='org.hamcrest.generator' name='Hamcrest Generator' version='1.3.0.v201305210900'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
+ </repositories>
+ </iu>
+ <iu id='org.hamcrest.integration' name='Hamcrest Integration With Other Tools' version='1.3.0.v201305210900'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
+ </repositories>
+ </iu>
+ <iu id='org.hamcrest.library' name='Hamcrest Library of Additional Matchers' version='1.3.0.v201305281000'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/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/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
+ </repositories>
+ </iu>
+ <iu id='org.hamcrest.text' name='Hamcrest Library of Text Matchers' version='1.1.0.v20090501071000'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
</repositories>
</iu>
- <iu id='javaewah' name='JavaEWAH' version='0.5.6.v201307211000'>
+ <iu id='javaewah' name='JavaEWAH' version='0.7.9.v201401101600'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/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/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
</repositories>
</iu>
- <iu id='org.mockito' name='Java Mocking and Stubbing Framework' version='1.8.4.v201102171835'>
+ <iu id='org.mockito' name='Java Mocking and Stubbing Framework' version='1.8.4.v201303031500'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
</repositories>
</iu>
- <iu id='com.jcraft.jsch' name='JSch' version='0.1.46.v201205102330'>
+ <iu id='com.jcraft.jsch' name='JSch' version='0.1.51.v201410302000'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
</repositories>
</iu>
<iu id='org.junit' name='JUnit' version='4.11.0.v201303080030'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/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/R20130827064939/repository/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/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/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
</repositories>
</iu>
- <iu id='org.eclipse.jetty.bundles.f.feature.group' name='Jetty - Bundles: all the jetty bundles' version='7.6.0'>
+ <iu id='org.slf4j.api' name='org.slf4j.api' version='1.7.2.v20121108-1250'>
<repositories size='1'>
- <repository location='http://archive.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.0.v20120127/'/>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
+ </repositories>
+ </iu>
+ <iu id='org.slf4j.impl.log4j12' name='org.slf4j.impl.log4j12' version='1.7.2.v20131105-2200'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/'/>
+ </repositories>
+ </iu>
+ <iu id='org.eclipse.jetty.bundles.f.feature.group' name='Jetty - Bundles: all the jetty bundles' version='7.6.14.v20131031'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/'/>
</repositories>
</iu>
<iu id='org.eclipse.egit.feature.group' name='Eclipse EGit' version='0.0.0'>
@@ -92,6 +122,16 @@
<repository location='http://download.eclipse.org/egit/updates-nightly'/>
</repositories>
</iu>
+ <iu id='org.eclipse.pde.api.tools.ee.j2se15.group' name='J2SE-1.5 Execution Environment Description' version='0.0.0'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/eclipse/updates/4.4'/>
+ </repositories>
+ </iu>
+ <iu id='org.eclipse.pde.api.tools.ee.javase16.group' name='JavaSE-1.6 Execution Environment Description' version='0.0.0'>
+ <repositories size='1'>
+ <repository location='http://download.eclipse.org/eclipse/updates/4.4'/>
+ </repositories>
+ </iu>
<iu id='org.eclipse.pde.api.tools.ee.javase17.group' name='JavaSE-1.7 Execution Environment Description' version='0.0.0'>
<repositories size='1'>
<repository location='http://download.eclipse.org/eclipse/updates/4.4'/>
@@ -113,12 +153,12 @@
</repositories>
</iu>
<iu id='org.eclipse.mylyn_feature.feature.group' name='Mylyn' version='0.0.0'>
- <repositories size='2'>
+ <repositories size='1'>
<repository location='http://download.eclipse.org/mylyn/snapshots/weekly'/>
</repositories>
</iu>
<iu id='org.eclipse.mylyn.bugzilla_feature.feature.group' name='Mylyn Tasks Connector: Bugzilla' version='0.0.0'>
- <repositories size='2'>
+ <repositories size='1'>
<repository location='http://download.eclipse.org/mylyn/snapshots/weekly'/>
</repositories>
</iu>
@@ -134,27 +174,32 @@
</iu>
<iu id='org.eclipse.swtbot.forms.feature.group' name='SWTBot for Eclipse Forms Testing (incubation)' version='0.0.0'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/technology/swtbot/snapshots'/>
+ <repository location='http://download.eclipse.org/technology/swtbot/releases/latest/'/>
</repositories>
</iu>
<iu id='org.eclipse.swtbot.eclipse.feature.group' name='SWTBot for Eclipse Testing (incubation)' version='0.0.0'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/technology/swtbot/snapshots'/>
+ <repository location='http://download.eclipse.org/technology/swtbot/releases/latest/'/>
</repositories>
</iu>
<iu id='org.eclipse.swtbot.feature.group' name='SWTBot for SWT Testing (incubation)' version='0.0.0'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/technology/swtbot/snapshots'/>
+ <repository location='http://download.eclipse.org/technology/swtbot/releases/latest/'/>
</repositories>
</iu>
<iu id='org.eclipse.swtbot.ide.feature.group' name='SWTBot IDE Features (incubation)' version='0.0.0'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/technology/swtbot/snapshots'/>
+ <repository location='http://download.eclipse.org/technology/swtbot/releases/latest/'/>
</repositories>
</iu>
<iu id='org.eclipse.swtbot.eclipse.test.junit.feature.group' name='SWTBot JUnit Headless launchers for Eclipse (incubation)' version='0.0.0'>
<repositories size='1'>
- <repository location='http://download.eclipse.org/technology/swtbot/snapshots'/>
+ <repository location='http://download.eclipse.org/technology/swtbot/releases/latest/'/>
+ </repositories>
+ </iu>
+ <iu id='fr.obeo.releng.targetplatform-feature.feature.group' name='Target Platform Definition DSL and Generator' version='0.0.0'>
+ <repositories size='1'>
+ <repository location='http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/'/>
</repositories>
</iu>
</ius>

Back to the top