summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging/org.eclipse.jgit.repository
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2013-03-12 00:40:34 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2013-05-04 02:04:52 +0200
commite1c489530adba833e660306e578f10d8e2209d67 (patch)
treec3c9a78d4440795925d019007e54ce8fa6e8bf4d /org.eclipse.jgit.packaging/org.eclipse.jgit.repository
parentdd3181603e0a42c46299c25cede66fdbd67da518 (diff)
downloadjgit-e1c489530adba833e660306e578f10d8e2209d67.tar.gz
jgit-e1c489530adba833e660306e578f10d8e2209d67.zip
Add optional feature to install Java 7 support
Change-Id: I15cfd91857830d69abbe729be3e237fc9cd4fca0 Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.repository')
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml5
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml22
2 files changed, 8 insertions, 19 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
index af9ce1abbf..546793e7b0 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
@@ -18,11 +18,12 @@
<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>
+ <feature url="features/org.eclipse.jgit.java7_0.0.0.qualifier.jar" id="org.eclipse.jgit.java7" 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 94914b0ccb..9df3ab05e2 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -58,29 +58,17 @@
<name>JGit P2 Repository</name>
- <profiles>
- <profile>
- <id>jgit.java7</id>
- <activation>
- <jdk>1.7</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.java7</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
<dependencies>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.java7</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>