From d552d603a8728adb8c80e2c36bb5483a8a38d9a6 Mon Sep 17 00:00:00 2001 From: Kyle Banker Date: Wed, 10 Aug 2011 14:14:52 -0400 Subject: [PATCH] RUBY-279 update to Java driver 2.6.5 --- Rakefile | 5 ++--- ext/java/jar/jbson.jar | Bin 14630 -> 14619 bytes ext/java/src/org/jbson/RubyBSONCallback.java | 9 ++------- ext/java/src/org/jbson/RubyBSONDecoder.java | 2 +- lib/bson.rb | 2 +- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Rakefile b/Rakefile index 838c6e1..d684254 100644 --- a/Rakefile +++ b/Rakefile @@ -22,12 +22,11 @@ namespace :build do jar_dir = File.join(java_dir, 'jar') jruby_jar = File.join(jar_dir, 'jruby.jar') - mongo_jar = File.join(jar_dir, 'mongo-2.4.jar') - bson_jar = File.join(jar_dir, 'bson-2.2.jar') + mongo_jar = File.join(jar_dir, 'mongo-2.6.5.jar') src_base = File.join(java_dir, 'src') - system("javac -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar}:#{bson_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}") + system("javac -Xlint:deprecation -Xlint:unchecked -classpath #{jruby_jar}:#{mongo_jar} #{File.join(src_base, 'org', 'jbson', '*.java')}") system("cd #{src_base} && jar cf #{File.join(jar_dir, 'jbson.jar')} #{File.join('.', 'org', 'jbson', '*.class')}") end end diff --git a/ext/java/jar/jbson.jar b/ext/java/jar/jbson.jar index 187ccf064bcee4678b9ca04fbb7a9e4d08a39ff2..6f204b1bcecbd570c4b43cbc9f4c6ded009a90ac 100644 GIT binary patch delta 5043 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