From 1c0ac7cd10750e3c82eff61201cfc3ba91b203da Mon Sep 17 00:00:00 2001
From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 5 Jun 2012 15:45:29 +0200
Subject: 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>
---
 .../org.eclipse.jgit.repository/assembly.xml       | 14 -----------
 .../org.eclipse.jgit.repository/category.xml       | 22 +++++++++++++++++
 .../org.eclipse.jgit.repository/pom.xml            | 28 +---------------------
 .../org.eclipse.jgit.repository/site.xml           | 22 -----------------
 org.eclipse.jgit.packaging/pom.xml                 |  2 +-
 5 files changed, 24 insertions(+), 64 deletions(-)
 delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.repository/assembly.xml
 create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
 delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml

(limited to 'org.eclipse.jgit.packaging')

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/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
new file mode 100644
index 0000000000..dd20b56a7a
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <description url="JGit">
+      This is a pure Java implementation of the Git version control system. The native Git version is also required in this version.
+   </description>
+   <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>
+   <feature url="features/org.eclipse.jgit.junit_0.0.0.qualifier.jar" id="org.eclipse.jgit.junit" version="0.0.0" patch="true">
+      <category name="JGit"/>
+   </feature>
+   <category-def name="JGit" label="JGit">
+      <description>
+         JGit
+      </description>
+   </category-def>
+</site>
+
+
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>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml
deleted file mode 100644
index dd20b56a7a..0000000000
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/site.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <description url="JGit">
-      This is a pure Java implementation of the Git version control system. The native Git version is also required in this version.
-   </description>
-   <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>
-   <feature url="features/org.eclipse.jgit.junit_0.0.0.qualifier.jar" id="org.eclipse.jgit.junit" version="0.0.0" patch="true">
-      <category name="JGit"/>
-   </feature>
-   <category-def name="JGit" label="JGit">
-      <description>
-         JGit
-      </description>
-   </category-def>
-</site>
-
-
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index d3a9563077..c23dd96db1 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/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>
-- 
cgit v1.2.3