diff --git a/lib/git.rb b/lib/git.rb index 86a3182..8468590 100644 --- a/lib/git.rb +++ b/lib/git.rb @@ -13,7 +13,7 @@ module RJGit import 'org.eclipse.jgit.diff.DiffEntry' import 'org.eclipse.jgit.treewalk.filter.PathFilter' import 'org.eclipse.jgit.api.TransportConfigCallback' - import 'org.eclipse.jgit.transport.JschConfigSessionFactory' + import 'org.eclipse.jgit.transport.ssh.jsch.JschConfigSessionFactory' import 'org.eclipse.jgit.transport.SshTransport' import 'org.eclipse.jgit.revwalk.FollowFilter' import 'org.eclipse.jgit.revwalk.TreeRevFilter' diff --git a/lib/java/jars/jsch-0.1.54.jar b/lib/java/jars/jsch-0.1.55.jar similarity index 78% rename from lib/java/jars/jsch-0.1.54.jar rename to lib/java/jars/jsch-0.1.55.jar index 1372c8e..1a64e71 100644 Binary files a/lib/java/jars/jsch-0.1.54.jar and b/lib/java/jars/jsch-0.1.55.jar differ diff --git a/lib/java/jars/org.eclipse.jgit-6.1.0.202203080745-r.jar b/lib/java/jars/org.eclipse.jgit-6.2.0.202206071550-r.jar similarity index 69% rename from lib/java/jars/org.eclipse.jgit-6.1.0.202203080745-r.jar rename to lib/java/jars/org.eclipse.jgit-6.2.0.202206071550-r.jar index 5b1487e..c77bc6f 100644 Binary files a/lib/java/jars/org.eclipse.jgit-6.1.0.202203080745-r.jar and b/lib/java/jars/org.eclipse.jgit-6.2.0.202206071550-r.jar differ diff --git a/lib/java/jars/org.eclipse.jgit.ssh.jsch-5.13.0.202109080827-r.jar b/lib/java/jars/org.eclipse.jgit.ssh.jsch-5.13.0.202109080827-r.jar deleted file mode 100644 index 9b4905c..0000000 Binary files a/lib/java/jars/org.eclipse.jgit.ssh.jsch-5.13.0.202109080827-r.jar and /dev/null differ diff --git a/lib/java/jars/org.eclipse.jgit.ssh.jsch-6.2.0.202206071550-r.jar b/lib/java/jars/org.eclipse.jgit.ssh.jsch-6.2.0.202206071550-r.jar new file mode 100644 index 0000000..03aae76 Binary files /dev/null and b/lib/java/jars/org.eclipse.jgit.ssh.jsch-6.2.0.202206071550-r.jar differ diff --git a/lib/version.rb b/lib/version.rb index 6df4879..c6081ef 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -1,3 +1,3 @@ module RJGit - VERSION = "6.1.0.0" + VERSION = "6.2.0.0" end diff --git a/rjgit.gemspec b/rjgit.gemspec index 95607a2..dd40744 100644 --- a/rjgit.gemspec +++ b/rjgit.gemspec @@ -15,7 +15,6 @@ Gem::Specification.new do |s| s.homepage = "https://github.com/repotag/rjgit" s.require_paths = ["lib"] s.files = Dir['lib/**/*.rb'] + ["README.md", "LICENSE", "Gemfile"] + Dir['lib/java/jars/*.jar'] - s.has_rdoc = true s.extra_rdoc_files = ["README.md"] s.licenses = ['Modified BSD', 'EPL'] s.rdoc_options = ["--charset=UTF-8"] diff --git a/spec/git_spec.rb b/spec/git_spec.rb index 2aaed18..1611856 100644 --- a/spec/git_spec.rb +++ b/spec/git_spec.rb @@ -315,7 +315,7 @@ def create_dummy_session(options) it "configures for ssh default behavior when no specifics given" do options = {} - allow_any_instance_of(::Java::OrgEclipseJgitTransport.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) + allow_any_instance_of(::Java::OrgEclipseJgitTransportSshJsch.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) expect(dummy_session).to_not receive(:setUserName) expect(dummy_session).to_not receive(:setPassword) expect(dummy_j_sch).to_not receive(:removeAllIdentity) @@ -327,7 +327,7 @@ def create_dummy_session(options) it "configures for a specific known hosts file if options[:known_hosts_file]" do options = {known_hosts_file: 'aknownhostsfile'} - allow_any_instance_of(::Java::OrgEclipseJgitTransport.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) + allow_any_instance_of(::Java::OrgEclipseJgitTransportSshJsch.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) expect(dummy_session).to_not receive(:setUserName) expect(dummy_session).to_not receive(:setPassword) expect(dummy_j_sch).to_not receive(:removeAllIdentity) @@ -339,7 +339,7 @@ def create_dummy_session(options) it "configures for a specific private key file if options[:private_key_file]" do options = {private_key_file: 'aprivatekeyfile'} - allow_any_instance_of(::Java::OrgEclipseJgitTransport.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) + allow_any_instance_of(::Java::OrgEclipseJgitTransportSshJsch.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) expect(dummy_session).to_not receive(:setUserName) expect(dummy_session).to_not receive(:setPassword) expect(dummy_j_sch).to receive(:removeAllIdentity).with(no_args).and_return(true) @@ -351,7 +351,7 @@ def create_dummy_session(options) it "configures for a specific encrypted private key file if options[:private_key_file] and options[:priavte_key_passphrase]" do options = {private_key_file: 'something', private_key_passphrase: 'another_thing'} - allow_any_instance_of(::Java::OrgEclipseJgitTransport.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) + allow_any_instance_of(::Java::OrgEclipseJgitTransportSshJsch.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) expect(dummy_session).to_not receive(:setUserName) expect(dummy_session).to_not receive(:setPassword) expect(dummy_j_sch).to receive(:removeAllIdentity).with(no_args) @@ -364,7 +364,7 @@ def create_dummy_session(options) it "configures for ssh username if options[:username]" do options = {username: 'gituser'} allow(dummy_session).to receive(:setUserName) - allow_any_instance_of(::Java::OrgEclipseJgitTransport.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) + allow_any_instance_of(::Java::OrgEclipseJgitTransportSshJsch.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) expect(dummy_session).to receive(:setUserName).with(options[:username]) expect(dummy_session).to_not receive(:setPassword) expect(dummy_j_sch).to_not receive(:removeAllIdentity) @@ -377,7 +377,7 @@ def create_dummy_session(options) it "configures for ssh password if options[:password]" do options = {password: 'something'} allow(dummy_session).to receive(:setUserName) - allow_any_instance_of(::Java::OrgEclipseJgitTransport.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) + allow_any_instance_of(::Java::OrgEclipseJgitTransportSshJsch.JschConfigSessionFactory).to receive(:createDefaultJSch).and_return(dummy_j_sch) expect(dummy_session).to_not receive(:setUserName) expect(dummy_session).to receive(:setPassword).with(options[:password]) expect(dummy_j_sch).to_not receive(:removeAllIdentity)