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 187ccf0..6f204b1 100644 Binary files a/ext/java/jar/jbson.jar and b/ext/java/jar/jbson.jar differ diff --git a/ext/java/src/org/jbson/RubyBSONCallback.java b/ext/java/src/org/jbson/RubyBSONCallback.java index ed70640..eb81f72 100644 --- a/ext/java/src/org/jbson/RubyBSONCallback.java +++ b/ext/java/src/org/jbson/RubyBSONCallback.java @@ -297,14 +297,9 @@ public class RubyBSONCallback implements BSONCallback { return result; } + @Deprecated public void gotBinaryArray( String name , byte[] b ) { - RubyArray a = ja2ra( b ); - - Object[] args = new Object[] { a, 2 }; - - Object result = JavaEmbedUtils.invokeMethod(_runtime, _rbclsBinary, "new", args, Object.class); - - _put( name, (RubyObject)result ); + /* Deprecated */ } // TODO: fix abs stuff here. some kind of bad type issue diff --git a/ext/java/src/org/jbson/RubyBSONDecoder.java b/ext/java/src/org/jbson/RubyBSONDecoder.java index 892e677..bd17cb0 100644 --- a/ext/java/src/org/jbson/RubyBSONDecoder.java +++ b/ext/java/src/org/jbson/RubyBSONDecoder.java @@ -12,7 +12,7 @@ import org.bson.*; import org.bson.io.*; import org.bson.types.*; -public class RubyBSONDecoder extends BSONDecoder { +public class RubyBSONDecoder extends BasicBSONDecoder { protected void _binary( String name ) throws IOException { diff --git a/lib/bson.rb b/lib/bson.rb index 090fbbf..fee8cba 100644 --- a/lib/bson.rb +++ b/lib/bson.rb @@ -56,7 +56,7 @@ end if RUBY_PLATFORM =~ /java/ jar_dir = File.join(File.dirname(__FILE__), '..', 'ext', 'java', 'jar') - require File.join(jar_dir, 'mongo-2.4.jar') + require File.join(jar_dir, 'mongo-2.6.5.jar') require File.join(jar_dir, 'jbson.jar') require 'bson/bson_java' module BSON