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>
This commit is contained in:
commit
4b8a848a47
|
@ -126,7 +126,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<argLine>-Djava.io.tmpdir=${project.build.directory}</argLine>
|
<argLine>-Djava.io.tmpdir=${project.build.directory} -Xmx300m</argLine>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
|
@ -44,6 +44,13 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="org.apache.commons.compress"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
<plugin
|
<plugin
|
||||||
id="org.kohsuke.args4j"
|
id="org.kohsuke.args4j"
|
||||||
download-size="0"
|
download-size="0"
|
||||||
|
@ -51,4 +58,11 @@
|
||||||
version="0.0.0"
|
version="0.0.0"
|
||||||
unpack="false"/>
|
unpack="false"/>
|
||||||
|
|
||||||
|
<plugin
|
||||||
|
id="javaewah"
|
||||||
|
download-size="0"
|
||||||
|
install-size="0"
|
||||||
|
version="0.0.0"
|
||||||
|
unpack="false"/>
|
||||||
|
|
||||||
</feature>
|
</feature>
|
||||||
|
|
|
@ -6,7 +6,10 @@ Bundle-Version: 3.1.0.qualifier
|
||||||
Bundle-Vendor: %provider_name
|
Bundle-Vendor: %provider_name
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
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.api.errors;version="[3.1.0,3.2.0)",
|
||||||
org.eclipse.jgit.archive;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.awtui;version="[3.1.0,3.2.0)",
|
||||||
|
|
|
@ -6,3 +6,4 @@ Bundle-Vendor: Eclipse.org - JGit
|
||||||
Bundle-Version: 3.1.0.qualifier
|
Bundle-Version: 3.1.0.qualifier
|
||||||
Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="."
|
Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="3.1.0";roots="."
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,11 @@
|
||||||
<artifactId>args4j</artifactId>
|
<artifactId>args4j</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-compress</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.eclipse.jgit</groupId>
|
<groupId>org.eclipse.jgit</groupId>
|
||||||
<artifactId>org.eclipse.jgit.archive</artifactId>
|
<artifactId>org.eclipse.jgit.archive</artifactId>
|
||||||
|
|
|
@ -5,4 +5,3 @@ Bundle-SymbolicName: org.eclipse.jgit.source;singleton:=true
|
||||||
Bundle-Vendor: Eclipse.org - JGit
|
Bundle-Vendor: Eclipse.org - JGit
|
||||||
Bundle-Version: 3.1.0.qualifier
|
Bundle-Version: 3.1.0.qualifier
|
||||||
Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="."
|
Eclipse-SourceBundle: org.eclipse.jgit;version="3.1.0";roots="."
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue