]> source.dussan.org Git - jgit.git/commitdiff
Update tycho version to 0.14.1 96/5596/2
authorMatthias Sohn <matthias.sohn@sap.com>
Mon, 16 Apr 2012 15:40:43 +0000 (17:40 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Wed, 9 May 2012 22:48:59 +0000 (00:48 +0200)
Tycho 0.14.1 enforces that artifactId and feature/bundle SymbolicName
must match, hence follow recommended migration practice and change
groupId of feature projects in order not to change the feature names as
this would require a feature migration.

Also migrate the p2 repository build from the deprecated packaging type
eclipse-update-site to packaging type eclipse-repository.

Change-Id: I99fc6c2bbb20efbd6514bdd9940f3535707c21bc
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
24 files changed:
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.gitignore [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.project [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.resources.prefs [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.runtime.prefs [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.team.ui.prefs [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml [new file with mode: 0644]
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.team.ui.prefs [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css [deleted file]
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl [deleted file]
org.eclipse.jgit.packaging/pom.xml

index 79cda56222e8db68c5da8254f8bfbb690740d520..f6a1bbe9bb4c42b3686e67b23bad3f1ccc1ac782 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (C) 2009-2010, Matthias Sohn <matthias.sohn@sap.com>
+   Copyright (C) 2009-2012, Matthias Sohn <matthias.sohn@sap.com>
    and other copyright owners as documented in the project's IP log.
 
    This program and the accompanying materials are made available
@@ -53,7 +53,8 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.jgit.feature</artifactId>
+  <groupId>org.eclipse.jgit.feature</groupId>
+  <artifactId>org.eclipse.jgit</artifactId>
   <packaging>eclipse-feature</packaging>
 
   <name>JGit Feature</name>
index 2ed5f9accdac0d7dc7ea60ef5d30994037937022..b811608a2e1ba9b4a22d4bd93f0bdf9d7df88bd9 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (C) 2010, Matthias Sohn <matthias.sohn@sap.com>
+   Copyright (C) 2010-2012, Matthias Sohn <matthias.sohn@sap.com>
    and other copyright owners as documented in the project's IP log.
 
    This program and the accompanying materials are made available
@@ -53,7 +53,8 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.jgit.junit.feature</artifactId>
+  <groupId>org.eclipse.jgit.feature</groupId>
+  <artifactId>org.eclipse.jgit.junit</artifactId>
   <packaging>eclipse-feature</packaging>
 
   <name>JGit JUnit Feature</name>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.gitignore b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.gitignore
new file mode 100644 (file)
index 0000000..2f7896d
--- /dev/null
@@ -0,0 +1 @@
+target/
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.project b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.project
new file mode 100644 (file)
index 0000000..2c3c4fd
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.eclipse.jgit.repository</name>
+       <comment>JGit P2 Repository</comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.UpdateSiteBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.UpdateSiteNature</nature>
+       </natures>
+</projectDescription>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..4ec836b
--- /dev/null
@@ -0,0 +1,3 @@
+#Mon Aug 11 16:46:54 PDT 2008
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.runtime.prefs
new file mode 100644 (file)
index 0000000..4f21775
--- /dev/null
@@ -0,0 +1,3 @@
+#Mon Mar 24 18:55:44 EDT 2008
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs
new file mode 100644 (file)
index 0000000..823c0f5
--- /dev/null
@@ -0,0 +1,4 @@
+#Tue Jul 19 20:11:28 CEST 2011
+eclipse.preferences.version=1
+project.repository.kind=bugzilla
+project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.team.ui.prefs
new file mode 100644 (file)
index 0000000..0cba949
--- /dev/null
@@ -0,0 +1,3 @@
+#Tue Jul 19 20:11:28 CEST 2011
+commit.comment.template=${task.description} \n\nBug\: ${task.key}
+eclipse.preferences.version=1
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 (file)
index 0000000..dd20b56
--- /dev/null
@@ -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
new file mode 100644 (file)
index 0000000..0cf09dd
--- /dev/null
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (C) 2009-2012, Matthias Sohn <matthias.sohn@sap.com>
+   and other copyright owners as documented in the project's IP log.
+
+   This program and the accompanying materials are made available
+   under the terms of the Eclipse Distribution License v1.0 which
+   accompanies this distribution, is reproduced below, and is
+   available at http://www.eclipse.org/org/documents/edl-v10.php
+
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or
+   without modification, are permitted provided that the following
+   conditions are met:
+
+   - Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above
+     copyright notice, this list of conditions and the following
+     disclaimer in the documentation and/or other materials provided
+     with the distribution.
+
+   - Neither the name of the Eclipse Foundation, Inc. nor the
+     names of its contributors may be used to endorse or promote
+     products derived from this software without specific prior
+     written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+   CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse.jgit</groupId>
+    <artifactId>jgit.tycho.parent</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.eclipse.jgit.repository</artifactId>
+  <packaging>eclipse-repository</packaging>
+
+  <name>JGit P2 Repository</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit.junit</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit.junit.http</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jgit</groupId>
+      <artifactId>org.eclipse.jgit.http.server</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+</project>
index c3d044e723e8f2da9df09df2c35f7fc091a033c2..0fb43c7d5cebf04eb1d074fe573525b7c33a14b2 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (C) 2009-2010, Matthias Sohn <matthias.sohn@sap.com>
+   Copyright (C) 2009-2012, Matthias Sohn <matthias.sohn@sap.com>
    and other copyright owners as documented in the project's IP log.
 
    This program and the accompanying materials are made available
@@ -53,7 +53,8 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.eclipse.jgit.source.feature</artifactId>
+  <groupId>org.eclipse.jgit.feature</groupId>
+  <artifactId>org.eclipse.jgit.source</artifactId>
   <packaging>eclipse-feature</packaging>
 
   <name>JGit Source Feature</name>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore
deleted file mode 100644 (file)
index 2f7896d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-target/
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project
deleted file mode 100644 (file)
index be21ac0..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-       <name>org.eclipse.jgit.updatesite</name>
-       <comment></comment>
-       <projects>
-               <project>org.eclipse.jgit</project>
-               <project>org.eclipse.jgit.feature</project>
-       </projects>
-       <buildSpec>
-               <buildCommand>
-                       <name>org.eclipse.pde.UpdateSiteBuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>
-       </buildSpec>
-       <natures>
-               <nature>org.eclipse.pde.UpdateSiteNature</nature>
-       </natures>
-</projectDescription>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644 (file)
index 4ec836b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Aug 11 16:46:54 PDT 2008
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644 (file)
index 4f21775..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Mar 24 18:55:44 EDT 2008
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs
deleted file mode 100644 (file)
index 823c0f5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Jul 19 20:11:28 CEST 2011
-eclipse.preferences.version=1
-project.repository.kind=bugzilla
-project.repository.url=https\://bugs.eclipse.org/bugs
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.team.ui.prefs
deleted file mode 100644 (file)
index 0cba949..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Jul 19 20:11:28 CEST 2011
-commit.comment.template=${task.description} \n\nBug\: ${task.key}
-eclipse.preferences.version=1
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml
deleted file mode 100644 (file)
index 0d258f7..0000000
+++ /dev/null
@@ -1,15 +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>
-
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html
deleted file mode 100644 (file)
index 9872ba6..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<title>org.eclipse.jgit.updatesite</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
-       var returnval = 0;
-       var stylesheet, xmlFile, cache, doc;
-       function init(){
-               // NSCP 7.1+ / Mozilla 1.4.1+ / Safari
-               // Use the standard DOM Level 2 technique, if it is supported
-               if (document.implementation && document.implementation.createDocument) {
-                       xmlFile = document.implementation.createDocument("", "", null);
-                       stylesheet = document.implementation.createDocument("", "", null);
-                       if (xmlFile.load){
-                               xmlFile.load("site.xml");
-                               stylesheet.load("web/site.xsl");
-                       } else {
-                               alert("Document could not be loaded by browser.");
-                       }
-                       xmlFile.addEventListener("load", transform, false);
-                       stylesheet.addEventListener("load", transform, false);
-               }
-               //IE 6.0+ solution
-               else if (window.ActiveXObject) {
-                       xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-                       xmlFile.async = false;
-                       xmlFile.load("site.xml");
-                       stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-                       stylesheet.async = false;
-                       stylesheet.load("web/site.xsl");
-                       cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-                       cache.stylesheet = stylesheet;
-                       transformData();
-               }
-       }
-       // separate transformation function for IE 6.0+
-       function transformData(){
-               var processor = cache.createProcessor();
-               processor.input = xmlFile;
-               processor.transform();
-               data.innerHTML = processor.output;
-       }
-       // separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+
-       function transform(){
-               returnval+=1;
-               if (returnval==2){
-                       var processor = new XSLTProcessor();
-                       processor.importStylesheet(stylesheet);
-                       doc = processor.transformToDocument(xmlFile);
-                       document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
-               }
-       }
-</script>
-</head>
-<body onload="init();">
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml
deleted file mode 100644 (file)
index 0e02dea..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright (C) 2009-2010, Matthias Sohn <matthias.sohn@sap.com>
-   and other copyright owners as documented in the project's IP log.
-
-   This program and the accompanying materials are made available
-   under the terms of the Eclipse Distribution License v1.0 which
-   accompanies this distribution, is reproduced below, and is
-   available at http://www.eclipse.org/org/documents/edl-v10.php
-
-   All rights reserved.
-
-   Redistribution and use in source and binary forms, with or
-   without modification, are permitted provided that the following
-   conditions are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following
-     disclaimer in the documentation and/or other materials provided
-     with the distribution.
-
-   - Neither the name of the Eclipse Foundation, Inc. nor the
-     names of its contributors may be used to endorse or promote
-     products derived from this software without specific prior
-     written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-   CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-   OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-   NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse.jgit</groupId>
-    <artifactId>jgit.tycho.parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.jgit.updatesite</artifactId>
-  <packaging>eclipse-update-site</packaging>
-
-  <name>Eclipse JGit Plugin Update Site</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit.junit</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit.junit.http</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jgit</groupId>
-      <artifactId>org.eclipse.jgit.http.server</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-4</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.updatesite/site.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml
deleted file mode 100644 (file)
index 7fdef57..0000000
+++ /dev/null
@@ -1,20 +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/org.eclipse.jgit.updatesite/web/site.css b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css
deleted file mode 100644 (file)
index 62c6f9f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
-.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
-.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
-.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
-.light-row {background:#FFFFFF}
-.dark-row {background:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl b/org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl
deleted file mode 100644 (file)
index 7620ffa..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-       <html>
-       <head>
-       <title>org.eclipse.jgit.updatesite</title>
-       <style>@import url("web/site.css");</style>
-       </head>
-       <body>
-       <h1 class="title">org.eclipse.jgit.updatesite</h1>
-       <p class="bodyText"><xsl:value-of select="description"/></p>
-       <table width="100%" border="0" cellspacing="1" cellpadding="2">
-       <xsl:for-each select="category-def">
-               <xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-               <xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-       <xsl:if test="count(key('cat',@name)) != 0">
-                       <tr class="header">
-                               <td class="sub-header" width="30%">
-                                       <xsl:value-of select="@name"/>
-                               </td>
-                               <td class="sub-header" width="70%">
-                                       <xsl:value-of select="@label"/>
-                               </td>
-                       </tr>
-                       <xsl:for-each select="key('cat',@name)">
-                       <xsl:sort select="ancestor::feature//@version" order="ascending"/>
-                       <xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-                       <tr>
-                               <xsl:choose>
-                               <xsl:when test="(position() mod 2 = 1)">
-                                       <xsl:attribute name="class">dark-row</xsl:attribute>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:attribute name="class">light-row</xsl:attribute>
-                               </xsl:otherwise>
-                               </xsl:choose>
-                               <td class="log-text" id="indent">
-                                               <xsl:choose>
-                                               <xsl:when test="ancestor::feature//@label">
-                                                       <a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-                                                       <br/>
-                                                       <div id="indent">
-                                                       (<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-                                                       </div>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                               <a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-                                               </xsl:otherwise>
-                                               </xsl:choose>
-                                               <br />
-                               </td>
-                               <td>
-                                       <table>
-                                               <xsl:if test="ancestor::feature//@os">
-                                                       <tr><td class="log-text" id="indent">Operating Systems:</td>
-                                                       <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-                                                       </tr>
-                                               </xsl:if>
-                                               <xsl:if test="ancestor::feature//@ws">
-                                                       <tr><td class="log-text" id="indent">Windows Systems:</td>
-                                                       <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-                                                       </tr>
-                                               </xsl:if>
-                                               <xsl:if test="ancestor::feature//@nl">
-                                                       <tr><td class="log-text" id="indent">Languages:</td>
-                                                       <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-                                                       </tr>
-                                               </xsl:if>
-                                               <xsl:if test="ancestor::feature//@arch">
-                                                       <tr><td class="log-text" id="indent">Architecture:</td>
-                                                       <td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-                                                       </tr>
-                                               </xsl:if>
-                                       </table>
-                               </td>
-                       </tr>
-                       </xsl:for-each>
-                       <tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-               </xsl:if>
-       </xsl:for-each>
-       <xsl:if test="count(feature)  &gt; count(feature/category)">
-       <tr class="header">
-               <td class="sub-header" colspan="2">
-               Uncategorized
-               </td>
-       </tr>
-       </xsl:if>
-       <xsl:choose>
-       <xsl:when test="function-available('msxsl:node-set')">
-          <xsl:variable name="rtf-nodes">
-               <xsl:for-each select="feature[not(category)]">
-                       <xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-                       <xsl:sort select="@version" order="ascending" />
-                       <xsl:value-of select="."/>
-                       <xsl:copy-of select="." />
-               </xsl:for-each>
-          </xsl:variable>
-          <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-       <xsl:for-each select="$myNodeSet">
-       <tr>
-               <xsl:choose>
-               <xsl:when test="position() mod 2 = 1">
-               <xsl:attribute name="class">dark-row</xsl:attribute>
-               </xsl:when>
-               <xsl:otherwise>
-               <xsl:attribute name="class">light-row</xsl:attribute>
-               </xsl:otherwise>
-               </xsl:choose>
-               <td class="log-text" id="indent">
-                       <xsl:choose>
-                       <xsl:when test="@label">
-                               <a href="{@url}"><xsl:value-of select="@label"/></a>
-                               <br />
-                               <div id="indent">
-                               (<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-                               </div>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-                       </xsl:otherwise>
-                       </xsl:choose>
-                       <br /><br />
-               </td>
-               <td>
-                       <table>
-                               <xsl:if test="@os">
-                                       <tr><td class="log-text" id="indent">Operating Systems:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-                                       </tr>
-                               </xsl:if>
-                               <xsl:if test="@ws">
-                                       <tr><td class="log-text" id="indent">Windows Systems:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-                                       </tr>
-                               </xsl:if>
-                               <xsl:if test="@nl">
-                                       <tr><td class="log-text" id="indent">Languages:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-                                       </tr>
-                               </xsl:if>
-                               <xsl:if test="@arch">
-                                       <tr><td class="log-text" id="indent">Architecture:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-                                       </tr>
-                               </xsl:if>
-                       </table>
-               </td>
-       </tr>
-       </xsl:for-each>
-       </xsl:when>
-       <xsl:otherwise>
-       <xsl:for-each select="feature[not(category)]">
-       <xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-       <xsl:sort select="@version" order="ascending" />
-       <tr>
-               <xsl:choose>
-               <xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-               <xsl:attribute name="class">dark-row</xsl:attribute>
-               </xsl:when>
-               <xsl:otherwise>
-               <xsl:attribute name="class">light-row</xsl:attribute>
-               </xsl:otherwise>
-               </xsl:choose>
-               <td class="log-text" id="indent">
-                       <xsl:choose>
-                       <xsl:when test="@label">
-                               <a href="{@url}"><xsl:value-of select="@label"/></a>
-                               <br />
-                               <div id="indent">
-                               (<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-                               </div>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-                       </xsl:otherwise>
-                       </xsl:choose>
-                       <br /><br />
-               </td>
-               <td>
-                       <table>
-                               <xsl:if test="@os">
-                                       <tr><td class="log-text" id="indent">Operating Systems:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-                                       </tr>
-                               </xsl:if>
-                               <xsl:if test="@ws">
-                                       <tr><td class="log-text" id="indent">Windows Systems:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-                                       </tr>
-                               </xsl:if>
-                               <xsl:if test="@nl">
-                                       <tr><td class="log-text" id="indent">Languages:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-                                       </tr>
-                               </xsl:if>
-                               <xsl:if test="@arch">
-                                       <tr><td class="log-text" id="indent">Architecture:</td>
-                                       <td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-                                       </tr>
-                               </xsl:if>
-                       </table>
-               </td>
-       </tr>
-       </xsl:for-each>
-       </xsl:otherwise>
-       </xsl:choose>
-       </table>
-       </body>
-       </html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
index 76bd53a00d65616465f389e134b0ce15c35ba5f9..3fb354e915634deff56df2456e099481bf8c775a 100644 (file)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-   Copyright (C) 2009-2011, Matthias Sohn <matthias.sohn@sap.com>
+   Copyright (C) 2009-2012, Matthias Sohn <matthias.sohn@sap.com>
    and other copyright owners as documented in the project's IP log.
 
    This program and the accompanying materials are made available
@@ -59,7 +59,7 @@
   <name>JGit Tycho Parent</name>
 
   <properties>
-    <tycho-version>0.12.0</tycho-version>
+    <tycho-version>0.14.1</tycho-version>
     <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
   </properties>
 
@@ -67,7 +67,7 @@
     <module>org.eclipse.jgit.feature</module>
     <module>org.eclipse.jgit.source.feature</module>
     <module>org.eclipse.jgit.junit.feature</module>
-    <module>org.eclipse.jgit.updatesite</module>
+    <module>org.eclipse.jgit.repository</module>
   </modules>
 
   <repositories>