summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging/org.eclipse.jgit.repository
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2015-03-12 19:30:37 -0700
committerChristian Halstrick <christian.halstrick@sap.com>2015-03-23 14:23:07 +0100
commit197e3393a51424fae45e51dce4a649ba26e5a368 (patch)
treef372aafc8cdd3b52aa41688fa3a07e3581ac4d51 /org.eclipse.jgit.packaging/org.eclipse.jgit.repository
parent8ec01500e2eb8860e9e42dd20ead265cc2fb6735 (diff)
downloadjgit-197e3393a51424fae45e51dce4a649ba26e5a368.tar.gz
jgit-197e3393a51424fae45e51dce4a649ba26e5a368.zip
Merge bundle org.eclipse.jgit.java7 into org.eclipse.jgit
As we moved minimum Java version to 7 we don't need a separate bundle and feature for JGit features depending on Java 7 anymore. Change-Id: Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 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.xml3
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml5
2 files changed, 0 insertions, 8 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 b1c81648b9..2186ad9825 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml
@@ -18,9 +18,6 @@
<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>
<feature url="features/org.eclipse.jgit.http.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.http.apache" version="0.0.0" patch="true">
<category name="JGit"/>
</feature>
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 f2aa7af61a..80125f3042 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
@@ -69,11 +69,6 @@
<artifactId>org.eclipse.jgit.http.apache</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>