Merge pull request #39 from rykov/master

Upgraded JGit lib from v.4.6.1 to v.4.7.0.
repotag · Apr 6, 2017 · 1bdc37b · 1bdc37b
2 parents c016563 + 3843b59
commit 1bdc37b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/lib/java/jars/org.eclipse.jgit-4.6.1.201703071140-r.jar b/lib/java/jars/org.eclipse.jgit-4.6.1.201703071140-r.jar
diff --git a/lib/java/jars/org.eclipse.jgit-4.7.0.201704051617-r.jar b/lib/java/jars/org.eclipse.jgit-4.7.0.201704051617-r.jar
diff --git a/lib/version.rb b/lib/version.rb
@@ -1,3 +1,3 @@
 module RJGit
-  VERSION = "4.6.1.0"
+  VERSION = "4.7.0.0"
 end
diff --git a/spec/transport_spec.rb b/spec/transport_spec.rb
@@ -5,7 +5,7 @@
 jgit_jar = File.basename(Dir.glob(File.join(dir, "org.eclipse.jgit-*.jar")).first)
 jgit_version = jgit_jar.split("org.eclipse.jgit-").last.split(".jar").first
 
-UPLOAD_PACK_ADVERTISEMENT = "00da55ca9d4360c522d38bc73ef9cce81c2f72c413d5 HEAD\u0000 include-tag multi_ack_detailed multi_ack ofs-delta side-band side-band-64k thin-pack no-progress shallow agent=JGit/4.6.1.201703071140-r symref=HEAD:refs/heads/master\n0044f5771ead0e6d9a8d937bf5cabfa3678ee8944a92 refs/heads/alternative\n003f55ca9d4360c522d38bc73ef9cce81c2f72c413d5 refs/heads/master\n0000"
+UPLOAD_PACK_ADVERTISEMENT = "00da55ca9d4360c522d38bc73ef9cce81c2f72c413d5 HEAD\u0000 include-tag multi_ack_detailed multi_ack ofs-delta side-band side-band-64k thin-pack no-progress shallow agent=JGit/4.7.0.201704051617-r symref=HEAD:refs/heads/master\n0044f5771ead0e6d9a8d937bf5cabfa3678ee8944a92 refs/heads/alternative\n003f55ca9d4360c522d38bc73ef9cce81c2f72c413d5 refs/heads/master\n0000"
 
 CORRECT_UPLOAD_REQUEST = "0067want f5771ead0e6d9a8d937bf5cabfa3678ee8944a92 multi_ack_detailed side-band-64k thin-pack ofs-delta\n00000009done\n" # Correct request for an object
 
@@ -17,7 +17,7 @@
 
 UPLOAD_REQUEST_INVALID_OBJECT = "0067want aaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa multi_ack_detailed side-band-64k thin-pack ofs-delta\n00000009done\n" # Malformed object id requested
 
-RECEIVE_PACK_ADVERTISEMENT = "009df5771ead0e6d9a8d937bf5cabfa3678ee8944a92 refs/heads/alternative\u0000 side-band-64k delete-refs report-status quiet ofs-delta agent=JGit/4.6.1.201703071140-r\n003f55ca9d4360c522d38bc73ef9cce81c2f72c413d5 refs/heads/master\n0000"
+RECEIVE_PACK_ADVERTISEMENT = "009df5771ead0e6d9a8d937bf5cabfa3678ee8944a92 refs/heads/alternative\u0000 side-band-64k delete-refs report-status quiet ofs-delta agent=JGit/4.7.0.201704051617-r\n003f55ca9d4360c522d38bc73ef9cce81c2f72c413d5 refs/heads/master\n0000"
 
 CORRECT_RECEIVE_REQUEST = "00820000000000000000000000000000000000000000 0ed348defdb66282b02803a8836c5d5fc5b97d0d refs/heads/test\x00 report-status side-band-64k0000PACK\x00\x00\x00\x02\x00\x00\x00\x00\x02\x9D\b\x82;\xD8\xA8\xEA\xB5\x10\xADj\xC7\\\x82<\xFD>\xD3\x1E" # Client pushes a valid object-id