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.ui | |
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.ui')
-rw-r--r-- | org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 | ||||
-rw-r--r-- | org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.jgit.ui/pom.xml | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 05179db81e..f9b6a847f9 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.8.0.qualifier +Bundle-Version: 6.8.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.awtui;version="6.8.0" -Import-Package: org.eclipse.jgit.errors;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.revplot;version="[6.8.0,6.9.0)", - org.eclipse.jgit.revwalk;version="[6.8.0,6.9.0)", - org.eclipse.jgit.transport;version="[6.8.0,6.9.0)", - org.eclipse.jgit.util;version="[6.8.0,6.9.0)" +Export-Package: org.eclipse.jgit.awtui;version="6.8.1" +Import-Package: org.eclipse.jgit.errors;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.revplot;version="[6.8.1,6.9.0)", + org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)", + org.eclipse.jgit.transport;version="[6.8.1,6.9.0)", + org.eclipse.jgit.util;version="[6.8.1,6.9.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 948bc27ae7..a4e59a200a 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.8.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.8.0.qualifier";roots="." +Bundle-Version: 6.8.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.8.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ca19f2bec9..b051ad5c04 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,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.ui</artifactId> |