Merge branch 'master' into next

* master:
  Delete org.eclipse.jgit.ssh.apache.agent/bin/.project
  Allow to discover bitmap on disk created after the packfile
  Update jetty to 10.0.20
  Update maven plugins
  Update org.assertj:assertj-core to 3.25.3
  Update org.mockito:mockito-core to 5.10.0
  Update org.apache.commons:commons-compress to 1.26.0
  Update byte-buddy to 1.14.12
  Add SystemReader.Delegate to reduce boiler-plate code needed to subclass
  storage.file: Do not throw NSFE when deleting tmp files
  FS.detectSymlinkSupport: fix a race
  RefDirectory: Do not unlock until after deleting loose ref
  Add missing javadoc description for declared exception
  SnapshottingRefDirectory: Invalidate snapshot after locking ref for update
  SnapshottingRefDir: Replace lambas with method refs
  SnapshottingRefDir: Reduce casts with overrides
  [errorprone] Fix wrong comparison which always evaluated to false
  [errorprone] Remove unnecessary comparison
  Errorprone EscapedEntity: Do not use HTML entities inside @code javadoc
  ChangedPathFilter: Suppress warning about backing array (errorprone)
  PackWriterBitmapPreparer: Do not generate bitmaps for excessive branch tips.
  Don't use localized String during JVM shutdown
  RawParseUtils.nextLfSkippingSplitLines: fulfil contract as stated
  [gpg] Refactor the GpgSignatureVerifier
  RawParseUtils: utility method to get a header value
  Improve handling of NFS stale handle errors
  Fix handling of missing pack index file
  Add tests for handling pack files removal during fetch
  RebaseCommand: fix stopping on root commit conflicts
  Improve handling of NFS stale handle errors
  Fix handling of missing pack index file
  CherryPick: add ability to customise cherry-picked commit message
  RawParseUtils: Add missing @since tag for new API method
  Silence API warning for new constant
  [ssh] Bump Apache MINA sshd 2.11.0 -> 2.12.0
  Introduce a PriorityQueue sorting RevCommits by commit timestamp
  Remove org.eclipse.jgit.benchmark/.factorypath
  Update jmh to 1.37 for org.eclipse.jgit.benchmark
  Add tests for handling pack files removal during fetch
  PackWriterBitmapPreparer: Set limit on excessive branch count
  Update jna to 5.14.0
  DfsInserter/PackParser: keep min size for index in the inserter
  FooterLines: handle extraction from messages without headers
  Silence API warnings
  Remove invalid/unnecessary Maven settings
  Update maven plugins
  Update org.eclipse.dash:license-tool-plugin to 1.1.0
  Enable using slf4j 2.x
  Update Tycho to 4.0.4
  Update mockito to 5.8.0
  Add 4.31 target platform and update orbit to 4.31
  Update ecj to 3.36.0
  Renormalize line endings based on .gitattributes
  Configure .gitattributes to manage line endings
  Normalize line endings to LF for all text files
  BasePackFetchConnection: Skip object/ref lookups if local repo is empty
  LooseObjects: Use File#exists when possible
  Remove invalid spotbugs configuration
  Fix PMD plugin configuration
  DfsReader: give subclasses visiblity over the pack bitmap index
  PackBitmapIndex/StoredBitmap: Expose size and counts
  PackWriter/Statistics: Remove the bitmapt hit stats
  Configure Github issue reporting
  Make sure ref to prune is in packed refs
  FooterLine: Protect from ill-formed message
  API filter for PackStatistics.objectsWithBitmapsFound
  StartGenerator: Fix parent rewrite with non-default RevFilter
  Update MANIFEST.MF
  Document option gc.writeCommitGraph
  Bump last release version to 6.8.0.202311291450-r
  Prepare 6.9.0-SNAPSHOT builds
  BitmapWalkerTest: New test for the walker
  PackWriter: store the objects with bitmaps in the statistics
  FooterLine: First line cannot be a footer
  Reapply "Improve footer parsing to allow multiline footers."
  Revert "Improve footer parsing to allow multiline footers."
  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
  Adapt to type parameter added in commons-compress 1.25.0
  Improve footer parsing to allow multiline footers.
  Make the tests buildable by bazel test
  Prepare 6.8.0-SNAPSHOT builds
  JGit v6.8.0.202311212206-rc1
  BitmapIndex: Add interface to track bitmaps found (or not)
  BitmapWalker: Remove BitmapWalkListener
  Update repository URLs in CONTRIBUTING.md
  Fix typo in FileUtils.isStaleFileHandle() javadoc
  Fix branch ref exist check
  gpg.bc: Supress errorprone InsecureCryptoUsage
  Adjust javadoc to pass errorprone checks
  Update org.apache.commons:commons-compress to 1.25.0
  Fix annotation of deprecated constant CONFIG_KEY_STREAM_FILE_TRESHOLD
  BitmapWalkListener: Use plain interface with noop instance
  BitmapWalkListener: Add method and rename for commits
  Update bouncycastle to 1.77
  PatchApplier: wrap output's TemporaryBuffer with a CountingOutputStream
  BitmapWalker: announce walked objects via listener interface
  Prepare 6.8.0-SNAPSHOT builds
  Update jetty to 10.0.18
  SSH: bump org.apache.sshd to 2.11.0
  JGit v6.8.0.202311151710-m2
  Fix typo in constant name CONFIG_KEY_STREAM_FILE_TRESHOLD
  Simplify StringUtils#commonPrefix
  Optimize RefDirectory.getRefsByPrefix(String...)
  CommitGraphWriter: Remove unnecesary progress update call
  Use try-with-resource to ensure UploadPack is closed
  Fix hiding field warning
  Fix warning for empty code blocks
  Fix boxing warnings
  errorprone: remove unnecessary parentheses
  Update mockito to 5.7.0 and bytebuddy to 1.14.9
  Enable Maven reproducible builds
  Upgrade bazlets to the latest revision
  Revert "Optimise Git protocol v2 `ref-prefix` scanning"
  Document GIT_TRACE_PERFORMANCE to show timings
  config-options.md: fix sort order
  ComboBitset: Add Javadoc
  CommitGraphWriter: Add progress monitor to bloom filter computation
  CommitGraphWriter: Use ProgressMonitor from the OutputStream
  CommitGraphWriter: Unnest generation-number progress
  Optimise Git protocol v2 `ref-prefix` scanning
  UploadPackTest: Cover using wanted-refs as advertised set
  UploadPack: use want-refs as advertised set in fetch v2
  BasePackFetchConnection: Avoid full clone with useNegotiationTip
  Checkout: better directory handling
  .gitignore: ignore all Maven output directories `target/`
  benchmarks: use org.eclipse.jgit-parent as parent pom
  Generate SBOMs using cyclonedx maven plugin
  DfsPackFile: Do not attempt to read stream if pack doesn't have it
  PackObjectSizeIndexLoader: Log wrong bytes on exception
  Silence API warnings for API added in 5.13.3
  FileBasedConfig: in-process synchronization for load() and save()
  FileUtils.rename(): better retry handling
  FileBasedConfig: ensure correct snapshot if no file
  DeleteBranchCommand: update config only at the end
  Config.removeSection() telling whether it changed the config
  RebaseCommand: return correct status on stash apply conflicts
  Use net.i2p.crypto.eddsa 0.3.0 from new Orbit build
  PackConfig: fix @since tags
  Remove unused API problem filters
  Add support for git config repack.packKeptObjects
  Do not exclude objects in locked packs from bitmap processing
  [errorprone] Fix InconsistentCapitalization
  TestRepository: Add getInstant method
  Update orbit to orbit-aggregation/2023-12
  Prepare 6.8.0-SNAPSHOT builds
  JGit v6.8.0.202310031045-m1
  UploadPack: Delay freeing refs in sendPack()
  ByteBufferInputStream: add missing @since 6.8
  Fix log level for successful execution of ShutdownHook#notify to debug
  Eclipse features: update copyright year
  SSH agent: correct plug-in title
  Fix DefaultCharset bug pattern flagged by error prone
  Activate additional error prone checks
  WorkingTreeIterator: directly filter input stream
  [errorprone] Add missing javadoc summary
  [errorprone] Fix BadImport
  [errorprone] Prevent int expression may overflow
  [errorprone] Suppress ByteBufferBackingArray
  [errorprone] Suppress JavaLangClash to avoid breaking change
  [errorprone] Fix EqualsGetClass
  [errorprone] MockSystemReader: fix CatchAndPrintStackTrace
  [errorprone] MetaFilter: fix IdentityHashMapUsage
  [errorprone] InternalFetchConnection: Suppress CatchAndPrintStackTrace
  [errorprone] Don't swallow exception
  [errorprone] Fix inconsistent capitalization
  [errorprone] PageRef#isStringRef: suppress UnusedMethod
  [errorprone] FileReftableStack: fix EqualsUnsafeCast
  [errorprone] Suppress MissingSummary for translation bundles
  [errorprone] CommandLineMergeTool: Remove unused constuctor
  [errorprone] SimilarityRenameDetector: suppress IntLongMath
  Add comment why protocol list uses WeakReference
  [errorprone] Transport: Suppress ModifyCollectionInEnhancedForLoop
  [errorprone] Rename method parameter to silence InvalidParam
  [errorprone] MyersDiff#main: fix CatchAndPrintStackTrace
  [errorprone] TagCommand: Remove unused parameter of private method
  [errorprone] PathFilter#getPathsBestEffort: fix ArrayAsKeyOfSetOrMap
  [errorprone] DirCacheEntry: suppress JavaInstantGetSecondsGetNano
  [errorprone] Directly implement functional interface
  [errorprone] InterruptTimer#terminate: ensure Thread#join succeeds
  [errorprone] RawParseUtils@parseHexInt64: suppress IntLongMath
  [errorprone] Exceptions should not override #toString
  [errorprone] Fix invalid param in javadoc
  [errorprone] FS#searchPath: handle surprising behavior of String#split
  [errorprone] FileStoreAttributes#FUTURE_RUNNER: Fix corePoolSize
  [errorprone] Express duration using seconds which is clearer
  [errorprone] Use ArrayList instead of LinkedList
  [errorprone] AddCommand#filepattern: use a more specific type
  [errorprone] Suppress UnnecessaryParentheses
  [errorprone] Remove unnecessary parentheses
  tools/BUILD: Sort errorprone rules alphabetically
  Update jetty to 10.0.16
  Update bazel to 6.3.2
  DfsPackFile: remove unnecessary @SuppressWarnings("boxing")
  CommitGraphWriter: Remove unnecessary semicolon
  CommitGraphWriter: fix boxing warnings
  CommitGraphWriter#createCoreChunks: Remove not-thrown exceptions
  CommitGraphWriter: Decouple Stats from computing bloom filters
  CommitGraphWriter: Move bloom filter calculation out of createChunks
  Documentation: Move writeChangedPaths flag from commitGraph to gc section.
  [errorprone] Fix wrong comparison which always evaluated to false
  [errorprone] Remove unnecessary comparison
  Update org.eclipse.jdt:ecj to 3.35.0
  Update org.apache.commons:commons-compress to 1.24.0
  [errorprone] Suppress ImmutableEnumChecker for ShutdownHook
  Update bytebuddy to 1.14.8
  Use ShutdownHook to gracefully handle JVM shutdown
  Add ShutdownHook to cleanup FileLocks on graceful JVM shutdown
  Unregister ShutdownHook when GC#PidLock is closed
  OSGi: move plugin localization to subdirectory
  ssh: Remove redundant null check for home.getAbsoluteFile()
  RevertCommand: support for inserting a Gerrit change ID
  [releng] Bump japicmp base version to 6.7.0.202309050840-r
  DfsPackFile: Record index loads only in one place
  DfsPackfile: Emit the index load with the index object
  Prepare 6.8.0-SNAPSHOT builds
  Prepare 6.7.1-SNAPSHOT builds
  Switch back to wagon-ssh-external
  Fix generation of maven site
  Ensure home directory not null before using in Sshdsessionfactory
  CommitGraphWriter: Make the list of chunks immutable
  CommitGraphWriter: Assert written bytes
  JGit v6.7.0.202309050840-r
  Remove unused API problem filters
  [releng] Bump japicmp base version to 6.6.0.202305301015-r
  Fix list of 3rd party bundles in p2 repo
  Add missing source bundle org.osgi.service.cm.source to target platform
  Prepare 6.6.2-SNAPSHOT builds
  JGit v6.6.1.202309021850-r
  Checkout: better directory handling
  CommitGraphWriter: throw exception on unknown chunk
  Document commit-graph options supported by JGit
  Fix warning raised for local variable hiding DfsPackFile#index
  Suppress boxing warnings in DfsPackFile
  Remove unused API problem filters
  Suppress boxing warnings in tests
  Fix warning about empty block
  Update mockito to 5.5.0
  Update byte-buddy to 1.14.7
  Prepare 6.7.0-SNAPSHOT builds
  JGit v6.7.0.202308301100-rc1
  Remove the cbi-snapshots Maven repository
  Update Orbit to orbit-aggregation/release/4.29.0
  Add target platform for Eclipse 2023-09 (4.29)
  Use release p2 repo for Eclipse 2023-06 (4.28)
  Update tycho to 4.0.2
  Update jmh to 1.37
  Update bouncycastle to 1.76
  Fix some tests in ConfigTest
  Handle global git config $XDG_CONFIG_HOME/git/config
  IO: use JDK convenience methods
  org.eclipse.jgit.junit.ssh/.settings/.api_filters: fix unclosed tags
  ReadChangedPathFilter: fix Non-externalized string literal warning
  Introduce core.packedIndexGitUseStrongRefs config key
  DfsReader: Make PackLoadListener interface visible to subclasses
  DfsGarbageCollector: provide commit graph stats
  DfsGarbageCollector: put only GC commits into the commit graph
  DfsReader: Expose when indices are loaded
  Update to Tycho 4.0.1
  Prepare 6.7.0-SNAPSHOT builds
  JGit v6.7.0.202308011830-m2
  Add missing @since tags
  Fix errorprone warning about precedence
  Move footer-line parsing methods from RevCommit to FooterLine
  Merge: Add diff3 style merge conflict formatter.
  RevCommitCG: Read changed-path-filters directly from commit graph
  Update commons-codec to 1.16.0
  Add missing @since tags for new API methods
  Add missing package import needed to use MurmurHash3
  Identify a commit that generates a diffEntry on a rename Event.
  Pack: open reverse index from file if present
  PackReverseIndexV1: reverse index parsed from version 1 file
  PackReverseIndex: open file if present otherwise compute
  PackReverseIndex: verify checksums
  ComputedPackReverseIndex: Clarify custom bucket sort algorithm
  CommitGraphWriter: add option for writing/using bloom filters
  CommitGraphWriter: reuse changed path filters
  RevWalk: use changed path filters
  CommitGraphLoader: read changed-path filters
  CommitGraphWriter: write changed-path filters
  ssh: PKCS#11 support
  GC: Remove handling of extra pack for RefTree
  Remove unnecessary @SuppressWarnings("serial")
  Remove unused API problem filters
  Remove redundant specification of type arguments
  DfsPackParser: Create object indices if config says so
  PackParserTest: Extract pack-writing helper code to its own class
  DfsInserter: generate object size index if config says so
  DfsInserter: populate full size on object insertion
  DFSGarbargeCollector: Write object size indices
  DfsReader/PackFile: Implement isNotLargerThan using the obj size idx
  [releng] Use tycho 4.0.0 instead of 4.0.0-SNAPSHOT
  Add verification in GcKeepFilesTest that bitmaps are generated
  Express the explicit intention of creating bitmaps in GC
  GC: prune all packfiles after the loosen phase
  Update mockito to 5.4.0 and bytebuddy to 1.14.5
  Fix S3Repository getSize to handle larger object sizes
  DfsPackFile: make #getReverseIdx public
  Add missing bazel dependency to benchmarks
  Update JMH to 1.36
  Update bouncycastle to 1.75
  Update org.eclipse.jdt:ecj to 3.34.0
  Update eclipse-jarsigner-plugin to 1.4.2
  Update maven-surefire-report-plugin to 3.0.0
  Update maven-project-info-reports-plugin to 3.4.3
  Update maven-compiler-plugin to 3.11.0
  Update maven-enforcer-plugin to 3.3.0
  Update build-helper-maven-plugin to 3.4.0
  Update spring-boot-maven-plugin to 2.7.13
  Update maven-source-plugin to 3.3.0
  Prepare 5.13.3-SNAPSHOT builds
  JGit v5.13.2.202306221912-r
  PackReverseIndex: separate out the computed implementation
  Default for global (user) git ignore file
  Fix all Javadoc warnings and fail on them
  Mark COMMIT_GENERATION_* constants final
  Update Orbit to R20230531010532 for 2023-06
  Revert "RefDirectory: Throw exception if CAS of packed ref list fails"
  PackReverseIndex: use static builder instead of constructor
  Gc#writePack: write the reverse index file to disk
  Bazel: Fix remote build execution for Java 17
  Bump bazel vesion to 6.2.0
  Prepare 6.6.1-SNAPSHOT builds
  JGit v6.6.0.202305301015-r
  Bump bazel vesion to 6.2.0
  Update to Orbit S20230516204213
  Prepare 6.6.0-SNAPSHOT builds
  Prepare 6.7.0-SNAPSHOT builds
  JGit v6.6.0.202305241045-m3
  GraphObjectIndex: fix search in findGraphPosition
  Update to Tycho 4.0.0-SNAPSHOT
  PGP sign p2 artefacts
  Revert 'Use net.i2p.crypto:eddsa directly from Maven Central'
  Update dash license-tool-plugin to 1.0.2
  Also add suppressed exception if unchecked exception occurs in finally
  Candidate: use "Objects.equals" instead of "=="
  Use hamcrest 2.2 directly from Maven Central
  Use commons-logging directly from Maven Central
  Update jna to 5.13.0
  Use bytebuddy directly from Maven Central
  Use jna directly from Maven Central
  Use net.i2p.crypto:eddsa directly from Maven Central
  Use org.tukaani:xz directly from Maven Central
  Use args4j directly from Maven Central
  Use gson directly from Maven Central
  Remove unused $NON-NLS-1$
  Remove unused API filters
  Switch to Apache MINA sshd 2.10.0
  [releng] API filter for PackIndex.DEFAULT_WRITE_REVERSE_INDEX
  PackExt: add a #getTmpExtension method
  UploadPack: Record negotiation stats on fetchV2 call
  RewriteGeneratorTest: Introduce test cases for the RewriteGenerator
  PackWriter: write the PackReverseIndex file
  Prepare 6.6.0-SNAPSHOT builds
  JGit v6.6.0.202305031100-m2
  Update Maven plugins
  Add TransportHttp#getAdditionalHeaders
  Add 4.27 (2023-03) and 4.28 (2023-06) target platforms
  Fix inProcessPackedRefsLock not shared with copies of the instance
  Update slf4j to 1.7.36 and consume it directly from Maven Central
  Update assertj-core to 3.24.2
  Update plexus-compiler to 2.13.0
  Update Apache commons-codec to 1.15
  Update org.apache.commons:commons-compress to 1.23.0
  Update javaEWAH to 1.2.3 and use it directly from Maven central
  Update org.eclipse.jdt:ecj to 3.33.0
  Add missing @since tag to IntComparator
  Update to jakarta.servlet:jakarta.servlet-api:4.0.4
  Support rebasing independent branches
  Support cherry-picking a root commit
  AddCommand: ability to switch off renormalization
  Update jetty to 10.0.15 and use it from Maven central directly
  Update bouncycastle to 1.73
  [errorprone] Fix MissingOverride error
  PackReverseIndexWriter: write out version 1 reverse index file
  IntList: add #sort using quick sort for O(n log n) runtime.
  [bazel] Move ToolTestCase to src folder (6.2)
  GcConcurrentTest: @Ignore flaky testInterruptGc
  Fix CommitTemplateConfigTest
  Fix after_open config and Snapshotting RefDir tests to work with bazel
  [bazel] Skip ConfigTest#testCommitTemplatePathInHomeDirecory
  Demote severity of some error prone bug patterns to warnings
  [bazel] Fix version number of bcpg-jdk18on
  Parse pull.rebase=preserve as alias for pull.rebase=merges
  Use bouncycastle libraries directly from Maven Central
  UploadPack: Fix NPE when traversing a tag chain
  Add missing @since tag for BatchRefUpdate#getRefDatabase
  Add missing since tag for SshBasicTestBase
  Add missing since tag for SshTestHarness#publicKey2
  Silence API errors
  Prevent infinite loop rescanning the pack list on PackMismatchException
  Remove blank in maven.config
  PackedBatchRefUpdate#execute: reduce nesting of try-catch blocks
  PackedBatchRefUpdate: Handle the case where loose refs fail to pack
  Remove blank in maven.config
  Add protocol configuration to Amazon S3 transport
  [pgm] Implement git tag --contains option
  ListTagCommand: implement git tag --contains
  RevWalk: use generation number to optimize getMergedInto()
  DfsPackFile: Extract block aligment code
  Ensure parsed RevCommitCG has derived data from commit-graph
  PatchApplierTest: specify charset to avoid warning
  GcConcurrentTest: @Ignore flaky testInterruptGc
  PatchApplier: Check for existence of src/dest files before any operation
  Revert "RefDirectory: Throw exception if CAS of packed ref list fails"
  RefDirectory.delete: Prevent failures when packed-refs is outdated
  RefDirectory.pack: Only rely on packed refs from disk
  RefDirectory: Make pack() and commitPackRefs() void
  Implement a snapshotting RefDirectory for use in request scope
  Fix RefDirectoryTest.testGetRefs_LooseSorting_Bug_348834
  PackedBatchRefUpdate: Ensure updates are applied on latest packed refs
  Downgrade maven-site-plugin to 3.12.1
  Use wagon-ssh-external to deploy Maven site
  Record my e-mail change in .mailmap
  [releng] Bump japicmp base version
  PatchApplier: missing @since, and minor formatting
  BasePackFetchConnection: support negotiationTip feature
  DirCache: support option index.skipHash
  PatchApplierTest: Remove test data with Apache license
  Fix PatchApplier error handling.
  Ensure FileCommitGraph scans commit-graph file if it already exists
  GC: Close File.lines stream
  GC: Close File.lines stream
  Rerun flaky tests 3 times
  Prepare 6.5.1-SNAPSHOT builds
  JGit v6.5.0.202303070854-r
  Ignore generated org.eclipse.jgit.benchmarks/dependency-reduced-pom.xml
  [sshd] Fix calculation of timeout in AbstractClientProxyConnector
  Silence API error raised for removed BranchRebaseMode#PRESERVE
  [errorprone] Suppress [Finally] warnings
  Update Orbit to R20230302014618 for 2023-03
  Improve test coverage when core.trustPackedRefsStat set to after_open
  Prepare 6.6.0-SNAPSHOT builds
  Prepare 6.5.0-SNAPSHOT builds
  JGit v6.5.0.202302281825-rc1
  Prepare 6.5.0-SNAPSHOT builds
  Change config pull.rebase=preserve to pull.rebase=merges
  BatchingProgressMonitor: expose time spent per task
  PackWriter: offer to write an object-size index for the pack
  Fix formatting in GC#doGc
  PackExt: Define new extension for the object size index
  JGit v6.5.0.202302221508-m3
  If tryLock fails to get the lock another gc has it
  Fix GcConcurrentTest#testInterruptGc
  Don't swallow IOException in GC.PidLock#lock
  Check if FileLock is valid before using or releasing it
  Use Java 11 ProcessHandle to get pid of the current process
  UploadPack: use allow-any-sha1-in-want configuration
  Acquire file lock "gc.pid" before running gc
  Silence API errors introduced by 9424052f
  Externalize strings introduced in c9552aba
  Silence API error introduced by 596c445a
  PackConfig: add entry for minimum size to index
  Fix getPackedRefs to not throw NoSuchFileException
  PackObjectSizeIndex: interface and impl for the object-size index
  UInt24Array: Array of unsigned ints encoded in 3 bytes.
  PackIndex: expose the position of an object-id in the index
  Add pack options to preserve and prune old pack files
  DfsPackFile/DfsGC: Write commit graphs and expose in pack
  ObjectReader: Allow getCommitGraph to throw IOException
  Allow to perform PackedBatchRefUpdate without locking loose refs
  Document option "core.sha1Implementation" introduced in 59029aec
  UploadPack: consume delimiter in object-info command
  PatchApplier fix - init cache with provided tree
  Prepare 6.5.0-SNAPSHOT builds
  JGit v6.5.0.202302011120-m2
  Avoid error-prone warning
  Fix unused exception error-prone warning
  UploadPack: advertise object-info command if enabled
  Shortcut during git fetch for avoiding looping through all local refs
  FetchCommand: fix fetchSubmodules to work on a Ref to a blob
  Silence API warnings introduced by I466dcde6
  Allow the exclusions of refs prefixes from bitmap
  Move MemRefDatabase creation in a separate method.
  PackWriterBitmapPreparer: do not include annotated tags in bitmap
  BatchingProgressMonitor: avoid int overflow when computing percentage
  DfsReaderIoStats: Add Commit Graph fields into DfsReaderIoStats
  [pgm] Fetch-CLI: add support for shallow
  Speedup GC listing objects referenced from reflogs
  Re-add servlet-api 4.0 to the target platform
  Upgrade maven plugins
  Cache trustFolderStat/trustPackedRefsStat value per-instance
  Refresh 'objects' dir and retry if a loose object is not found
  Prepare 6.5.0-SNAPSHOT builds
  JGit v6.5.0.202301111425-m1
  Update Orbit to S20230101190934
  Update to releases p2 repo for 4.26 simultaneous release
  RevWalk: integrate commit-graph with commit parsing
  FileSnapshotTest: Add more MISSING_FILE coverage
  GC: disable writing commit-graph for shallow repos
  Introduce core.trustPackedRefsStat config
  RefDatabase: fix javadoc formatting
  Pull up additionalRefsNames from RefDirectory to RefDatabase
  Add TernarySearchTree
  CommitGraph: teach ObjectReader to get commit-graph
  PatchApplier: fix handling of last newline in text patch
  CommitGraph: add commit-graph for FileObjectDatabase
  Reformat PatchApplier and PatchApplierTest
  PackWriter#prepareBitmapIndex: add clarifying comments
  IO#readFully: provide overload that fills the full array
  Fix API warnings for the new CommitGraph
  PackReverseIndex#findPosition: fix typo in method name
  GC: Write commit-graph files when gc
  CommitGraph: add core.commitGraph config
  CommitGraph: implement commit-graph read
  Gc#deleteOrphans: avoid dependence on PackExt alphabetical ordering
  WalkPushConnection: Sanitize paths given to transports
  Fix documentation for core.trustFolderStat
  GraphCommits: Remove unused getter by position
  CommitGraphWriter: fix UnusedException errorprone error
  Update jetty to 10.0.13
  PackExt: Add a commit graph extension.
  BatchRefUpdate: Consistent switch branches in ref update
  RefWriter#writePackedRefs: Remove a redundant "if" check
  commitgraph package: fix exports/imports, add @since tag for new API
  CommitGraph: implement commit-graph writer
  [releng] bump japicmp base version
  Prepare 6.4.1-SNAPSHOT builds
  JGit v6.4.0.202211300538-r
  Fix crashes on rare combination of file names
  Prepare 6.5.0-SNAPSHOT builds
  Prepare 6.4.0-SNAPSHOT build
  JGit v6.4.0.202211231055-rc1
  [pgm] Add options --name-only, --name-status to diff, log, show
  Update Orbit to R20221123021534 for 2022-12
  RBE: Update toolchain with bazel-toolchains 5.1.2 release
  SshTestGitServer: : ensure UploadPack is closed to fix resource leak
  UploadPackTest: ensure UploadPack is closed to fix resource leak
  [pgm] Ensure UploadPack is closed to fix resource leak
  UploadPackServlet#doPost use try-with-resource to ensure up is closed
  Fix warnings in PatchApplierTest
  Fix boxing warnings in TransportTest
  Silence warnings about unclosed BasePackPushConnection
  Fix warning about non-externalized String
  Remove unused imports
  Suppress non-externalized String warnings
  Remove unused API problem filters
  Silence API errors
  Silence API errors
  Silence API warnings
  Add 4.26 target platform
  Use "releases" repository for 4.25 target platform
  Update Apache Mina SSHD to 2.9.2
  Update Orbit to S20221118032057
  DfsBlockCache: Report IndexEventConsumer metrics for reverse indexes.
  DfsStreamKey: Replace ForReverseIndex to separate metrics.
  Prepare 6.4.0-SNAPSHOT builds
  RawText.isBinary(): handle complete buffer correctly
  JGit v6.4.0.202211160543-m3
  PackExt: Add a reverse index extension.
  [benchmarks] Remove profiler configuration
  Add SHA1 benchmark
  [benchmarks] Set version of maven-compiler-plugin to 3.8.1
  Fix running JMH benchmarks
  Add option to allow using JDK's SHA1 implementation
  Fix API breakage caused by extracting WorkTreeUpdater
  Update Orbit to S20221109014815
  Use replace instead of replaceAll in toCleanString
  Extract Exception -> HTTP status code mapping for reuse
  Don't handle internal git errors as an HTTP error
  Fix the path for JSchText.properties
  Fix crashes on rare combination of file names
  Fix Maven SHA1 for Bazel build
  UploadPack: Receive and parse client session-id
  TransferConfig: Move reading advertisesid setting into TransferConfig
  FirstWant: Parse client session-id if received.
  ReceivePack: Receive and parse client session-id.
  Ignore IllegalStateException if JVM is already shutting down
  Prepare 6.4.0-SNAPSHOT builds
  Allow to perform PackedBatchRefUpdate without locking loose refs
  JGit v6.4.0.202210260700-m2
  PushCommand: allow users to disable use of bitmaps for push
  I/O redirection for the pre-push hook
  PackParser: populate full size of the PackedObjectInfos
  PackedObjectInfo: add the full size to the description
  ObjectReader: New #isNotLargerThan method
  Fail build if there are license issues with dependencies
  Update org.apache.httpcomponents:httpcore to 4.4.15
  Update Orbit to S20220927175816
  Update JMH to 1.35
  Update org.eclipse.jdt:ecj to 3.31.0
  Update plexus compiler to 2.12.1
  Update org.apache.maven.wagon:wagon-ssh to 3.5.2
  pgm/BUILD: Add dependencty to java EWAH
  [sshd] Guard against numerical overflow
  Remove unused imports
  Remove unused API filters
  ObjectDirectory: avoid using File.getCanonicalPath()
  AutoCRLFOutputStream: use BufferedOutputStream
  CloneCommand: set HEAD also when not checking out
  Pass on shallowSince only if not null
  Fix wrong @since tag
  Split out ApplyCommand logic to PatchApplier class
  Prepare 6.4.0-SNAPSHOT builds
  Fix typo in FetchV2Request javadoc
  Prepare 6.3.1-SNAPSHOT builds
  DfsBundleWriter: Add test case about GC_REST pack.
  JGit v6.3.0.202209071007-r
  JGit v6.3.0.2022009070944-r
  [merge] Fix merge conflicts with symlinks
  Update DEPENDENCIES for 6.3.0
  Update tycho to 2.7.5
  Move WorkTreeUpdater to merge package
  WorkTreeUpdater: use DirCacheCheckout#StreamSupplier
  DirCacheCheckout#getContent: also take InputStream supplier
  Revert "Adds FilteredRevCommit that can overwrites its parents in the DAG."
  Revert "Option to pass start RevCommit to be blamed on to the BlameGenerator."
  WorkTreeUpdater: remove safeWrite option
  Update Orbit to R20220830213456 for 2022-09
  BaseSuperprojectWriter: report invalid paths as manifest errors
  ApplyCommand: fix ApplyResult#updatedFiles
  WorkTreeUpdater: rename metadata maps
  WorkTreeUpdater#Result: hide data members
  Add javadoc on RevCommit
  Option to pass start RevCommit to be blamed on to the BlameGenerator.
  WorkTreeUpdater: re-format and clean-up
  Prepare 6.3.0-SNAPSHOT builds
  Adds FilteredRevCommit that can overwrites its parents in the DAG.
  JGit v6.3.0.202208161710-m3
  DirCacheCheckout: load WorkingTreeOptions only once
  WorkTreeUpdater: Fix unclosed streams
  Fix adding symlinks to the index when core.symlinks=false
  Remove unused API problem filters
  Add missing @since tag for RevCommit#parents introduced in 61b4d105e4
  Fix API errors caused by 23a71696cd
  Provide default shallowCommits getter and setter in ObjectDatabase
  Reapply "Create util class for work tree updating in both filesystem and index."
  ResolveMerger: add coverage for inCore file => directory transition
  Provide encoding to String#getBytes()
  Revert "Create util class for work tree updating in both filesystem and index."
  Provide a default implementation for set/get shallowCommits on DfsObjDatabase
  Revert "Adds FilteredRevCommit that can overwrites its parents in the DAG."
  Revert "Option to pass start RevCommit to be blamed on to the BlameGenerator."
  CleanCommand: fix prefix matching
  Option to pass start RevCommit to be blamed on to the BlameGenerator.
  Adds FilteredRevCommit that can overwrites its parents in the DAG.
  Add the ability to override parents on RevCommit.
  Refactor NameConflictTreeWalk.fastMin method
  Fix BUILD rules for FilteredRenameDetectorTest
  Rename fastMinHasMatch to allTreesNamesMatchFastMinRef
  Document TreeWalk#min()
  Squash error-prone messages
  Use constants for git packet protocol line identifiers
  ObjectDirectory: improve reading of shallow file
  Fetch: add support for shallow
  [tests] Stabilize the HTTP server's request log
  NameConflictTreeWalk: respect git order on multi-tree iteration
  Update Orbit to S20220726152247 and bouncycastle to 1.71
  Create util class for work tree updating in both filesystem and index.
  Fix the handling of .git/info/exclude and core.excludesFile
  Remove version constraints from org.tukaani.xz package

Change-Id: I31997b67bf432ae3bf6b1cde076fa9307b1e00f4

diff --cc org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index 4408441cfe5b1a83baaa801ab7b8b7828e35f138,d73a8a94c22460ffc05105b3e3aa8390220f7b93..b5d8d5c07bc8f49a8eb298555f692d4e78822fc2
--- 1/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@@ -3,13 -3,13 +3,13 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.ant
  Bundle-SymbolicName: org.eclipse.jgit.ant
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-RequiredExecutionEnvironment: JavaSE-11
  Import-Package: org.apache.tools.ant,
 -  org.eclipse.jgit.storage.file;version="[6.9.0,6.10.0)"
 +  org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)"
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
 -Export-Package: org.eclipse.jgit.ant;version="6.9.0",
 - org.eclipse.jgit.ant.tasks;version="6.9.0";
 +Export-Package: org.eclipse.jgit.ant;version="7.0.0",
 + org.eclipse.jgit.ant.tasks;version="7.0.0";
    uses:="org.apache.tools.ant,
     org.apache.tools.ant.types"

diff --cc org.eclipse.jgit.ant/pom.xml
Simple merge

diff --cc org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index a738a822d005efa4b2555aa6025b12652a624075,64195487f9624c606aee52c1f6558dbc31c16463..bfd24cba22f09fc6b874ce98efe0c9feaf4ec7e9
--- 1/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@@ -3,9 -3,9 +3,9 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.archive
  Bundle-SymbolicName: org.eclipse.jgit.archive
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-Vendor: %Bundle-Vendor
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-RequiredExecutionEnvironment: JavaSE-11
  Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
   org.apache.commons.compress.archivers.tar;version="[1.4,2.0)",

diff --cc org.eclipse.jgit.archive/pom.xml
Simple merge

diff --cc org.eclipse.jgit.benchmarks/pom.xml
index 8ea4ada0c4ce1e227bc9bd0d2b073c1791726c5b,be7440d1184e032bc1a6313ec703053bc1328fd1..7026ec60ad6cf701ac3e0129bdc7ddd209adb52d
--- 1/org.eclipse.jgit.benchmarks/pom.xml
--- 2/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@@ -13,8 -13,12 +13,12 @@@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
  
-   <groupId>org.eclipse.jgit</groupId>
-   <version>7.0.0-SNAPSHOT</version>
+   <parent>
+     <groupId>org.eclipse.jgit</groupId>
+     <artifactId>org.eclipse.jgit-parent</artifactId>
 -    <version>6.9.0-SNAPSHOT</version>
++    <version>7.0.0-SNAPSHOT</version>
+   </parent>
+ 
    <artifactId>org.eclipse.jgit.benchmarks</artifactId>
    <packaging>jar</packaging>
  

diff --cc org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
index 10596ec8069c4fe16e8e4dcdbdba3b38bca086db,02d46062eb8f77e7852928f09099e7ba9d1aa94b..26a702eb11502384dd8740a7eea21130ae8b65eb
--- 1/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF
@@@ -12,10 -13,9 +13,9 @@@ Import-Package: org.bouncycastle.jce.pr
   org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)",
   org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)",
   org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)",
 - org.eclipse.jgit.gpg.bc.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.gpg.bc.internal.keys;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util.sha1;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.gpg.bc.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util.sha1;version="[7.0.0,7.1.0)",
