Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-02-24 18:01:39 -0500
committerMatthias Sohn2015-02-24 18:01:39 -0500
commit5ba2c73974998d926d4e7c63b75c6c40c79db4b0 (patch)
tree2cbcb0be5fba4893ac02421169276df7af8d4848 /org.eclipse.egit.ui.test/pom.xml
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 'org.eclipse.egit.ui.test/pom.xml')
-rw-r--r--org.eclipse.egit.ui.test/pom.xml9
1 files changed, 7 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index edec1b6f6..3a68a2901 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -92,13 +92,18 @@
</requirement>
<requirement>
<type>eclipse-feature</type>
+ <id>org.eclipse.e4.rcp</id>
+ <versionRange>0.0.0</versionRange>
+ </requirement>
+ <requirement>
+ <type>eclipse-feature</type>
<id>org.eclipse.pde</id>
- <versionRange>${platform-version}</versionRange>
+ <versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.cvs</id>
- <versionRange>[1.1.2,2.0.0)</versionRange>
+ <versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>
</dependency-resolution>

Back to the top