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
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>
-rw-r--r--README6
-rw-r--r--org.eclipse.egit-feature/pom.xml3
-rw-r--r--org.eclipse.egit-updatesite/.project22
-rw-r--r--org.eclipse.egit-updatesite/assembly.xml13
-rw-r--r--org.eclipse.egit-updatesite/index.html42
-rw-r--r--org.eclipse.egit.mylyn-feature/pom.xml1
-rw-r--r--org.eclipse.egit.mylyn.ui.test/pom.xml12
-rw-r--r--org.eclipse.egit.psf-feature/pom.xml1
-rw-r--r--org.eclipse.egit.repository/.gitignore (renamed from org.eclipse.egit-updatesite/.gitignore)0
-rw-r--r--org.eclipse.egit.repository/.project15
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs (renamed from org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs)0
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs (renamed from org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs)0
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs (renamed from org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs)0
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs (renamed from org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs)0
-rw-r--r--org.eclipse.egit.repository/category.xml (renamed from org.eclipse.egit-updatesite/site.xml)6
-rw-r--r--org.eclipse.egit.repository/pom.xml (renamed from org.eclipse.egit-updatesite/pom.xml)56
-rw-r--r--org.eclipse.egit.source-feature/pom.xml5
-rw-r--r--org.eclipse.egit.ui.test/META-INF/MANIFEST.MF11
-rw-r--r--org.eclipse.egit.ui.test/pom.xml13
-rw-r--r--pom.xml24
-rwxr-xr-xtools/version.sh2
21 files changed, 47 insertions, 185 deletions
diff --git a/README b/README
index 6c4064010..588c5ff90 100644
--- a/README
+++ b/README
@@ -31,9 +31,9 @@ three for packaging.
Also packaging. This project is for building an Eclipse "feature"
out of the plugins above.
- org.eclipse.egit-updatesite/
+ org.eclipse.egit.repository/
- This package is for producing and update site, i.e. a web site
+ This package is for producing a p2 repository, i.e. a web site
you can point your eclipse at and just upgrade.
== WARNINGS / CAVEATS ==
@@ -112,7 +112,7 @@ For some operations it may just be the preferred solution also. There
are not just a command line, there is e.g. git-gui that makes committing
partial files simple.
-- Merging.
+- Merging.
- Repacking from within the plugin.
diff --git a/org.eclipse.egit-feature/pom.xml b/org.eclipse.egit-feature/pom.xml
index 341649427..be52624e2 100644
--- a/org.eclipse.egit-feature/pom.xml
+++ b/org.eclipse.egit-feature/pom.xml
@@ -19,7 +19,8 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.egit-feature</artifactId>
+ <groupId>org.eclipse.egit.feature</groupId>
+ <artifactId>org.eclipse.egit</artifactId>
<packaging>eclipse-feature</packaging>
<name>Eclipse EGit Feature</name>
diff --git a/org.eclipse.egit-updatesite/.project b/org.eclipse.egit-updatesite/.project
deleted file mode 100644
index 0eb2cc3ab..000000000
--- a/org.eclipse.egit-updatesite/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.egit-updatesite</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.egit</project>
- <project>org.eclipse.egit.core</project>
- <project>org.eclipse.egit.core.test</project>
- <project>org.eclipse.egit.ui</project>
- <project>org.eclipse.egit-feature</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.UpdateSiteBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.UpdateSiteNature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.egit-updatesite/assembly.xml b/org.eclipse.egit-updatesite/assembly.xml
deleted file mode 100644
index 907a49c00..000000000
--- a/org.eclipse.egit-updatesite/assembly.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<assembly>
- <id>site</id>
- <formats>
- <format>zip</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/site</directory>
- <outputDirectory>/</outputDirectory>
- </fileSet>
- </fileSets>
-</assembly>
diff --git a/org.eclipse.egit-updatesite/index.html b/org.eclipse.egit-updatesite/index.html
deleted file mode 100644
index 48eddb9c4..000000000
--- a/org.eclipse.egit-updatesite/index.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Eclipse EGit Software Repository</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta name="author" content="Eclipse EGit Project" />
-<link rel="stylesheet" type="text/css" href="/eclipse/eclipse.org-common/stylesheets/visual.css" media="screen" />
-<link rel="stylesheet" type="text/css" href="/eclipse/eclipse.org-common/stylesheets/layout.css" media="screen" />
-</head>
-<body>
-<div id="header">
-<a href="http://www.eclipse.org/"><img src="/eclipse/eclipse.org-common/stylesheets/header_logo.gif" width="163" height="68" border="0" alt="Eclipse Logo" class="logo" /></a>
-</div>
-<div id="midcolumn">
-
-<p>This software repository URL
-<b><script type="text/javascript">
-<!--
- document.write(document.URL);
-// -->
-</script></b>
-provides access to the software repository of the
-<a href="http://www.eclipse.org/egit/">Eclipse EGit project</a>.
-
-<p>
-<b>Compatibility: </b>This version of EGit supports Eclipse 3.5.2 (Galileo SR2) or later.</p>
-</p>
-
-<p>If you are using Eclipse Helios you may also install EGit from the Helios repository.
-
-Click <b>Help > Install New Software</b>, type "helios", select the Helios repository URL, select
-<b>Collaboration > Eclipse EGit</b> and click <b>Install</b>.
-
-<p>Alternatively you may install EGit using the Eclipse Marketplace client: click
-<b>Help > Eclipse Marketplace</b>, enter "egit" into the search field, then click <b>Go</b> and <b>Install</b>.</p>
-
-<p>For more information about installing or updating software, see the
-<a href="http://help.eclipse.org/helios/index.jsp?topic=/org.eclipse.platform.doc.user/tasks/tasks-124.htm">Eclipse Platform Help</a>.</p>
-
-</div>
-</body>
-</html>
diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml
index 4b59a6c5c..33f756dfc 100644
--- a/org.eclipse.egit.mylyn-feature/pom.xml
+++ b/org.eclipse.egit.mylyn-feature/pom.xml
@@ -19,6 +19,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
+ <groupId>org.eclipse.egit.feature</groupId>
<artifactId>org.eclipse.egit.mylyn</artifactId>
<packaging>eclipse-feature</packaging>
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml
index ef7e1615f..b4ebf6ae9 100644
--- a/org.eclipse.egit.mylyn.ui.test/pom.xml
+++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -24,18 +24,6 @@
<name>EGit Mylyn UI Test Plug-in</name>
- <properties>
- <local-egit-site>file:/${basedir}/../org.eclipse.egit-updatesite/target/site</local-egit-site>
- </properties>
-
- <repositories>
- <repository>
- <id>local-egit</id>
- <layout>p2</layout>
- <url>${local-egit-site}</url>
- </repository>
- </repositories>
-
<profiles>
<profile>
<id>skip-ui-tests</id>
diff --git a/org.eclipse.egit.psf-feature/pom.xml b/org.eclipse.egit.psf-feature/pom.xml
index a8667971c..a79d6b813 100644
--- a/org.eclipse.egit.psf-feature/pom.xml
+++ b/org.eclipse.egit.psf-feature/pom.xml
@@ -19,6 +19,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
+ <groupId>org.eclipse.egit.feature</groupId>
<artifactId>org.eclipse.egit.psf</artifactId>
<packaging>eclipse-feature</packaging>
diff --git a/org.eclipse.egit-updatesite/.gitignore b/org.eclipse.egit.repository/.gitignore
index eb5a316cb..eb5a316cb 100644
--- a/org.eclipse.egit-updatesite/.gitignore
+++ b/org.eclipse.egit.repository/.gitignore
diff --git a/org.eclipse.egit.repository/.project b/org.eclipse.egit.repository/.project
new file mode 100644
index 000000000..5448df88c
--- /dev/null
+++ b/org.eclipse.egit.repository/.project
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.egit.repository</name>
+ <comment>EGit P2 Repository</comment>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.UpdateSiteBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.UpdateSiteNature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs
index 4ec836b53..4ec836b53 100644
--- a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs
index 4f21775ea..4f21775ea 100644
--- a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs
+++ b/org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs
index 823c0f56a..823c0f56a 100644
--- a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs
+++ b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs
diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs
index 0cba949fb..0cba949fb 100644
--- a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs
+++ b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs
diff --git a/org.eclipse.egit-updatesite/site.xml b/org.eclipse.egit.repository/category.xml
index cddb0fcb6..2f3c89f44 100644
--- a/org.eclipse.egit-updatesite/site.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
<description url="Eclipse Git Plugin">
- This is a pure Java implementation of the Git version control system. The native Git version is also required in this version.
+ This is a pure Java implementation of the Git version control system and integrates it into Eclipse.
</description>
<feature url="features/org.eclipse.egit_0.0.0.qualifier.jar" id="org.eclipse.egit" version="0.0.0" patch="true">
<category name="Eclipse Git Team Provider"/>
@@ -18,9 +18,9 @@
<feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0" patch="true">
<category name="JGit"/>
</feature>
- <feature url="features/org.eclipse.jgit.sources_0.0.0.qualifier.jar" id="org.eclipse.jgit.source" version="0.0.0" patch="true">
+<!-- <feature url="features/org.eclipse.jgit.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.source" version="0.0.0" patch="true">
<category name="JGit"/>
- </feature>
+ </feature>-->
<category-def name="Eclipse Git Team Provider" label="Eclipse Git Team Provider">
<description>
Eclipse Git Team Provider
diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit.repository/pom.xml
index bfe0cf173..cd1502983 100644
--- a/org.eclipse.egit-updatesite/pom.xml
+++ b/org.eclipse.egit.repository/pom.xml
@@ -2,7 +2,7 @@
<!--
Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
Copyright (C) 2011, 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
@@ -21,58 +21,10 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.egit-updatesite</artifactId>
- <packaging>eclipse-update-site</packaging>
+ <artifactId>org.eclipse.egit.repository</artifactId>
+ <packaging>eclipse-repository</packaging>
- <name>Eclipse Git Plugin Update Site</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>assembly.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/site</outputDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>index.html</include>
- <include>web/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <name>EGit P2 Repository</name>
<profiles>
<profile>
diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml
index 48f9514f2..c07e82105 100644
--- a/org.eclipse.egit.source-feature/pom.xml
+++ b/org.eclipse.egit.source-feature/pom.xml
@@ -19,9 +19,10 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.eclipse.egit.source-feature</artifactId>
+ <groupId>org.eclipse.egit.feature</groupId>
+ <artifactId>org.eclipse.egit.source</artifactId>
<packaging>eclipse-feature</packaging>
- <name>Eclipse EGit Sources Feature</name>
+ <name>Eclipse EGit Source Feature</name>
</project>
diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
index 375e781d6..bb9bace34 100644
--- a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -11,19 +11,20 @@ Require-Bundle: org.apache.log4j;bundle-version="[1.0.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.filesystem;bundle-version="[1.1.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.search;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.hamcrest;bundle-version="[1.1.0,2.0.0)",
org.mockito;bundle-version="[1.8.0,1.9.0)"
-Import-Package: org.eclipse.jgit.junit.http;version="[2.0.0,2.1.0)",
+Import-Package: org.eclipse.jgit.api;version="[2.0.0,2.1.0)",
+ org.eclipse.jgit.api.errors;version="[2.0.0,2.1.0)",
org.eclipse.jgit.junit;version="[2.0.0,2.1.0)",
+ org.eclipse.jgit.junit.http;version="[2.0.0,2.1.0)",
org.eclipse.jgit.lib;version="[2.0.0,2.1.0)",
org.eclipse.jgit.revwalk;version="[2.0.0,2.1.0)",
org.eclipse.jgit.storage.file;version="[2.0.0,2.1.0)",
org.eclipse.jgit.transport;version="[2.0.0,2.1.0)",
org.eclipse.jgit.transport.resolver;version="[2.0.0,2.1.0)",
org.eclipse.jgit.util;version="[2.0.0,2.1.0)",
- org.eclipse.jgit.api;version="[2.0.0,2.1.0)",
- org.eclipse.jgit.api.errors;version="[2.0.0,2.1.0)",
org.eclipse.swt.widgets,
org.eclipse.swtbot.eclipse.finder,
org.eclipse.swtbot.eclipse.finder.exceptions,
@@ -42,7 +43,7 @@ Import-Package: org.eclipse.jgit.junit.http;version="[2.0.0,2.1.0)",
org.junit;version="[4.3.1,5.0.0)",
org.junit.runner;version="[4.3.1,5.0.0)",
org.junit.runners;version="[4.3.1,5.0.0)",
- org.osgi.framework;version="[1.4.0,2.0.0)",
org.mockito;version="[1.8.0,1.9.0)",
- org.mockito.stubbing;version="[1.8.0,1.9.0)"
+ org.mockito.stubbing;version="[1.8.0,1.9.0)",
+ org.osgi.framework;version="[1.4.0,2.0.0)"
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 465356db3..81159cf11 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>
diff --git a/pom.xml b/pom.xml
index 0261e71c7..59211b908 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>
diff --git a/tools/version.sh b/tools/version.sh
index 9be0b76f8..a4a9e3597 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -169,7 +169,7 @@ perl -pi~ -e '
$seen_version++ if
s{<(version)>[^<\$]*</\1>}{<${1}>'"$POM_V"'</${1}>};
}
- ' org.eclipse.egit-updatesite/pom.xml
+ ' org.eclipse.egit.repository/pom.xml
perl -pi~ -e '
if ($ARGV ne $old_argv) {

Back to the top