Browse Source

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>
stable-2.0
Matthias Sohn 13 years ago
parent
commit
1c0ac7cd10
  1. 14
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
  2. 0
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
  3. 28
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
  4. 2
      org.eclipse.jgit.packaging/pom.xml

14
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml

@ -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>

0
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml

28
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>

2
org.eclipse.jgit.packaging/pom.xml

@ -59,7 +59,7 @@
<name>JGit Tycho Parent</name>
<properties>
<tycho-version>0.14.1</tycho-version>
<tycho-version>0.15.0</tycho-version>
<jetty-version>7.6.0.v20120127</jetty-version>
<eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
</properties>

Loading…
Cancel
Save