-  org.hamcrest;version="[1.1.0,3.0.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)",
   org.junit.runners;version="[4.13,5.0.0)"

diff --cc org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index 1cdb48cd98bd4a6d292a421b582d92b88216a815,fe2b885eeb7d85314469e941bc64d4fb2e1e552d..e12424dcf4931198c6202db8c5600d9623392981
--- 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,10 -3,10 +3,10 @@@ 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.9.0,6.10.0)"
 +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)"
  Bundle-Vendor: %Bundle-Vendor
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/gpg_bc
 -Bundle-Version: 6.9.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)",
@@@ -29,9 -29,9 +29,9 @@@
   org.bouncycastle.util;version="[1.69.0,2.0.0)",
   org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)",
   org.bouncycastle.util.io;version="[1.69.0,2.0.0)",
 - org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)",
-  org.slf4j;version="[1.7.0,2.0.0)"
+  org.slf4j;version="[1.7.0,3.0.0)"
 -Export-Package: org.eclipse.jgit.gpg.bc;version="6.9.0",
 - org.eclipse.jgit.gpg.bc.internal;version="6.9.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
 - org.eclipse.jgit.gpg.bc.internal.keys;version="6.9.0";x-friends:="org.eclipse.jgit.gpg.bc.test"
 +Export-Package: org.eclipse.jgit.gpg.bc;version="7.0.0",
 + org.eclipse.jgit.gpg.bc.internal;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test",
 + org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test"

diff --cc org.eclipse.jgit.gpg.bc/pom.xml
Simple merge

diff --cc org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index 5e08b0c71d81b2bb8bdd3e2558f2c7ec9e9b9726,488fb71e6c5462ca0d37dc97bbf50492d3f5e2fb..2a06ae6f0e8ab1dc0a1abd795776389e2d54b434
--- 1/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@@ -3,12 -3,13 +3,13 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.http.apache
  Bundle-SymbolicName: org.eclipse.jgit.http.apache
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-RequiredExecutionEnvironment: JavaSE-11
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
  Bundle-ActivationPolicy: lazy
- Import-Package: org.apache.http;version="[4.3.0,5.0.0)",
+ Import-Package: javax.net.ssl,
+  org.apache.http;version="[4.3.0,5.0.0)",
   org.apache.http.client;version="[4.4.0,5.0.0)",
   org.apache.http.client.config;version="[4.4.0,5.0.0)",
   org.apache.http.client.methods;version="[4.4.0,5.0.0)",

diff --cc org.eclipse.jgit.http.apache/pom.xml
Simple merge

diff --cc org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index 2076e235cf8faa36cbb695244551ca7cb07ceac6,447f8c20fea5317cde6f402d55d77c4c088e3580..1336e56644aa4c18a34f8264c042a6b2dd0b2165
--- 1/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
@@@ -3,13 -3,13 +3,13 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.http.server
  Bundle-SymbolicName: org.eclipse.jgit.http.server
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
 -Export-Package: org.eclipse.jgit.http.server;version="6.9.0",
 - org.eclipse.jgit.http.server.glue;version="6.9.0";
 +Export-Package: org.eclipse.jgit.http.server;version="7.0.0",
 + org.eclipse.jgit.http.server.glue;version="7.0.0";
    uses:="javax.servlet,javax.servlet.http",
 - org.eclipse.jgit.http.server.resolver;version="6.9.0";
 + org.eclipse.jgit.http.server.resolver;version="7.0.0";
    uses:="org.eclipse.jgit.transport.resolver,
     org.eclipse.jgit.lib,
     org.eclipse.jgit.transport,

diff --cc org.eclipse.jgit.http.server/pom.xml
Simple merge

