diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2014-03-05 02:02:03 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2014-03-05 02:02:16 +0100 |
| commit | 71b90400bb5e91050941844156ec548211bbb447 (patch) | |
| tree | f5d768c0373e0700d87ec010bd717c4869797ad6 /org.eclipse.jgit.http.server | |
| parent | b640e3ab319ca6bf4310d2a1e681e4a08f5ddd50 (diff) | |
| parent | f59b680c4c0edd257b4777932bdb2cc2de1db797 (diff) | |
| download | jgit-71b90400bb5e91050941844156ec548211bbb447.tar.gz jgit-71b90400bb5e91050941844156ec548211bbb447.zip | |
Merge branch 'stable-3.3'
* stable-3.3:
Update scripts to deploy jgit on Maven central
Prepare 3.3.1-SNAPSHOT builds
JGit v3.3.0.201403021825-r
Fix merge/cherry-picking in CRLF mode
Expose the received pack size in ReceivePack
Revert "Add getPackFile to ReceivePack to make PostReceiveHook more usable"
Avoid an NPE after 7b01a5369210
Add a launcher for Java 7 tests
Remove obsolete getRepositoryMethod from WorkingTreeIterator
Fix NPE when WorkingTreeIterator does not have a repository set
Add getPackFile to ReceivePack to make PostReceiveHook more usable
Possibility to limit the max pack size on receive-pack
Package httpclient and httpcore in o.e.j.http.apache.feature
Change-Id: I814a150980854bbaabd767f97b062d247af6cb50
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.http.server')
| -rw-r--r-- | org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 24 | ||||
| -rw-r--r-- | org.eclipse.jgit.http.server/pom.xml | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index a9b1fbb865..5b0e370804 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 3.3.0.qualifier +Bundle-Version: 3.3.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %provider_name Export-Package: - org.eclipse.jgit.http.server;version="3.3.0", - org.eclipse.jgit.http.server.glue;version="3.3.0"; + org.eclipse.jgit.http.server;version="3.3.1", + org.eclipse.jgit.http.server.glue;version="3.3.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="3.3.0"; + org.eclipse.jgit.http.server.resolver;version="3.3.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,11 +18,11 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: javax.servlet;version="[2.5.0,3.0.0)", javax.servlet.http;version="[2.5.0,3.0.0)", - org.eclipse.jgit.errors;version="[3.3.0,3.4.0)", - org.eclipse.jgit.internal.storage.file;version="[3.3.0,3.4.0)", - org.eclipse.jgit.lib;version="[3.3.0,3.4.0)", - org.eclipse.jgit.nls;version="[3.3.0,3.4.0)", - org.eclipse.jgit.revwalk;version="[3.3.0,3.4.0)", - org.eclipse.jgit.transport;version="[3.3.0,3.4.0)", - org.eclipse.jgit.transport.resolver;version="[3.3.0,3.4.0)", - org.eclipse.jgit.util;version="[3.3.0,3.4.0)" + org.eclipse.jgit.errors;version="[3.3.1,3.4.0)", + org.eclipse.jgit.internal.storage.file;version="[3.3.1,3.4.0)", + org.eclipse.jgit.lib;version="[3.3.1,3.4.0)", + org.eclipse.jgit.nls;version="[3.3.1,3.4.0)", + org.eclipse.jgit.revwalk;version="[3.3.1,3.4.0)", + org.eclipse.jgit.transport;version="[3.3.1,3.4.0)", + org.eclipse.jgit.transport.resolver;version="[3.3.1,3.4.0)", + org.eclipse.jgit.util;version="[3.3.1,3.4.0)" diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 8e14ce5cfb..24d79bc4dd 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -52,7 +52,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>3.3.0-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.http.server</artifactId> |