Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2012-05-11 12:49:04 +0000
committerMatthias Sohn2012-05-11 13:25:36 +0000
commit9613b80e5dfeb86f85946be8c5e28ae90c0c73ae (patch)
treed537b06b97f182019b08207f98dd9df17d8af8b9 /org.eclipse.egit.repository
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 'org.eclipse.egit.repository')
-rw-r--r--org.eclipse.egit.repository/.gitignore1
-rw-r--r--org.eclipse.egit.repository/.project15
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.core.resources.prefs3
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.core.runtime.prefs3
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs4
-rw-r--r--org.eclipse.egit.repository/.settings/org.eclipse.mylyn.team.ui.prefs3
-rw-r--r--org.eclipse.egit.repository/category.xml34
-rw-r--r--org.eclipse.egit.repository/pom.xml111
8 files changed, 174 insertions, 0 deletions
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 @@
+<?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.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/<project>=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 @@
+<?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 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"/>
+ </feature>
+ <feature url="features/org.eclipse.egit.sources_0.0.0.qualifier.jar" id="org.eclipse.egit.source" version="0.0.0" patch="true">
+ <category name="Eclipse Git Team Provider"/>
+ </feature>
+ <feature url="features/org.eclipse.egit.mylyn_0.0.0.qualifier.jar" id="org.eclipse.egit.mylyn" version="0.0.0" patch="false">
+ <category name="Eclipse Git Team Provider"/>
+ </feature>
+ <feature url="features/org.eclipse.egit.psf_0.0.0.qualifier.jar" id="org.eclipse.egit.psf" version="0.0.0" patch="false">
+ <category name="Eclipse Git Team Provider"/>
+ </feature>
+ <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.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.source" version="0.0.0" patch="true">
+ <category name="JGit"/>
+ </feature>-->
+ <category-def name="Eclipse Git Team Provider" label="Eclipse Git Team Provider">
+ <description>
+ Eclipse Git Team Provider
+ </description>
+ </category-def>
+ <category-def name="JGit" label="JGit">
+ <description>
+ JGit
+ </description>
+ </category-def>
+</site>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
+ Copyright (C) 2011, Chris Aniszczyk <caniszczyk@gmail.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
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.egit</groupId>
+ <artifactId>egit-parent</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.egit.repository</artifactId>
+ <packaging>eclipse-repository</packaging>
+
+ <name>EGit P2 Repository</name>
+
+ <profiles>
+ <profile>
+ <id>build-server</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.dash.maven</groupId>
+ <artifactId>eclipse-signing-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>pack</id>
+ <configuration>
+ <inputFile>${project.build.directory}/org.eclipse.egit-updatesite-${project.version}-site.zip</inputFile>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>sign</id>
+ <configuration>
+ <inputFile>${project.build.directory}/org.eclipse.egit-updatesite-${project.version}-site.zip</inputFile>
+ <signerInputDirectory>${signer-input-directory}</signerInputDirectory>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>repack</id>
+ <configuration>
+ <inputFile>${project.build.directory}/signed/site_assembly.zip</inputFile>
+ </configuration>
+ <phase>package</phase>
+ <goals>
+ <goal>pack</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>fixCheckSums</id>
+ <phase>package</phase>
+ <goals>
+ <goal>fixCheckSums</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete includeemptydirs="false">
+ <fileset
+ dir="${download-publish-path}">
+ <include name="**" />
+ </fileset>
+ </delete>
+ <copy includeemptydirs="false"
+ todir="${download-publish-path}">
+ <fileset dir="target/checksumFix">
+ <include name="**" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>

Back to the top