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

diff --cc org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index e12424dcf4931198c6202db8c5600d9623392981,046f04891517015bce0b06e6d007b197e38a3e6f..84d7d0736b5761b51477141e6fb6535c15b66b98
--- 1/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
@@@ -3,13 -3,12 +3,12 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.gpg.bc
  Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true
 -Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)"
 +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)"
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: OSGI-INF/l10n/gpg_bc
 -Bundle-Version: 6.10.0.qualifier
 +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)",

diff --cc org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
Simple merge

diff --cc org.eclipse.jgit/META-INF/MANIFEST.MF
index 0bd81190293e370153a5cc3a3a68b58676247209,e897b24d0fc9179f294cf7cd073ad9091e673feb..d16f6b0dcbcbaf67ef2a3c43b1d8b65198d0da81
--- 1/org.eclipse.jgit/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit/META-INF/MANIFEST.MF
@@@ -3,12 -3,14 +3,14 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit
  Bundle-SymbolicName: org.eclipse.jgit
 -Bundle-Version: 6.10.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
+ Bundle-ActivationPolicy: lazy
+ Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml
  Eclipse-ExtensibleAPI: true
 -Export-Package: org.eclipse.jgit.annotations;version="6.10.0",
 - org.eclipse.jgit.api;version="6.10.0";
 +Export-Package: org.eclipse.jgit.annotations;version="7.0.0",
 + org.eclipse.jgit.api;version="7.0.0";
    uses:="org.eclipse.jgit.transport,
     org.eclipse.jgit.notes,
     org.eclipse.jgit.dircache,

diff --cc pom.xml
Simple merge