From 8c73245fd0b6c764c629d241e3cb3c6b24f3ec9b Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Mon, 21 May 2012 20:51:10 +0200
Subject: [PATCH] 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>
---
 .../org.eclipse.jgit.repository/assembly.xml  | 14 ++++++++++
 .../org.eclipse.jgit.repository/pom.xml       | 28 ++++++++++++++++++-
 .../{category.xml => site.xml}                |  0
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
 rename org.eclipse.jgit.packaging/org.eclipse.jgit.repository/{category.xml => site.xml} (100%)

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
new file mode 100644
index 000000000..5bcf74602
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
@@ -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>
\ No newline at end of file
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 0cf09dd65..f088af195 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -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>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml
similarity index 100%
rename from org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
rename to org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml