diff options
| author | Matthias Sohn | 2012-05-11 12:49:04 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2012-05-11 13:25:36 +0000 |
| commit | 9613b80e5dfeb86f85946be8c5e28ae90c0c73ae (patch) | |
| tree | d537b06b97f182019b08207f98dd9df17d8af8b9 /org.eclipse.egit.ui.test/pom.xml | |
| parent | bf82ebe1be0b35437ada5cc42fa18c93b779815d (diff) | |
| download | egit-9613b80e5dfeb86f85946be8c5e28ae90c0c73ae.tar.gz egit-9613b80e5dfeb86f85946be8c5e28ae90c0c73ae.tar.xz egit-9613b80e5dfeb86f85946be8c5e28ae90c0c73ae.zip | |
Update tycho version to 0.14.1
Tycho 0.14.1 enforces that artifactId and feature/bundle SymbolicName
must match, hence follow recommended migration practice and change
groupId of feature projects in order not to change the feature names as
this would require a feature migration.
Also migrate the p2 repository build from the deprecated packaging type
eclipse-update-site to packaging type eclipse-repository.
The explicit reference to the egit p2 repository to define the runtime
platform for the egit ui tests isn't necessary any longer.
JGit-Dependency: I99fc6c2bbb20efbd6514bdd9940f3535707c21bc
Change-Id: I5fdbace1075e465b001cc9c5d449f56fb3bb2a21
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.xml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml index 465356db35..81159cf11d 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com> + Copyright (C) 2010-2012 Matthias Sohn <matthias.sohn@sap.com> All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 @@ -25,18 +25,9 @@ <name>EGit UI Test Plug-in</name> <properties> - <local-egit-site>file:/${basedir}/../org.eclipse.egit-updatesite/target/site</local-egit-site> <uitest.vmparams>-Dorg.eclipse.swtbot.search.timeout=10000 -Xmx1024m -XX:MaxPermSize=384m</uitest.vmparams> </properties> - <repositories> - <repository> - <id>local-egit</id> - <layout>p2</layout> - <url>${local-egit-site}</url> - </repository> - </repositories> - <profiles> <profile> <id>skip-ui-tests</id> @@ -92,11 +83,13 @@ <dependencies> <dependency> <type>p2-installable-unit</type> + <groupId>org.eclipse.egit.feature</groupId> <artifactId>org.eclipse.egit.feature.group</artifactId> <version>2.0.0</version> </dependency> <dependency> <type>p2-installable-unit</type> + <groupId>org.eclipse.jgit.feature</groupId> <artifactId>org.eclipse.jgit.feature.group</artifactId> <version>2.0.0</version> </dependency> |