Browse Source

Update tycho version to 0.14.1

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>
stable-2.0
Matthias Sohn 13 years ago
parent
commit
43543e79a4
  1. 5
      org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml
  2. 5
      org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml
  3. 0
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.gitignore
  4. 6
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.project
  5. 0
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.resources.prefs
  6. 0
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.runtime.prefs
  7. 0
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs
  8. 0
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.team.ui.prefs
  9. 2
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
  10. 33
      org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
  11. 5
      org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml
  12. 15
      org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml
  13. 60
      org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html
  14. 12
      org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css
  15. 214
      org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl
  16. 6
      org.eclipse.jgit.packaging/pom.xml

5
org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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. and other copyright owners as documented in the project's IP log.
This program and the accompanying materials are made available This program and the accompanying materials are made available
@ -53,7 +53,8 @@
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.eclipse.jgit.feature</artifactId> <groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>
<name>JGit Feature</name> <name>JGit Feature</name>

5
org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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. and other copyright owners as documented in the project's IP log.
This program and the accompanying materials are made available This program and the accompanying materials are made available
@ -53,7 +53,8 @@
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.eclipse.jgit.junit.feature</artifactId> <groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit.junit</artifactId>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>
<name>JGit JUnit Feature</name> <name>JGit JUnit Feature</name>

0
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.gitignore → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.gitignore vendored

6
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.project → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.project

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>org.eclipse.jgit.updatesite</name> <name>org.eclipse.jgit.repository</name>
<comment></comment> <comment>JGit P2 Repository</comment>
<projects> <projects>
<project>org.eclipse.jgit</project>
<project>org.eclipse.jgit.feature</project>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>

0
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.resources.prefs → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.resources.prefs

0
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.core.runtime.prefs → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.core.runtime.prefs

0
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.tasks.ui.prefs → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.tasks.ui.prefs

0
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/.settings/org.eclipse.mylyn.team.ui.prefs → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/.settings/org.eclipse.mylyn.team.ui.prefs

2
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/site.xml → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml

@ -18,3 +18,5 @@
</description> </description>
</category-def> </category-def>
</site> </site>

33
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/pom.xml → org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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. and other copyright owners as documented in the project's IP log.
This program and the accompanying materials are made available This program and the accompanying materials are made available
@ -53,10 +53,10 @@
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.eclipse.jgit.updatesite</artifactId> <artifactId>org.eclipse.jgit.repository</artifactId>
<packaging>eclipse-update-site</packaging> <packaging>eclipse-repository</packaging>
<name>Eclipse JGit Plugin Update Site</name> <name>JGit P2 Repository</name>
<dependencies> <dependencies>
<dependency> <dependency>
@ -80,29 +80,4 @@
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </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> </project>

5
org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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. and other copyright owners as documented in the project's IP log.
This program and the accompanying materials are made available This program and the accompanying materials are made available
@ -53,7 +53,8 @@
<version>2.0.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
</parent> </parent>
<artifactId>org.eclipse.jgit.source.feature</artifactId> <groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit.source</artifactId>
<packaging>eclipse-feature</packaging> <packaging>eclipse-feature</packaging>
<name>JGit Source Feature</name> <name>JGit Source Feature</name>

15
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/assembly.xml

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

60
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/index.html

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

12
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.css

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

214
org.eclipse.jgit.packaging/org.eclipse.jgit.updatesite/web/site.xsl

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

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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. and other copyright owners as documented in the project's IP log.
This program and the accompanying materials are made available This program and the accompanying materials are made available
@ -59,7 +59,7 @@
<name>JGit Tycho Parent</name> <name>JGit Tycho Parent</name>
<properties> <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> <eclipse-site>http://download.eclipse.org/releases/indigo</eclipse-site>
</properties> </properties>
@ -67,7 +67,7 @@
<module>org.eclipse.jgit.feature</module> <module>org.eclipse.jgit.feature</module>
<module>org.eclipse.jgit.source.feature</module> <module>org.eclipse.jgit.source.feature</module>
<module>org.eclipse.jgit.junit.feature</module> <module>org.eclipse.jgit.junit.feature</module>
<module>org.eclipse.jgit.updatesite</module> <module>org.eclipse.jgit.repository</module>
</modules> </modules>
<repositories> <repositories>

Loading…
Cancel
Save