diff --cc org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index ea5661650d9db581ee5d7bb3e6a42601f9c2675c,866f2258f5519a68767d910c7383776842f78ad0..25089410a545d6f4440a4ae38fd296812fbbb545
--- 1/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
@@@ -26,28 -28,26 +28,26 @@@ Import-Package: javax.servlet;version="
   org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
   org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
   org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)",
 - org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.http.server;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.http.server.glue;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.http.server.resolver;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.dfs;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.reftable;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit.http;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.nls;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revwalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.http;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.http.apache;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.resolver;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.api;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.http.server.glue;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.http.server.resolver;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit.http;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
-  org.hamcrest;version="[1.1.0,3.0.0)",
-  org.hamcrest.core;version="[1.1.0,3.0.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.rules;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)",

diff --cc org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index ff0c2490478061a444391d1b101d4d69b37c67d1,e810b7add99324352a6b73dbb4cf356d43dc5d0e..4de73b35876ed1b6668920c0199e0253c9c546ba
--- 1/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@@ -3,8 -3,8 +3,8 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.junit.http
  Bundle-SymbolicName: org.eclipse.jgit.junit.http
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-11
@@@ -21,17 -21,17 +21,17 @@@ Import-Package: javax.servlet;version="
   org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
   org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)",
   org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.http.server;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revwalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.resolver;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
-  org.slf4j.helpers;version="[1.7.0,2.0.0)"
+  org.slf4j.helpers;version="[1.7.0,3.0.0)"
 -Export-Package: org.eclipse.jgit.junit.http;version="6.9.0";
 +Export-Package: org.eclipse.jgit.junit.http;version="7.0.0";
    uses:="org.eclipse.jgit.transport,
     org.eclipse.jgit.junit,
     javax.servlet.http,

diff --cc org.eclipse.jgit.junit.http/pom.xml
Simple merge

diff --cc org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index f80f86a68b7ff147e912de4e569a18ab54ed7238,fd8ea08e0fc599278d57144c83902cbed4a6d4de..9bad75f28ef40c00ee98b70761510d0bb8db6964
--- 1/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@@ -3,46 -3,46 +3,46 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.junit.ssh
  Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-11
- Import-Package: org.apache.sshd.common;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.config.keys;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.file.virtualfs;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.helpers;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.io;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.kex;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.keyprovider;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.session;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.signature;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.buffer;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.logging;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.security;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.threads;version="[2.8.0,2.9.0)",
-  org.apache.sshd.core;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.auth;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.auth.gss;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.auth.keyboard;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.auth.password;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.command;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.session;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.shell;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.subsystem;version="[2.8.0,2.9.0)",
-  org.apache.sshd.sftp;version="[2.8.0,2.9.0)",
-  org.apache.sshd.sftp.server;version="[2.8.0,2.9.0)",
+ Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.io;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.kex;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.session;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.signature;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)",
+  org.apache.sshd.core;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.auth;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.command;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.session;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.shell;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)",
+  org.apache.sshd.sftp;version="[2.12.0,2.13.0)",
+  org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)",
 - org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revwalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
-  org.slf4j;version="[1.7.0,2.0.0)"
+  org.slf4j;version="[1.7.0,3.0.0)"
 -Export-Package: org.eclipse.jgit.junit.ssh;version="6.9.0"
 +Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.0"

diff --cc org.eclipse.jgit.junit.ssh/pom.xml
Simple merge

diff --cc org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index c72d302c27e7ba2bf34802f0cdefc3ff9a3ae937,89d6eea2f9c9cf761c7144f9087c67f3820bf906..a58b78724ec6edb61d060d171392c4d7867845c3
--- 1/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@@ -3,35 -3,36 +3,36 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.junit
  Bundle-SymbolicName: org.eclipse.jgit.junit
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-11
 -Import-Package: org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.dircache;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.pack;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.util;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.merge;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revwalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="6.9.0",
 - org.eclipse.jgit.treewalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.treewalk.filter;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util.io;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util.time;version="[6.9.0,6.10.0)",
 +Import-Package: org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)",
++ org.eclipse.jgit.internal.util;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.merge;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="7.0.0",
 + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util.time;version="[7.0.0,7.1.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.rules;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)",
   org.junit.runners;version="[4.13,5.0.0)",
   org.junit.runners.model;version="[4.13,5.0.0)",
-  org.slf4j;version="[1.7.0,2.0.0)"
+  org.slf4j;version="[1.7.0,3.0.0)"
 -Export-Package: org.eclipse.jgit.junit;version="6.9.0";
 +Export-Package: org.eclipse.jgit.junit;version="7.0.0";
    uses:="org.eclipse.jgit.dircache,
     org.eclipse.jgit.lib,
     org.eclipse.jgit.revwalk,

diff --cc org.eclipse.jgit.junit/pom.xml
Simple merge

diff --cc org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index e16a85c722b0d5c4a0d5e544deeefe0b297640c0,feb7acd4bcafafdc4e6125137f23770e54ee3c6a..6f140144246b312f513b6b0c7590fb86de997d2a
--- 1/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
@@@ -3,13 -3,13 +3,13 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.lfs.server
  Bundle-SymbolicName: org.eclipse.jgit.lfs.server
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
 -Export-Package: org.eclipse.jgit.lfs.server;version="6.9.0";
 +Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0";
    uses:="javax.servlet.http,
     org.eclipse.jgit.lfs.lib",
 - org.eclipse.jgit.lfs.server.fs;version="6.9.0";
 + org.eclipse.jgit.lfs.server.fs;version="7.0.0";
    uses:="javax.servlet,
     javax.servlet.http,
     org.eclipse.jgit.lfs.server,
@@@ -24,15 -24,15 +24,15 @@@ Import-Package: com.google.gson;version
   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.9.0,6.10.0)",
 - org.eclipse.jgit.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lfs.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lfs.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lfs.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.nls;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.http;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.http.apache;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lfs.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
-  org.slf4j;version="[1.7.0,2.0.0)"
+  org.slf4j;version="[1.7.0,3.0.0)"

diff --cc org.eclipse.jgit.lfs.server/pom.xml
Simple merge

diff --cc org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index d19f613e57065c1642eb1294f333d738cd95595e,39f6dceedfc577c9fda7cae0f22ad730343107e1..a21894cdb56f7e1d560b8ddc3a30bf3ea78dcd9f
--- 1/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@@ -3,13 -3,13 +3,13 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.lfs
  Bundle-SymbolicName: org.eclipse.jgit.lfs
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
 -Export-Package: org.eclipse.jgit.lfs;version="6.9.0",
 - org.eclipse.jgit.lfs.errors;version="6.9.0",
 - org.eclipse.jgit.lfs.internal;version="6.9.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
 - org.eclipse.jgit.lfs.lib;version="6.9.0"
 +Export-Package: org.eclipse.jgit.lfs;version="7.0.0",
 + org.eclipse.jgit.lfs.errors;version="7.0.0",
 + org.eclipse.jgit.lfs.internal;version="7.0.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server",
 + org.eclipse.jgit.lfs.lib;version="7.0.0"
  Bundle-RequiredExecutionEnvironment: JavaSE-11
  Import-Package: com.google.gson;version="[2.8.2,3.0.0)",
   com.google.gson.stream;version="[2.8.2,3.0.0)",

diff --cc org.eclipse.jgit.lfs/pom.xml
Simple merge

diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml
Simple merge

diff --cc org.eclipse.jgit.packaging/pom.xml
Simple merge

diff --cc org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 5a38ce7fd63dc39f301dd243984135b08625d15b,b89be19a816e38e20c1efc7ec291b34cf0aacf3d..bcb086f2acee2a18ee8534db0b9d5fb138107b02
--- 1/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@@ -3,9 -3,9 +3,9 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.pgm
  Bundle-SymbolicName: org.eclipse.jgit.pgm
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-Vendor: %Bundle-Vendor
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-RequiredExecutionEnvironment: JavaSE-11
  Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
   org.apache.commons.logging;version="[1.2,2.0)",

diff --cc org.eclipse.jgit.pgm/pom.xml
Simple merge

diff --cc org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
index 5675cf49981840e79a6620cb83dd3f33281230b9,bf4e820604fbc92703ee732714f0d039ebbd9d4d..c353cb6eba8fb2290e7862c6970feb292a639e90
--- 1/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF
@@@ -2,9 -2,10 +2,10 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: %Bundle-Name
  Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
+ Bundle-Localization: OSGI-INF/l10n/agent
  Bundle-Vendor: %Bundle-Vendor
 -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.9.0,6.10.0)"
 +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)"
  Bundle-ActivationPolicy: lazy
  Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent
  Bundle-RequiredExecutionEnvironment: JavaSE-11

