github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Use build timestamp as OSGi version qualifier 

Translate the version qualifier using maven-antrun-plugin since we want
manifest-first and currently cannot rely on Tycho for the JGit build.

Introduce property for Eclipse p2 repository to enable builds against
other Eclipse versions.

Change-Id: I62c4e77ae91fe17f56c5a5338d53828d4e225395
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-0.7
Matthias Sohn 15 years ago
parent
86e0c1e036
commit
407fe631ae
7 changed files with 57 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      org.eclipse.jgit.console/pom.xml
  2. 7
      org.eclipse.jgit.http.server/pom.xml
  3. 7
      org.eclipse.jgit.junit/pom.xml
  4. 3
      org.eclipse.jgit.packaging/pom.xml
  5. 7
      org.eclipse.jgit.ui/pom.xml
  6. 7
      org.eclipse.jgit/pom.xml
  7. 25
      pom.xml

7
org.eclipse.jgit.console/pom.xml
Unescape View File

@ -2,6 +2,7 @@
<!-- <!--
Copyright (C) 2009, Google Inc. Copyright (C) 2009, Google Inc.
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com>
Copyright (C) 2010, 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
@ -61,6 +62,10 @@
Console based user interface Console based user interface
</description> </description>
<properties>
<translate-qualifier/>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
@ -86,7 +91,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifestFile>META-INF/MANIFEST.MF</manifestFile> <manifestFile>${bundle-manifest}</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>

7
org.eclipse.jgit.http.server/pom.xml
Unescape View File

@ -2,6 +2,7 @@
<!-- <!--
Copyright (C) 2009-2010, Google Inc. Copyright (C) 2009-2010, Google Inc.
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com>
Copyright (C) 2010, 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
@ -61,6 +62,10 @@
Git aware HTTP server implementation. Git aware HTTP server implementation.
</description> </description>
<properties>
<translate-qualifier/>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
@ -92,7 +97,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifestFile>META-INF/MANIFEST.MF</manifestFile> <manifestFile>${bundle-manifest}</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>

7
org.eclipse.jgit.junit/pom.xml
Unescape View File

@ -2,6 +2,7 @@
<!-- <!--
Copyright (C) 2009, Google Inc. Copyright (C) 2009, Google Inc.
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com>
Copyright (C) 2010, 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
@ -61,6 +62,10 @@
Utility classes to support JUnit testing of JGit applications. Utility classes to support JUnit testing of JGit applications.
</description> </description>
<properties>
<translate-qualifier/>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
@ -92,7 +97,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifestFile>META-INF/MANIFEST.MF</manifestFile> <manifestFile>${bundle-manifest}</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>

3
org.eclipse.jgit.packaging/pom.xml
Unescape View File

@ -60,6 +60,7 @@
<properties> <properties>
<tycho-version>0.6.0</tycho-version> <tycho-version>0.6.0</tycho-version>
<eclipse-site>http://download.eclipse.org/releases/galileo</eclipse-site>
</properties> </properties>
<modules> <modules>
@ -71,7 +72,7 @@
<repository> <repository>
<id>galileo</id> <id>galileo</id>
<layout>p2</layout> <layout>p2</layout>
<url>http://download.eclipse.org/releases/galileo</url> <url>${eclipse-site}</url>
</repository> </repository>
</repositories> </repositories>

7
org.eclipse.jgit.ui/pom.xml
Unescape View File

@ -2,6 +2,7 @@
<!-- <!--
Copyright (C) 2009, Google Inc. Copyright (C) 2009, Google Inc.
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com>
Copyright (C) 2010, 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
@ -61,6 +62,10 @@
AWT/Swing based UI AWT/Swing based UI
</description> </description>
<properties>
<translate-qualifier/>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
@ -86,7 +91,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifestFile>META-INF/MANIFEST.MF</manifestFile> <manifestFile>${bundle-manifest}</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>

7
org.eclipse.jgit/pom.xml
Unescape View File

@ -3,6 +3,7 @@
Copyright (C) 2009, Google Inc. Copyright (C) 2009, Google Inc.
Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com> Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com> Copyright (C) 2008, Imran M Yousuf <imyousuf@smartitengineering.com>
Copyright (C) 2010, 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
@ -62,6 +63,10 @@
Repository access and algorithms Repository access and algorithms
</description> </description>
<properties>
<translate-qualifier/>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
@ -86,7 +91,7 @@
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifestFile>META-INF/MANIFEST.MF</manifestFile> <manifestFile>${bundle-manifest}</manifestFile>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>

25
pom.xml
Unescape View File

@ -127,6 +127,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>
<bundle-manifest>${project.build.directory}/META-INF/MANIFEST.MF</bundle-manifest>
<jsch-CQ>CQ 3493</jsch-CQ> <jsch-CQ>CQ 3493</jsch-CQ>
<jsch-version>0.1.41</jsch-version> <jsch-version>0.1.41</jsch-version>
@ -207,6 +210,28 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>translate-qualifier</id>
<phase>generate-resources</phase>
<configuration>
<tasks unless="${translate-qualifier}">
<copy file="META-INF/MANIFEST.MF" tofile="${bundle-manifest}" overwrite="true"/>
<replace file="${bundle-manifest}">
<replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
</replace>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>

Write Preview
Loading…
Cancel
Save