diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2023-12-04 22:58:45 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-12-04 22:58:45 +0100 |
commit | c1e5bd348d1d4447c5d13da662922a0f82630202 (patch) | |
tree | 595b222be0b5377790309c83feff96d11f39a38e /org.eclipse.jgit.lfs.server | |
parent | 8ea5409ec18a6e2a6238948fa5af13b9b26b1955 (diff) | |
parent | 796fb2e5c71a00b0335d33326ad55e8759486f4f (diff) | |
download | jgit-c1e5bd348d1d4447c5d13da662922a0f82630202.tar.gz jgit-c1e5bd348d1d4447c5d13da662922a0f82630202.zip |
Merge branch 'stable-6.8'
* stable-6.8:
Prepare 6.8.1-SNAPSHOT builds
JGit v6.8.0.202311291450-r
Rename method parameter to fix warning about hidden field
Fix warnings about empty control flow statements
BitmapIndexImpl: externalize error message
Suppress not-externalized string warnings
Silence API error for new method BitmapIndex#addBitmapLookupListener
Update Orbit to orbit-aggregation/2023-12
Prepare 6.8.0-SNAPSHOT builds
JGit v6.8.0.202311212206-rc1
Change-Id: Ie88662f6458bb80147c7c164424eebd8b8240fc7
Diffstat (limited to 'org.eclipse.jgit.lfs.server')
-rw-r--r-- | org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 | ||||
-rw-r--r-- | org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.lfs.server/pom.xml | 2 |
3 files changed, 19 insertions, 19 deletions
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 6c3b73ae9b..5ad3cc1bc6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.8.0.qualifier +Bundle-Version: 6.8.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="6.8.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="6.8.1"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="6.8.0"; + org.eclipse.jgit.lfs.server.fs;version="6.8.1"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="6.8.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="6.8.0"; + org.eclipse.jgit.lfs.server.internal;version="6.8.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="6.8.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", - org.eclipse.jgit.internal;version="[6.8.0,6.9.0)", - org.eclipse.jgit.internal.storage.file;version="[6.8.0,6.9.0)", - org.eclipse.jgit.lfs.errors;version="[6.8.0,6.9.0)", - org.eclipse.jgit.lfs.internal;version="[6.8.0,6.9.0)", - org.eclipse.jgit.lfs.lib;version="[6.8.0,6.9.0)", - org.eclipse.jgit.lib;version="[6.8.0,6.9.0)", - org.eclipse.jgit.nls;version="[6.8.0,6.9.0)", - org.eclipse.jgit.transport.http;version="[6.8.0,6.9.0)", - org.eclipse.jgit.transport.http.apache;version="[6.8.0,6.9.0)", - org.eclipse.jgit.util;version="[6.8.0,6.9.0)", + org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)", + org.eclipse.jgit.internal;version="[6.8.1,6.9.0)", + org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)", + org.eclipse.jgit.lfs.errors;version="[6.8.1,6.9.0)", + org.eclipse.jgit.lfs.internal;version="[6.8.1,6.9.0)", + org.eclipse.jgit.lfs.lib;version="[6.8.1,6.9.0)", + org.eclipse.jgit.lib;version="[6.8.1,6.9.0)", + org.eclipse.jgit.nls;version="[6.8.1,6.9.0)", + org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)", + org.eclipse.jgit.transport.http.apache;version="[6.8.1,6.9.0)", + org.eclipse.jgit.util;version="[6.8.1,6.9.0)", org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 82f3918622..03c3d46ba5 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.8.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.8.0.qualifier";roots="." +Bundle-Version: 6.8.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.8.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 8e8aedffd9..f7cd017227 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>6.8.0-SNAPSHOT</version> + <version>6.8.1-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.lfs.server</artifactId> |