From 9613b80e5dfeb86f85946be8c5e28ae90c0c73ae Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 11 May 2012 14:49:04 +0200 Subject: 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 --- README | 6 +- org.eclipse.egit-feature/pom.xml | 3 +- org.eclipse.egit-updatesite/.gitignore | 1 - org.eclipse.egit-updatesite/.project | 22 --- .../.settings/org.eclipse.core.resources.prefs | 3 - .../.settings/org.eclipse.core.runtime.prefs | 3 - .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 - .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 - org.eclipse.egit-updatesite/assembly.xml | 13 -- org.eclipse.egit-updatesite/index.html | 42 ------ org.eclipse.egit-updatesite/pom.xml | 159 --------------------- org.eclipse.egit-updatesite/site.xml | 34 ----- org.eclipse.egit.mylyn-feature/pom.xml | 1 + org.eclipse.egit.mylyn.ui.test/pom.xml | 12 -- org.eclipse.egit.psf-feature/pom.xml | 1 + org.eclipse.egit.repository/.gitignore | 1 + org.eclipse.egit.repository/.project | 15 ++ .../.settings/org.eclipse.core.resources.prefs | 3 + .../.settings/org.eclipse.core.runtime.prefs | 3 + .../.settings/org.eclipse.mylyn.tasks.ui.prefs | 4 + .../.settings/org.eclipse.mylyn.team.ui.prefs | 3 + org.eclipse.egit.repository/category.xml | 34 +++++ org.eclipse.egit.repository/pom.xml | 111 ++++++++++++++ org.eclipse.egit.source-feature/pom.xml | 5 +- org.eclipse.egit.ui.test/META-INF/MANIFEST.MF | 11 +- org.eclipse.egit.ui.test/pom.xml | 13 +- pom.xml | 24 +--- tools/version.sh | 2 +- 28 files changed, 199 insertions(+), 337 deletions(-) delete mode 100644 org.eclipse.egit-updatesite/.gitignore delete mode 100644 org.eclipse.egit-updatesite/.project delete mode 100644 org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs delete mode 100644 org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs delete mode 100644 org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs delete mode 100644 org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs delete mode 100644 org.eclipse.egit-updatesite/assembly.xml delete mode 100644 org.eclipse.egit-updatesite/index.html delete mode 100644 org.eclipse.egit-updatesite/pom.xml delete mode 100644 org.eclipse.egit-updatesite/site.xml create mode 100644 org.eclipse.egit.repository/.gitignore create mode 100644 org.eclipse.egit.repository/.project create mode 100644 org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs create mode 100644 org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs create mode 100644 org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs create mode 100644 org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs create mode 100644 org.eclipse.egit.repository/category.xml create mode 100644 org.eclipse.egit.repository/pom.xml diff --git a/README b/README index 6c40640102..588c5ff903 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 3416494274..be52624e20 100644 --- a/org.eclipse.egit-feature/pom.xml +++ b/org.eclipse.egit-feature/pom.xml @@ -19,7 +19,8 @@ 2.0.0-SNAPSHOT - org.eclipse.egit-feature + org.eclipse.egit.feature + org.eclipse.egit eclipse-feature Eclipse EGit Feature diff --git a/org.eclipse.egit-updatesite/.gitignore b/org.eclipse.egit-updatesite/.gitignore deleted file mode 100644 index eb5a316cbd..0000000000 --- a/org.eclipse.egit-updatesite/.gitignore +++ /dev/null @@ -1 +0,0 @@ -target diff --git a/org.eclipse.egit-updatesite/.project b/org.eclipse.egit-updatesite/.project deleted file mode 100644 index 0eb2cc3abd..0000000000 --- a/org.eclipse.egit-updatesite/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - org.eclipse.egit-updatesite - - - org.eclipse.egit - org.eclipse.egit.core - org.eclipse.egit.core.test - org.eclipse.egit.ui - org.eclipse.egit-feature - - - - org.eclipse.pde.UpdateSiteBuilder - - - - - - org.eclipse.pde.UpdateSiteNature - - diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 4ec836b53a..0000000000 --- a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Aug 11 16:46:54 PDT 2008 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 4f21775ea3..0000000000 --- a/org.eclipse.egit-updatesite/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Mon Mar 24 18:55:44 EDT 2008 -eclipse.preferences.version=1 -line.separator=\n diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs deleted file mode 100644 index 823c0f56ae..0000000000 --- a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -eclipse.preferences.version=1 -project.repository.kind=bugzilla -project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs deleted file mode 100644 index 0cba949fb7..0000000000 --- a/org.eclipse.egit-updatesite/.settings/org.eclipse.mylyn.team.ui.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description} \n\nBug\: ${task.key} -eclipse.preferences.version=1 diff --git a/org.eclipse.egit-updatesite/assembly.xml b/org.eclipse.egit-updatesite/assembly.xml deleted file mode 100644 index 907a49c006..0000000000 --- a/org.eclipse.egit-updatesite/assembly.xml +++ /dev/null @@ -1,13 +0,0 @@ - - site - - zip - - false - - - ${project.build.directory}/site - / - - - diff --git a/org.eclipse.egit-updatesite/index.html b/org.eclipse.egit-updatesite/index.html deleted file mode 100644 index 48eddb9c42..0000000000 --- a/org.eclipse.egit-updatesite/index.html +++ /dev/null @@ -1,42 +0,0 @@ - - - -Eclipse EGit Software Repository - - - - - - - -
- -

This software repository URL - -provides access to the software repository of the -Eclipse EGit project. - -

-Compatibility: This version of EGit supports Eclipse 3.5.2 (Galileo SR2) or later.

-

- -

If you are using Eclipse Helios you may also install EGit from the Helios repository. - -Click Help > Install New Software, type "helios", select the Helios repository URL, select -Collaboration > Eclipse EGit and click Install. - -

Alternatively you may install EGit using the Eclipse Marketplace client: click -Help > Eclipse Marketplace, enter "egit" into the search field, then click Go and Install.

- -

For more information about installing or updating software, see the -Eclipse Platform Help.

- -
- - diff --git a/org.eclipse.egit-updatesite/pom.xml b/org.eclipse.egit-updatesite/pom.xml deleted file mode 100644 index bfe0cf1730..0000000000 --- a/org.eclipse.egit-updatesite/pom.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.egit - egit-parent - 2.0.0-SNAPSHOT - - - org.eclipse.egit-updatesite - eclipse-update-site - - Eclipse Git Plugin Update Site - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - assembly.xml - - - - - make-assembly - package - - single - - - - - - - maven-resources-plugin - - - copy-resources - validate - - copy-resources - - - ${basedir}/target/site - - - . - - index.html - web/* - - - - - - - - - - - - - build-server - - - - org.eclipse.dash.maven - eclipse-signing-maven-plugin - - - pack - - ${project.build.directory}/org.eclipse.egit-updatesite-${project.version}-site.zip - - package - - pack - - - - sign - - ${project.build.directory}/org.eclipse.egit-updatesite-${project.version}-site.zip - ${signer-input-directory} - - package - - sign - - - - repack - - ${project.build.directory}/signed/site_assembly.zip - - package - - pack - - - - fixCheckSums - package - - fixCheckSums - - - - - - maven-antrun-plugin - - - deploy - install - - run - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/org.eclipse.egit-updatesite/site.xml b/org.eclipse.egit-updatesite/site.xml deleted file mode 100644 index cddb0fcb69..0000000000 --- a/org.eclipse.egit-updatesite/site.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - This is a pure Java implementation of the Git version control system. The native Git version is also required in this version. - - - - - - - - - - - - - - - - - - - - - - Eclipse Git Team Provider - - - - - JGit - - - diff --git a/org.eclipse.egit.mylyn-feature/pom.xml b/org.eclipse.egit.mylyn-feature/pom.xml index 4b59a6c5c0..33f756dfca 100644 --- a/org.eclipse.egit.mylyn-feature/pom.xml +++ b/org.eclipse.egit.mylyn-feature/pom.xml @@ -19,6 +19,7 @@ 2.0.0-SNAPSHOT + org.eclipse.egit.feature org.eclipse.egit.mylyn eclipse-feature diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml index ef7e1615f2..b4ebf6ae9e 100644 --- a/org.eclipse.egit.mylyn.ui.test/pom.xml +++ b/org.eclipse.egit.mylyn.ui.test/pom.xml @@ -24,18 +24,6 @@ EGit Mylyn UI Test Plug-in - - file:/${basedir}/../org.eclipse.egit-updatesite/target/site - - - - - local-egit - p2 - ${local-egit-site} - - - skip-ui-tests diff --git a/org.eclipse.egit.psf-feature/pom.xml b/org.eclipse.egit.psf-feature/pom.xml index a8667971cf..a79d6b813a 100644 --- a/org.eclipse.egit.psf-feature/pom.xml +++ b/org.eclipse.egit.psf-feature/pom.xml @@ -19,6 +19,7 @@ 2.0.0-SNAPSHOT + org.eclipse.egit.feature org.eclipse.egit.psf eclipse-feature diff --git a/org.eclipse.egit.repository/.gitignore b/org.eclipse.egit.repository/.gitignore new file mode 100644 index 0000000000..eb5a316cbd --- /dev/null +++ b/org.eclipse.egit.repository/.gitignore @@ -0,0 +1 @@ +target diff --git a/org.eclipse.egit.repository/.project b/org.eclipse.egit.repository/.project new file mode 100644 index 0000000000..5448df88ca --- /dev/null +++ b/org.eclipse.egit.repository/.project @@ -0,0 +1,15 @@ + + + org.eclipse.egit.repository + EGit P2 Repository + + + org.eclipse.pde.UpdateSiteBuilder + + + + + + org.eclipse.pde.UpdateSiteNature + + diff --git a/org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..4ec836b53a --- /dev/null +++ b/org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Mon Aug 11 16:46:54 PDT 2008 +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..4f21775ea3 --- /dev/null +++ b/org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,3 @@ +#Mon Mar 24 18:55:44 EDT 2008 +eclipse.preferences.version=1 +line.separator=\n diff --git a/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs new file mode 100644 index 0000000000..823c0f56ae --- /dev/null +++ b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs @@ -0,0 +1,4 @@ +#Tue Jul 19 20:11:28 CEST 2011 +eclipse.preferences.version=1 +project.repository.kind=bugzilla +project.repository.url=https\://bugs.eclipse.org/bugs diff --git a/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs new file mode 100644 index 0000000000..0cba949fb7 --- /dev/null +++ b/org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs @@ -0,0 +1,3 @@ +#Tue Jul 19 20:11:28 CEST 2011 +commit.comment.template=${task.description} \n\nBug\: ${task.key} +eclipse.preferences.version=1 diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml new file mode 100644 index 0000000000..2f3c89f44a --- /dev/null +++ b/org.eclipse.egit.repository/category.xml @@ -0,0 +1,34 @@ + + + + This is a pure Java implementation of the Git version control system and integrates it into Eclipse. + + + + + + + + + + + + + + + + + + + + Eclipse Git Team Provider + + + + + JGit + + + diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml new file mode 100644 index 0000000000..cd1502983c --- /dev/null +++ b/org.eclipse.egit.repository/pom.xml @@ -0,0 +1,111 @@ + + + + + 4.0.0 + + + org.eclipse.egit + egit-parent + 2.0.0-SNAPSHOT + + + org.eclipse.egit.repository + eclipse-repository + + EGit P2 Repository + + + + build-server + + + + org.eclipse.dash.maven + eclipse-signing-maven-plugin + + + pack + + ${project.build.directory}/org.eclipse.egit-updatesite-${project.version}-site.zip + + package + + pack + + + + sign + + ${project.build.directory}/org.eclipse.egit-updatesite-${project.version}-site.zip + ${signer-input-directory} + + package + + sign + + + + repack + + ${project.build.directory}/signed/site_assembly.zip + + package + + pack + + + + fixCheckSums + package + + fixCheckSums + + + + + + maven-antrun-plugin + + + deploy + install + + run + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.egit.source-feature/pom.xml b/org.eclipse.egit.source-feature/pom.xml index 48f9514f2b..c07e821058 100644 --- a/org.eclipse.egit.source-feature/pom.xml +++ b/org.eclipse.egit.source-feature/pom.xml @@ -19,9 +19,10 @@ 2.0.0-SNAPSHOT - org.eclipse.egit.source-feature + org.eclipse.egit.feature + org.eclipse.egit.source eclipse-feature - Eclipse EGit Sources Feature + Eclipse EGit Source Feature diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF index 375e781d61..bb9bace341 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 465356db35..81159cf11d 100644 --- a/org.eclipse.egit.ui.test/pom.xml +++ b/org.eclipse.egit.ui.test/pom.xml @@ -1,6 +1,6 @@