diff --cc org.eclipse.jgit.ssh.apache.agent/pom.xml
Simple merge

diff --cc org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
index 0d046c86bb7628d963b9e6c79f27f817a10c4050,6620408dbdd5c4feaa15909209d1a5d17e28f327..03f6d22a3ce73f7f00c82dd9678c494f47dbdc01
--- 1/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@@ -7,31 -7,31 +7,31 @@@ Bundle-Version: 7.0.0.qualifie
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: plugin
  Bundle-RequiredExecutionEnvironment: JavaSE-11
- Import-Package: org.apache.sshd.client.config.hosts;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.auth;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.config.keys;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.helpers;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.kex;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.keyprovider;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.session;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.signature;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.net;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.security;version="[2.8.0,2.9.0)",
-  org.apache.sshd.core;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.forward;version="[2.8.0,2.9.0)",
+ Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
+ Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.auth;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.kex;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.session;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.signature;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)",
+  org.apache.sshd.core;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.forward;version="[2.12.0,2.13.0)",
 - org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit.ssh;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.sshd;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.sshd.agent;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.api;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit.ssh;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.sshd.agent;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
-  org.hamcrest;version="[1.1.0,3.0.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)"

diff --cc org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index f24ff8021854d106dc95200a919cb57101fa73d8,d95c7ed62b8eec618707cffa85a6aaa6e3b30483..2318a0e9c259ec7fffb5648b2448bd6995caa3b3
--- 1/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@@ -4,11 -4,11 +4,11 @@@ Bundle-Name: %Bundle-Nam
  Automatic-Module-Name: org.eclipse.jgit.ssh.apache
  Bundle-SymbolicName: org.eclipse.jgit.ssh.apache
  Bundle-Vendor: %Bundle-Vendor
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-ActivationPolicy: lazy
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-RequiredExecutionEnvironment: JavaSE-11
 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.9.0";x-internal:=true;
 +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true;
    uses:="org.apache.sshd.client,
     org.apache.sshd.client.auth,
     org.apache.sshd.client.auth.keyboard,
@@@ -23,75 -23,77 +23,77 @@@
     org.apache.sshd.common.signature,
     org.apache.sshd.common.util.buffer,
     org.eclipse.jgit.transport",
 - org.eclipse.jgit.internal.transport.sshd.agent;version="6.9.0";x-internal:=true,
 - org.eclipse.jgit.internal.transport.sshd.auth;version="6.9.0";x-internal:=true,
 - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="6.9.0";x-internal:=true,
 - org.eclipse.jgit.internal.transport.sshd.proxy;version="6.9.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
 - org.eclipse.jgit.transport.sshd;version="6.9.0";
 + org.eclipse.jgit.internal.transport.sshd.agent;version="7.0.0";x-internal:=true,
 + org.eclipse.jgit.internal.transport.sshd.auth;version="7.0.0";x-internal:=true,
++ org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.0.0";x-internal:=true,
 + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.0.0";x-friends:="org.eclipse.jgit.ssh.apache.test",
 + org.eclipse.jgit.transport.sshd;version="7.0.0";
    uses:="org.eclipse.jgit.transport,
     org.apache.sshd.client.config.hosts,
     org.apache.sshd.common.keyprovider,
     org.eclipse.jgit.util,
     org.apache.sshd.client.session,
     org.apache.sshd.client.keyverifier",
-  org.eclipse.jgit.transport.sshd.agent;version="7.0.0"
 - org.eclipse.jgit.transport.sshd.agent;version="6.9.0",
++ org.eclipse.jgit.transport.sshd.agent;version="7.0.0",
+  sun.security.x509
  Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
-  org.apache.sshd.agent;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.auth;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.auth.keyboard;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.auth.password;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.auth.pubkey;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.channel;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.config.hosts;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.config.keys;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.future;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.keyverifier;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.session;version="[2.8.0,2.9.0)",
-  org.apache.sshd.client.session.forward;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.auth;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.channel;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.compression;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.config.keys;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.config.keys.loader;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.config.keys.u2f;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.digest;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.forward;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.future;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.helpers;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.io;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.kex;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.kex.extension;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.kex.extension.parser;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.keyprovider;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.mac;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.random;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.session;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.session.helpers;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.signature;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.buffer;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.buffer.keys;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.closeable;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.io;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.io.der;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.io.functors;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.io.resource;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.logging;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.net;version="[2.8.0,2.9.0)",
-  org.apache.sshd.common.util.security;version="[2.8.0,2.9.0)",
-  org.apache.sshd.core;version="[2.8.0,2.9.0)",
-  org.apache.sshd.server.auth;version="[2.8.0,2.9.0)",
-  org.apache.sshd.sftp;version="[2.8.0,2.9.0)",
-  org.apache.sshd.sftp.client;version="[2.8.0,2.9.0)",
-  org.apache.sshd.sftp.common;version="[2.8.0,2.9.0)",
+  org.apache.sshd.agent;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.auth;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.auth.keyboard;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.auth.password;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.auth.pubkey;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.channel;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.config.keys;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.future;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.keyverifier;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.session;version="[2.12.0,2.13.0)",
+  org.apache.sshd.client.session.forward;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.auth;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.channel;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.compression;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.config.keys.loader;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.config.keys.u2f;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.digest;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.forward;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.future;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.io;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.kex;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.kex.extension;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.kex.extension.parser;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.mac;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.random;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.session;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.session.helpers;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.signature;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.buffer.keys;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.closeable;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.io;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.io.der;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.io.functors;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.io.resource;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)",
+  org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)",
+  org.apache.sshd.core;version="[2.12.0,2.13.0)",
+  org.apache.sshd.server.auth;version="[2.12.0,2.13.0)",
+  org.apache.sshd.sftp;version="[2.12.0,2.13.0)",
+  org.apache.sshd.sftp.client;version="[2.12.0,2.13.0)",
+  org.apache.sshd.sftp.common;version="[2.12.0,2.13.0)",
 - org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.fnmatch;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.ssh;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.nls;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
-  org.slf4j;version="[1.7.0,2.0.0)"
+  org.slf4j;version="[1.7.0,3.0.0)"

diff --cc org.eclipse.jgit.ssh.apache/pom.xml
Simple merge

diff --cc org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index 7c8ca3ed0bdf23223a436e438dff127cbc4b92e8,b716f645fb134e4c03fd9c013b21cd59d5aa5a64..3218f4b9dd4c82f3ef3932b71e6d66a3fe417787
--- 1/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
@@@ -7,15 -7,15 +7,15 @@@ Bundle-Version: 7.0.0.qualifie
  Bundle-Vendor: %Bundle-Vendor
  Bundle-Localization: plugin
  Bundle-RequiredExecutionEnvironment: JavaSE-11
+ Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)"
  Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit.ssh;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.ssh.jsch;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit.ssh;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.ssh.jsch;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
-  org.hamcrest;version="[1.1.0,3.0.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.junit.runner;version="[4.13,5.0.0)"

diff --cc org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 0b6d57b173b18c2b994ed057183482d8abc9c85c,9b58b249eea86179c66d30e54457151a7cb59175..17fad221811bd06386fd77400d2a00e04a5fedae
--- 1/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
@@@ -3,19 -3,19 +3,19 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit.ssh.jsch
  Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true
 -Fragment-Host: org.eclipse.jgit;bundle-version="[6.9.0,6.10.0)"
 +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)"
  Bundle-Vendor: %Bundle-Vendor
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/jsch
  Bundle-ActivationPolicy: lazy
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
  Bundle-RequiredExecutionEnvironment: JavaSE-11
 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.9.0"
 +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0"
  Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.ssh;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.nls;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util.io;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)",
-  org.slf4j;version="[1.7.0,2.0.0)"
+  org.slf4j;version="[1.7.0,3.0.0)"

diff --cc org.eclipse.jgit.ssh.jsch/pom.xml
Simple merge

diff --cc org.eclipse.jgit.test/META-INF/MANIFEST.MF
index 832a93e5d48b0caca0faff72041adeae4635ea10,d6468c6b69b0175f7875c19f1adcebf7699d348c..f40306347816addae75380c89950fafccf5744bd
--- 1/org.eclipse.jgit.test/META-INF/MANIFEST.MF
--- 2/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@@ -15,65 -18,67 +18,67 @@@ Import-Package: com.googlecode.javaewah
   org.apache.commons.compress.compressors.bzip2;version="[1.15.0,2.0)",
   org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
   org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
