summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging/org.eclipse.jgit.repository
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2012-06-05 15:45:29 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2012-06-05 15:50:29 +0200
commit1c0ac7cd10750e3c82eff61201cfc3ba91b203da (patch)
tree75575dad9a5a7f0b1b4810dce2da06c38b2ea425 /org.eclipse.jgit.packaging/org.eclipse.jgit.repository
parent108e2bc6e43b1ddf4d7545edffc75dcc9e106cd7 (diff)
downloadjgit-1c0ac7cd10750e3c82eff61201cfc3ba91b203da.tar.gz
jgit-1c0ac7cd10750e3c82eff61201cfc3ba91b203da.zip
Update build to use Tycho 0.15.0
Also use packaging type eclipse-repository to create the p2 repository since Tycho fixed bug 368596 which we worked around using packaging type eclipse-update-site. Change-Id: Id4ee884027d55cd2d43e8a6ef58a67f74ab488e4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.repository')
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml14
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml (renamed from org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml)0
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml28
3 files changed, 1 insertions, 41 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
deleted file mode 100644
index 5bcf746028..0000000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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> \ No newline at end of file
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
index dd20b56a7a..dd20b56a7a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
index e87f4498da..05f35f0714 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -54,9 +54,7 @@
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>
- <!-- TODO as soon as Tycho bug 368596 is fixed we should use packaging type
- eclipse-repository -->
- <packaging>eclipse-update-site</packaging>
+ <packaging>eclipse-repository</packaging>
<name>JGit P2 Repository</name>
@@ -82,28 +80,4 @@
<version>${project.version}</version>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.3</version>
- <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>
- </plugins>
- </build>
</project>