Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2013-09-11 17:14:42 -0400
committerMatthias Sohn2013-09-11 17:30:05 -0400
commit4b8a848a477cc77caf8e74de6d28b3bcbcaed413 (patch)
treec4b7899a301a0ab46c3e73121b616481d3c29d9d
parent52ab578cd7180d114e01f5c3584424537e3440e3 (diff)
parent3af38b4fee78bd484bca8c8d795f7b199a6f1618 (diff)
downloadjgit-4b8a848a477cc77caf8e74de6d28b3bcbcaed413.tar.gz
jgit-4b8a848a477cc77caf8e74de6d28b3bcbcaed413.tar.xz
jgit-4b8a848a477cc77caf8e74de6d28b3bcbcaed413.zip
Merge branch 'stable-3.0'
* stable-3.0: Prepare post 3.0.2 builds JGit v3.0.2.201311090911-r Change-Id: I99a7d1072285646f7fcd4169225c1fd249ad5e37 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.jgit.http.test/pom.xml2
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml14
-rw-r--r--org.eclipse.jgit.pgm/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF1
-rw-r--r--org.eclipse.jgit.pgm/pom.xml5
-rw-r--r--org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF1
6 files changed, 25 insertions, 3 deletions
diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml
index e9c43480be..c24ef1c87f 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -126,7 +126,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Djava.io.tmpdir=${project.build.directory}</argLine>
+ <argLine>-Djava.io.tmpdir=${project.build.directory} -Xmx300m</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
index 14c95e299d..a97ec57194 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
@@ -45,10 +45,24 @@
unpack="false"/>
<plugin
+ id="org.apache.commons.compress"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.kohsuke.args4j"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="javaewah"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 714e0ca400..a6cf0f892f 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -6,7 +6,10 @@ Bundle-Version: 3.1.0.qualifier
Bundle-Vendor: %provider_name
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Import-Package: org.eclipse.jgit.api;version="[3.1.0,3.2.0)",
+Import-Package: org.apache.commons.compress.archivers;version="[1.3,2.0)",
+ org.apache.commons.compress.archivers.tar;version="[1.3,2.0)",
+ org.apache.commons.compress.archivers.zip;version="[1.3,2.0)",
+ org.eclipse.jgit.api;version="[3.1.0,3.2.0)",
org.eclipse.jgit.api.errors;version="[3.1.0,3.2.0)",
org.eclipse.jgit.archive;version="[3.1.0,3.2.0)",
org.eclipse.jgit.awtui;version="[3.1.0,3.2.0)",
diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index f55a1e67c3..82c2a26a3e 100644
--- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@ -6,3 +6,4 @@ Bundle-Vendor: Eclipse.org - JGit
Bundle-Version: 3.1.0.qualifier
Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="."
+
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index 80ee8ff4fe..ff80bebf0d 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -72,6 +72,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
<version>${project.version}</version>
diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 98667075f3..20968e8c76 100644
--- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@ -5,4 +5,3 @@ Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true
Bundle-Vendor: Eclipse.org - JGit
Bundle-Version: 3.1.0.qualifier
Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="."
-

Back to the top