diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-04-26 21:51:27 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-04-26 23:46:29 +0200 |
| commit | c8844571b3a483e3cc5f77d18b4e972ad5fe2c5e (patch) | |
| tree | e49ae068069a99fd2d3586eb194d5f95d6dfe2eb /org.eclipse.jgit.gpg.bc/META-INF | |
| parent | 265550e63719c47ac9fc59fce107914acf0f8522 (diff) | |
| parent | 567315af548017cc58eadb91bba493b74c391009 (diff) | |
| download | jgit-c8844571b3a483e3cc5f77d18b4e972ad5fe2c5e.tar.gz jgit-c8844571b3a483e3cc5f77d18b4e972ad5fe2c5e.zip | |
Merge branch 'master' into next
* master:
ResolveMerger: Fix the issue with binary modify-modify conflicts
Explain why RacyGitTests may be flaky in some environments
PackBitmapIndexBuilder.StoredEntry: add getter for objectId
PackBitmapIndex: clarify naming of getObject inputs
Revert "[releng] Bump Bouncy Castle to 1.78"
[releng] Bump Bouncy Castle to 1.78
MergeAlgorithm: Fix diff3 conflict hunk computation
[gpg] Remove obsolete import-package
[gpg] Correct finding public keys from pubring.gpg
[gpg] Fix reading ed25519 GPG keys
PackBitmapIndexBuilder: make StoredEntry constructor public
PackBitmapIndexBuilder: allow repeated call of getCompressedBitmaps()
DfsPackFile: Make the loader classes used to construct bitmaps public.
DfsPackFile: make public the constructor with bitmap loader
PackWriter: writeBitmapIndex takes bitmap index writer
Add more tests on rewriting parents in a RevWalk
PackBitmapIndex: convert from class to interface
Cache refreshed loose ref dirs in SnapshottingRefDirectory
DfsGarbageCollectorTest: add test for bitmap index creation
PackBitmapIndex: hide packChecksum behind getter
TreeRevFilter: correct changedPathFilter usage for multi-paths inclusion
PathFilterGroup: implement getPathsBestEffort()
CleanupService: preload JgitText if not running in OSGi
DfsPackFile: get commitGraph.readChangePaths from repo config
CommitGraphLoader: receive readChangedPaths as parameter
Add pull request template discouraging usage of pull requests
Update CONTRIBUTING.md to point to GitHub issues
FS_POSIX.runInShell(): on MacOS use a login shell
[ssh] Implement the "Ciphers" SSH config
ShutdownHook: run on bundle deactivation if in OSGi
[diffmergetool] Fix running command on Cygwin
[releng] Bump japicmp base version to 6.9.0.202403050737-r
DfsBlockCache: move cache table specific implementations to a new class
Prepare 6.10.0-SNAPSHOT builds
Prepare 6.9.1-SNAPSHOT builds
JGit v6.9.0.202403050737-r
JGit v6.9.0.202403050045-r
Prepare 6.9.0-SNAPSHOT builds
Introduce core.trustLooseRefStat config
JGit v6.9.0.202402281855-rc1
Update SECURITY.md
DfsObjDatabase: Let object database instantiate DfsPackFiles
DfsPackFile: Abstract the bitmap loading to support other backends
Remove unused API problem filters
Support public key in IdentityFile
Revert "StartGenerator: Fix parent rewrite with non-default RevFilter"
Prepare 6.9.0-SNAPSHOT builds
JGit v6.9.0.202402211805-m3
DfsReader#getObjectSize: use size index if possible
Change-Id: Ibdde5be8c5c2b3938aeaa4f278020cadcaad36a3
Diffstat (limited to 'org.eclipse.jgit.gpg.bc/META-INF')
| -rw-r--r-- | org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index e12424dcf4..84d7d0736b 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Bundle-Localization: OSGI-INF/l10n/gpg_bc Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", - org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", org.bouncycastle.bcpg;version="[1.69.0,2.0.0)", org.bouncycastle.bcpg.sig;version="[1.69.0,2.0.0)", |