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>

diff --cc org.eclipse.jgit.http.test/pom.xml
index e9c43480bee45bacdd7bed37987a9653c6bd044c,cdecdc6c98f2ea009e1eb2599d159e2169217b05..c24ef1c87f3af9b27aeed82bf1ea3e66e59a199e
--- 1/org.eclipse.jgit.http.test/pom.xml
--- 2/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@@ -126,7 -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 --cc org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml
Simple merge

diff --cc org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 714e0ca400f9cb0526a3b0bf16265dfa31c05fad,745351b08e6364e4c7bd98f739c2f29c9c39ac36..a6cf0f892f0238de5205fbe240f38ba8f4d5e449
--- 1/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@@ -6,31 -6,33 +6,34 @@@ Bundle-Version: 3.1.0.qualifie
  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.0.3,3.1.0)",
 - org.eclipse.jgit.api.errors;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.awtui;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.blame;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.diff;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.dircache;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.errors;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.internal.storage.file;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.internal.storage.pack;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.lib;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.merge;version="3.0.3",
 - org.eclipse.jgit.nls;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.notes;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.revplot;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.revwalk;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.revwalk.filter;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.storage.file;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.storage.pack;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.transport;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.transport.resolver;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.treewalk;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.treewalk.filter;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.util;version="[3.0.3,3.1.0)",
 - org.eclipse.jgit.util.io;version="[3.0.3,3.1.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)",
 + org.eclipse.jgit.blame;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.diff;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.dircache;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.errors;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.internal.storage.file;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.internal.storage.pack;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.lib;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.merge;version="3.1.0",
 + org.eclipse.jgit.nls;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.notes;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.revplot;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.revwalk;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.revwalk.filter;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.storage.file;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.storage.pack;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.transport;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.transport.resolver;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.treewalk;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.treewalk.filter;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.util;version="[3.1.0,3.2.0)",
 + org.eclipse.jgit.util.io;version="[3.1.0,3.2.0)",
   org.kohsuke.args4j;version="[2.0.12,2.1.0)",
   org.kohsuke.args4j.spi;version="[2.0.12,2.1.0)"
  Bundle-ActivationPolicy: lazy

diff --cc org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
index f55a1e67c364fe602f26252620c6cafbf19500e3,b82bd40d586824d54151d4ac3e622a23df45d8b7..82c2a26a3ee4ea4caefd855f89fd9ab9c20901d0
--- 1/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
--- 2/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF
@@@ -3,6 -3,6 +3,7 @@@ Bundle-ManifestVersion: 
  Bundle-Name: org.eclipse.jgit.pgm - Sources
  Bundle-SymbolicName: org.eclipse.jgit.pgm.source;singleton:=true
  Bundle-Vendor: Eclipse.org - JGit
 -Bundle-Version: 3.0.3.qualifier
 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.0.3";roots="."
 +Bundle-Version: 3.1.0.qualifier
 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="."
 +
+ 

diff --cc org.eclipse.jgit.pgm/pom.xml
index 80ee8ff4fe13bc5d8717c3dab6fa4025d87e728e,e9653ab8b1c7d61bcc13f3a3c4b0b7ecc9c28885..ff80bebf0dd8d181b77134003cc727ff5e8293e2
--- 1/org.eclipse.jgit.pgm/pom.xml
--- 2/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@@ -71,12 -71,11 +71,17 @@@
        <artifactId>args4j</artifactId>
      </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>
 +    </dependency>
 +
      <dependency>
        <groupId>org.eclipse.jgit</groupId>
        <artifactId>org.eclipse.jgit</artifactId>

diff --cc org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
index 98667075f3a5d01f29a5c3c158e8acb4a54af077,2907b3a7eb51f876e987c896315b611c9fbbe864..20968e8c7682afedbb226e965ccbe7a1f18407e5
--- 1/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
--- 2/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF
@@@ -3,6 -3,6 +3,5 @@@ Bundle-ManifestVersion: 
  Bundle-Name: org.eclipse.jgit - Sources
  Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true
  Bundle-Vendor: Eclipse.org - JGit
 -Bundle-Version: 3.0.3.qualifier
 -Eclipse-SourceBundle: org.eclipse.jgit;version="3.0.3";roots="."
 -
 +Bundle-Version: 3.1.0.qualifier
 +Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="."
-