JGIT SSH commit signing / NetBinox removal / JNA as OSGI bundle#9472
Open
matthiasblaesing wants to merge 11 commits into
Open
JGIT SSH commit signing / NetBinox removal / JNA as OSGI bundle#9472matthiasblaesing wants to merge 11 commits into
matthiasblaesing wants to merge 11 commits into
Conversation
Netbinox is a patched version of Equinox (the Eclipse OSGI runtime conainer). The patch is bases on a Equinox version from 2014. The patch was evolved to allow "Import-Package" declaration for JDK packages if they are declared optional. This works as long as the imports are declared optional. This is not the case for a growing number of libraries. NetBeans already carries an up-to-date OSGI container (Apache Felix), so use that and drop the custom dependency. In the wake of this the following modules were removed too: - o.eclipse.core.contenttype - o.eclipse.core.jobs - o.eclipse.core.net - o.eclipse.core.runtime - o.eclipse.core.runtime.compatibility.auth - o.eclipse.equinox.app - o.eclipse.equinox.common - o.eclipse.equinox.preferences - o.eclipse.equinox.registry - o.eclipse.equinox.security It is assumed that equinox was added to be able to run eclise modules, which in turn were required for Mylin (Bugtracking integration). The latter was dropped, so the dependencies should be removed to reduce the dependency footprint.
…tom wrapping JNA provides OSGI header and this can (and does) lead to the problem where libraries depend on the bundle name of JNA. The triggering problem was org.eclipse.jgit.ssh.apache.agent, which has said bundle dependency. The NetBeans modules were retained to provide the following: - jna + jna-platform: provide module-auto-deps.xml so that modules depending on older versions of the modules will automatically get the new dependency - jna: overide the default library loading
This adds the required dependencies and switches the jgit ssh integration from JSch to Apache Mina. This adds four new dependencies: - Apache MINA SSH Client implementation (org.apache.sshd:sshd-osgi and org.apache.sshd:sshd-sftp) - JGIT ssh client implementation using Apache MINA (inkl. the ssh-agent integration) Adjustments to the implementation: - The jgit integration for mina does not query the credential provider for a passphrase when opening the identity file, but instead uses a password callback (existing Credentialsprovider was adjusted to tollerate this) - The NetBeans ssh connection settings allow to choose between username/password and key authentication. There is no fallback between the two. The concept of a custom SshSessionFactory was transfered from the jsch implementation and reimplemented on top of the mina integration.
The patching was in place to enable loading commons-lang3 into the NetBinox container (patched equinox). With NetBinox dropped in favor of Apache Felix, this can be now removed.
matthiasblaesing
added
DO NOT squash
git
To be squashed into 68185e6
Member
|
Only glanced at this. Generally looks good, but I have concerns about all the changes to JNA. I also wonder how many people are using JNA in the platform without an OSGi framework included. Are there other ways of ensuring the right bundle name is seen from the NetBeans module? Does using both manifest keys work (eg. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The primary motivation of this PR is moving the ssh support for JGIT from JSch to the Apache Mina based implementation. According to the JGIT project support for JSch is deprecated and there are no plans to move from the unmaintained version
com.jcraft:jschtocom.github.mwiede:jsch.The move to the Mina based client is also required to enable SSH signing of commits.
As preparation NetBinox, the one of the two OSGI implementations NetBeans currently offers, is dropped as it is essentially unmaintained.
A second necessary preparation is to make JNA available as an OSGI bundle of the correct name. JNA was available to the OSGI environment via package imports, but the agent integration code of jgit declares a bundle requirement and thus needs the correct name. The current NetBeans module wrapper was dropped in favor of the raw JNA bundles (JNA und JNA-platform both declare OSGI metadata).
Closes: #9471
Closes: #7572