Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2015-03-15 22:51:23 +0000
committerChristian Halstrick2015-03-23 13:28:20 +0000
commit2b3932abc3017010e5c31789de49d2564a776c10 (patch)
treee80a8092e75e390e35878767e0e18b451e284ef1
parent4e029c3ab5822ff657c4cf1f16c02ffc961328aa (diff)
downloadegit-2b3932abc3017010e5c31789de49d2564a776c10.tar.gz
egit-2b3932abc3017010e5c31789de49d2564a776c10.tar.xz
egit-2b3932abc3017010e5c31789de49d2564a776c10.zip
Adapt to org.eclipse.jgit.java7 being merged into org.eclipse.jgit
Adapt the EGit build to change Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 which merges the bundle org.eclipse.jgit.java7 into the bundle org.eclipse.jgit. JGit-Dependency: Ib5da61b0886ddbdea65298f1e8c6d65c9879ced1 Change-Id: I5d06588e4f815c3bfd26d7f33c36eed0c62352f1 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.core.test/build.properties1
-rw-r--r--org.eclipse.egit.core.test/pom.xml9
-rw-r--r--org.eclipse.egit.mylyn.ui.test/build.properties1
-rw-r--r--org.eclipse.egit.mylyn.ui.test/pom.xml5
-rw-r--r--org.eclipse.egit.repository/category.xml3
-rw-r--r--org.eclipse.egit.ui.test/build.properties1
-rw-r--r--org.eclipse.egit.ui.test/pom.xml5
7 files changed, 0 insertions, 25 deletions
diff --git a/org.eclipse.egit.core.test/build.properties b/org.eclipse.egit.core.test/build.properties
index e3ad4f4656..e3023e14e9 100644
--- a/org.eclipse.egit.core.test/build.properties
+++ b/org.eclipse.egit.core.test/build.properties
@@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
fragment.xml
-extra.. = platform:/fragment/org.eclipse.jgit.java7
diff --git a/org.eclipse.egit.core.test/pom.xml b/org.eclipse.egit.core.test/pom.xml
index 983f7d0031..7f87167a16 100644
--- a/org.eclipse.egit.core.test/pom.xml
+++ b/org.eclipse.egit.core.test/pom.xml
@@ -42,15 +42,6 @@
<argLine>${test.vmparams} ${coretest.vmparams}</argLine>
<useUIHarness>false</useUIHarness>
<useUIThread>false</useUIThread>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.jgit.java7</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
</configuration>
</plugin>
</plugins>
diff --git a/org.eclipse.egit.mylyn.ui.test/build.properties b/org.eclipse.egit.mylyn.ui.test/build.properties
index 69abd4d9f7..34d2e4d2da 100644
--- a/org.eclipse.egit.mylyn.ui.test/build.properties
+++ b/org.eclipse.egit.mylyn.ui.test/build.properties
@@ -2,4 +2,3 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
-extra.. = platform:/fragment/org.eclipse.jgit.java7
diff --git a/org.eclipse.egit.mylyn.ui.test/pom.xml b/org.eclipse.egit.mylyn.ui.test/pom.xml
index f77b8c88dd..b648241b3a 100644
--- a/org.eclipse.egit.mylyn.ui.test/pom.xml
+++ b/org.eclipse.egit.mylyn.ui.test/pom.xml
@@ -78,11 +78,6 @@
</requirement>
<requirement>
<type>eclipse-feature</type>
- <id>org.eclipse.jgit.java7</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
<id>org.eclipse.egit</id>
<versionRange>0.0.0</versionRange>
</requirement>
diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
index c7f4e2bb84..0b312848bf 100644
--- a/org.eclipse.egit.repository/category.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -24,9 +24,6 @@
<feature url="features/org.eclipse.jgit.pgm.source_0.0.0.qualifier.jar" id="org.eclipse.jgit.pgm.source" version="0.0.0" patch="true">
<category name="JGit"/>
</feature>
- <feature url="features/org.eclipse.jgit.java7_0.0.0.jar" id="org.eclipse.jgit.java7" version="0.0.0">
- <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">
<category name="JGit"/>
</feature>
diff --git a/org.eclipse.egit.ui.test/build.properties b/org.eclipse.egit.ui.test/build.properties
index e3ad4f4656..e3023e14e9 100644
--- a/org.eclipse.egit.ui.test/build.properties
+++ b/org.eclipse.egit.ui.test/build.properties
@@ -3,4 +3,3 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
fragment.xml
-extra.. = platform:/fragment/org.eclipse.jgit.java7
diff --git a/org.eclipse.egit.ui.test/pom.xml b/org.eclipse.egit.ui.test/pom.xml
index 3a68a2901c..2afc1b8bf8 100644
--- a/org.eclipse.egit.ui.test/pom.xml
+++ b/org.eclipse.egit.ui.test/pom.xml
@@ -82,11 +82,6 @@
</requirement>
<requirement>
<type>eclipse-feature</type>
- <id>org.eclipse.jgit.java7</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
<id>org.eclipse.egit</id>
<versionRange>0.0.0</versionRange>
</requirement>

Back to the top