Explorar el Código

Fix JGit source bundle packaging

Due to Tycho bug 368596 we didn't package the correct JGit source bundle
anymore. Instead of sources it contained the binary bundle. As a
workaround fall back to use packaging type eclipse-update-site which
doesn't seem to have this problem.

Bug: 368596
Bug: 379402
Change-Id: I3192dbd00b51e6ee6596d2301050b2a6f7028e3b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
tags/v2.0.0.201206130900-r
Matthias Sohn hace 12 años
padre
commit
8c73245fd0

+ 14
- 0
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml Ver fichero

@@ -0,0 +1,14 @@
<?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>

+ 27
- 1
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml Ver fichero

@@ -54,7 +54,9 @@
</parent>

<artifactId>org.eclipse.jgit.repository</artifactId>
<packaging>eclipse-repository</packaging>
<!-- TODO as soon as Tycho bug 368596 is fixed we should use packaging type
eclipse-repository -->
<packaging>eclipse-update-site</packaging>

<name>JGit P2 Repository</name>

@@ -80,4 +82,28 @@
<version>2.0.0-SNAPSHOT</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>

org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml Ver fichero


Cargando…
Cancelar
Guardar