Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2012-05-11 12:49:04 +0000
committerMatthias Sohn2012-05-11 13:25:36 +0000
commit9613b80e5dfeb86f85946be8c5e28ae90c0c73ae (patch)
treed537b06b97f182019b08207f98dd9df17d8af8b9 /pom.xml
parentbf82ebe1be0b35437ada5cc42fa18c93b779815d (diff)
downloadegit-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 'pom.xml')
-rw-r--r--pom.xml24
1 files changed, 5 insertions, 19 deletions
diff --git a/pom.xml b/pom.xml
index 0261e71c7d..59211b9086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<!--
Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
Copyright (C) 2010, Chris Aniszczyk <caniszczyk@gmail.com>
- Copyright (C) 2011, Matthias Sohn <matthias.sohn@sap.com>
+ Copyright (C) 2011-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
@@ -63,10 +63,10 @@
<properties>
<egit-version>2.0.0-SNAPSHOT</egit-version>
- <tycho-version>0.12.0</tycho-version>
+ <tycho-version>0.14.1</tycho-version>
<mockito-version>1.8.4</mockito-version>
<junit-version>4.8.1</junit-version>
- <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/target/site</jgit-site>
+ <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository</jgit-site>
<jetty-site>http://download.eclipse.org/jetty/7.1.6.v20100715/repository/</jetty-site>
<wikitext-site>http://download.eclipse.org/tools/mylyn/releases/3.6</wikitext-site>
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository</orbit-site>
@@ -78,7 +78,6 @@
<profile>
<id>platform-galileo</id>
<activation>
- <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>galileo</value>
@@ -107,6 +106,7 @@
<profile>
<id>platform-indigo</id>
<activation>
+ <activeByDefault>true</activeByDefault>
<property>
<name>platform-version-name</name>
<value>indigo</value>
@@ -119,20 +119,6 @@
</properties>
</profile>
<profile>
- <id>platform-indigo-staging</id>
- <activation>
- <property>
- <name>platform-version-name</name>
- <value>indigo-staging</value>
- </property>
- </activation>
- <properties>
- <eclipse-site>http://download.eclipse.org/releases/maintenance</eclipse-site>
- <platform-version>[3.7,3.8)</platform-version>
- <swtbot-site>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site</swtbot-site>
- </properties>
- </profile>
- <profile>
<id>platform-juno</id>
<activation>
<property>
@@ -189,7 +175,7 @@
<module>org.eclipse.egit.doc</module>
<module>org.eclipse.egit-feature</module>
- <module>org.eclipse.egit-updatesite</module>
+ <module>org.eclipse.egit.repository</module>
<module>org.eclipse.egit.core.test</module>
<module>org.eclipse.egit.ui.test</module>

Back to the top