+  org.apache.commons.io;version="[2.15.0,3.0.0)",
+  org.apache.commons.io.output;version="[2.15.0,3.0.0)",
   org.assertj.core.api;version="[3.14.0,4.0.0)",
 - org.eclipse.jgit.annotations;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.api.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.archive;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.attributes;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.awtui;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.blame;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.diff;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.dircache;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.errors;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.events;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.fnmatch;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.gitrepo;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.hooks;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.ignore;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.ignore.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.diff;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.diffmergetool;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.fsck;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.revwalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.commitgraph;version="6.9.0",
 - org.eclipse.jgit.internal.storage.dfs;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.io;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.memory;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.pack;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.storage.reftable;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.connectivity;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.http;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.parser;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.internal.transport.ssh;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.junit.time;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lfs;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.lib.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.logging;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.merge;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.nls;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.notes;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.patch;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.pgm;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.pgm.internal;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revplot;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revwalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.revwalk.filter;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.storage.file;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.storage.pack;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.submodule;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.http;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.transport.resolver;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.treewalk;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.treewalk.filter;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util.io;version="[6.9.0,6.10.0)",
 - org.eclipse.jgit.util.sha1;version="[6.9.0,6.10.0)",
 + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.archive;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.awtui;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.blame;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.diff;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.events;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.gitrepo;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.hooks;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.ignore;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.ignore.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.diff;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.diffmergetool;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.fsck;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.revwalk;version="[7.0.0,7.1.0)",
++ org.eclipse.jgit.internal.storage.commitgraph;version="7.0.0",
 + org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.io;version="[7.0.0,7.1.0)",
++ org.eclipse.jgit.internal.storage.memory;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.connectivity;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.http;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.parser;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.junit.time;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.logging;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.merge;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.notes;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.patch;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.pgm;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.pgm.internal;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.revwalk.filter;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.submodule;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)",
 + org.eclipse.jgit.util.sha1;version="[7.0.0,7.1.0)",
-  org.hamcrest;version="[1.1.0,3.0.0)",
-  org.hamcrest.collection;version="[1.1.0,3.0.0)",
   org.junit;version="[4.13,5.0.0)",
   org.junit.experimental.theories;version="[4.13,5.0.0)",
   org.junit.function;version="[4.13.0,5.0.0)",

diff --cc org.eclipse.jgit.test/pom.xml
Simple merge

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

diff --cc org.eclipse.jgit.ui/pom.xml
Simple merge

diff --cc org.eclipse.jgit/META-INF/MANIFEST.MF
index 6efbffdbe8da79de41aa5b0453c27930889244fe,1feae3e4e928f7f0d67b0c61cbdbda1e3c0a9495..0bd81190293e370153a5cc3a3a68b58676247209
--- 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,12 +3,12 @@@ Bundle-ManifestVersion: 
  Bundle-Name: %Bundle-Name
  Automatic-Module-Name: org.eclipse.jgit
  Bundle-SymbolicName: org.eclipse.jgit
 -Bundle-Version: 6.9.0.qualifier
 +Bundle-Version: 7.0.0.qualifier
- Bundle-Localization: plugin
+ Bundle-Localization: OSGI-INF/l10n/plugin
  Bundle-Vendor: %Bundle-Vendor
  Eclipse-ExtensibleAPI: true
 -Export-Package: org.eclipse.jgit.annotations;version="6.9.0",
 - org.eclipse.jgit.api;version="6.9.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,
@@@ -62,25 -62,28 +62,28 @@@
     org.eclipse.jgit.lib,
     org.eclipse.jgit.revwalk,
     org.xml.sax",
 - org.eclipse.jgit.gitrepo.internal;version="6.9.0";x-internal:=true,
 - org.eclipse.jgit.hooks;version="6.9.0";uses:="org.eclipse.jgit.lib",
 - org.eclipse.jgit.ignore;version="6.9.0",
 - org.eclipse.jgit.ignore.internal;version="6.9.0";
 + org.eclipse.jgit.gitrepo.internal;version="7.0.0";x-internal:=true,
 + org.eclipse.jgit.hooks;version="7.0.0";uses:="org.eclipse.jgit.lib",
 + org.eclipse.jgit.ignore;version="7.0.0",
 + org.eclipse.jgit.ignore.internal;version="7.0.0";
    x-friends:="org.eclipse.jgit.test",
 - org.eclipse.jgit.internal;version="6.9.0";
 + org.eclipse.jgit.internal;version="7.0.0";
    x-friends:="org.eclipse.jgit.test,
     org.eclipse.jgit.http.test",
 - org.eclipse.jgit.internal.diff;version="6.9.0";
 + org.eclipse.jgit.internal.diff;version="7.0.0";
    x-friends:="org.eclipse.jgit.test",
 - org.eclipse.jgit.internal.diffmergetool;version="6.9.0";
 + org.eclipse.jgit.internal.diffmergetool;version="7.0.0";
    x-friends:="org.eclipse.jgit.test,
     org.eclipse.jgit.pgm.test,
-    org.eclipse.jgit.pgm",
+    org.eclipse.jgit.pgm,
+    org.eclipse.egit.ui",
 - org.eclipse.jgit.internal.fsck;version="6.9.0";
 + org.eclipse.jgit.internal.fsck;version="7.0.0";
    x-friends:="org.eclipse.jgit.test",
 - org.eclipse.jgit.internal.revwalk;version="6.9.0";
 + org.eclipse.jgit.internal.revwalk;version="7.0.0";
    x-friends:="org.eclipse.jgit.test",
 - org.eclipse.jgit.internal.storage.commitgraph;version="6.9.0";
++ org.eclipse.jgit.internal.storage.commitgraph;version="7.0.0";
+   x-friends:="org.eclipse.jgit.test",
 - org.eclipse.jgit.internal.storage.dfs;version="6.9.0";
 + org.eclipse.jgit.internal.storage.dfs;version="7.0.0";
    x-friends:="org.eclipse.jgit.test,
     org.eclipse.jgit.http.server,
     org.eclipse.jgit.http.test,
@@@ -98,7 -101,9 +101,9 @@@
    x-friends:="org.eclipse.jgit.junit,
     org.eclipse.jgit.test,
     org.eclipse.jgit.pgm",
 - org.eclipse.jgit.internal.storage.memory;version="6.9.0";
++ org.eclipse.jgit.internal.storage.memory;version="7.0.0";
+   x-friends:="org.eclipse.jgit.test",
 - org.eclipse.jgit.internal.storage.pack;version="6.9.0";
 + org.eclipse.jgit.internal.storage.pack;version="7.0.0";
    x-friends:="org.eclipse.jgit.junit,
     org.eclipse.jgit.test,
     org.eclipse.jgit.pgm",
@@@ -119,7 -124,9 +124,9 @@@
    x-friends:="org.eclipse.jgit.ssh.apache,
     org.eclipse.jgit.ssh.jsch,
     org.eclipse.jgit.test",
 - org.eclipse.jgit.internal.util;version="6.9.0";
++ org.eclipse.jgit.internal.util;version="7.0.0";
+   x-friends:=" org.eclipse.jgit.junit",
 - org.eclipse.jgit.lib;version="6.9.0";
 + org.eclipse.jgit.lib;version="7.0.0";
    uses:="org.eclipse.jgit.transport,
     org.eclipse.jgit.util.sha1,
     org.eclipse.jgit.dircache,
@@@ -133,10 -140,12 +140,12 @@@
     org.eclipse.jgit.util,
     org.eclipse.jgit.submodule,
     org.eclipse.jgit.util.time",
 - org.eclipse.jgit.lib.internal;version="6.9.0";
 + org.eclipse.jgit.lib.internal;version="7.0.0";
-   x-friends:="org.eclipse.jgit.test",
+   x-friends:="org.eclipse.jgit.test,
+    org.eclipse.jgit.pgm,
+    org.eclipse.egit.ui",
 - org.eclipse.jgit.logging;version="6.9.0",
 - org.eclipse.jgit.merge;version="6.9.0";
 + org.eclipse.jgit.logging;version="7.0.0",
 + org.eclipse.jgit.merge;version="7.0.0";
    uses:="org.eclipse.jgit.dircache,
     org.eclipse.jgit.lib,
     org.eclipse.jgit.revwalk,

diff --cc org.eclipse.jgit/pom.xml
Simple merge

diff --cc pom.xml
Simple merge