[jruby] 01/04: Merge tag 'upstream/1.7.25'
Miguel Landaeta
nomadium at moszumanska.debian.org
Sat Apr 23 14:35:27 UTC 2016
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository jruby.
commit 17ab400bdea503b59c00d2f5bb3a0fc57d876e9f
Merge: 4f4ee43 bffc974
Author: Miguel Landaeta <nomadium at debian.org>
Date: Sat Apr 23 15:10:47 2016 +0100
Merge tag 'upstream/1.7.25'
Upstream release 1.7.25
# gpg: Signature made Sat 23 Apr 2016 02:41:14 PM IST using RSA key ID 8957CDA5
# gpg: Good signature from "Miguel Landaeta <miguel at miguel.cc>"
# gpg: aka "Miguel Landaeta <nomadium at gmail.com>"
# gpg: aka "Miguel Landaeta (LDC) <miguel at ldc.usb.ve>"
# gpg: aka "Miguel Landaeta (Debian) <nomadium at debian.org>"
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 49519 bytes
.mvn/wrapper/maven-wrapper.properties | 1 +
.travis.yml | 1 -
VERSION | 2 +-
antlib/extra.xml | 14 +-
appveyor.yml | 40 +
build.xml | 5 +
core/pom.xml | 25 +-
core/src/main/java/org/jruby/BasicObjectStub.java | 6 +-
core/src/main/java/org/jruby/Main.java | 2 -
core/src/main/java/org/jruby/NativeException.java | 25 +-
core/src/main/java/org/jruby/Ruby.java | 49 +-
core/src/main/java/org/jruby/RubyBasicObject.java | 8 +-
.../main/java/org/jruby/RubyClassPathVariable.java | 8 +-
core/src/main/java/org/jruby/RubyDir.java | 8 +-
core/src/main/java/org/jruby/RubyException.java | 2 +-
core/src/main/java/org/jruby/RubyFile.java | 231 ++-
core/src/main/java/org/jruby/RubyFileStat.java | 25 +-
core/src/main/java/org/jruby/RubyFixnum.java | 2 +-
core/src/main/java/org/jruby/RubyHash.java | 15 +-
core/src/main/java/org/jruby/RubyIO.java | 971 ++++-----
.../main/java/org/jruby/RubyInstanceConfig.java | 250 +--
core/src/main/java/org/jruby/RubyModule.java | 53 +-
core/src/main/java/org/jruby/RubyObjectSpace.java | 22 +-
core/src/main/java/org/jruby/RubyProc.java | 74 +-
core/src/main/java/org/jruby/RubyString.java | 27 +-
core/src/main/java/org/jruby/RubySymbol.java | 5 +
.../src/main/java/org/jruby/ast/util/ArgsUtil.java | 2 +-
.../main/java/org/jruby/compiler/ASTInspector.java | 3 +-
.../java/org/jruby/embed/ScriptingContainer.java | 19 +-
.../java/org/jruby/exceptions/RaiseException.java | 40 +-
.../jruby/ext/bigdecimal/BigDecimalLibrary.java | 3 +
.../org/jruby/ext/bigdecimal/RubyBigDecimal.java | 160 +-
.../org/jruby/ext/coverage/CoverageModule.java | 2 +-
.../main/java/org/jruby/ext/ffi/CallbackInfo.java | 13 +-
.../main/java/org/jruby/ext/ffi/MappedType.java | 4 +-
.../main/java/org/jruby/ext/ffi/StructByValue.java | 6 +-
core/src/main/java/org/jruby/ext/nkf/RubyNKF.java | 83 +-
.../java/org/jruby/ext/psych/PsychLibrary.java | 33 +-
.../main/java/org/jruby/ext/psych/PsychParser.java | 23 +-
.../main/java/org/jruby/ext/psych/PsychToRuby.java | 41 +-
.../main/java/org/jruby/ext/tempfile/Tempfile.java | 34 +-
.../org/jruby/ext/zlib/JZlibRubyGzipWriter.java | 20 +-
.../jruby/internal/runtime/methods/JavaMethod.java | 16 +-
.../org/jruby/java/codegen/RealClassGenerator.java | 58 +-
.../org/jruby/java/dispatch/CallableSelector.java | 204 +-
.../org/jruby/java/invokers/RubyToJavaInvoker.java | 114 +-
.../java/org/jruby/java/proxies/JavaProxy.java | 6 +
.../java/org/jruby/java/proxies/MapJavaProxy.java | 62 +-
core/src/main/java/org/jruby/javasupport/Java.java | 98 +-
.../java/org/jruby/javasupport/JavaSupport.java | 2 +-
.../main/java/org/jruby/javasupport/JavaUtil.java | 10 +-
.../javasupport/binding/ClassInitializer.java | 10 +-
.../jruby/javasupport/proxy/InternalJavaProxy.java | 12 +-
.../jruby/javasupport/proxy/JavaProxyClass.java | 1 -
.../javasupport/proxy/JavaProxyClassFactory.java | 52 +-
.../proxy/JavaProxyInvocationHandler.java | 15 +-
.../java/org/jruby/parser/DefaultRubyParser.java | 2092 ++++++++++----------
.../main/java/org/jruby/parser/DefaultRubyParser.y | 4 +
core/src/main/java/org/jruby/parser/Parser.java | 1 +
.../java/org/jruby/parser/ParserConfiguration.java | 27 +-
.../main/java/org/jruby/parser/ParserSupport.java | 24 +
.../main/java/org/jruby/parser/Ruby19Parser.java | 30 +-
core/src/main/java/org/jruby/parser/Ruby19Parser.y | 24 +-
.../main/java/org/jruby/parser/Ruby20Parser.java | 10 +-
core/src/main/java/org/jruby/parser/Ruby20Parser.y | 4 +
.../src/main/java/org/jruby/parser/RubyParser.java | 2 +
.../src/main/java/org/jruby/runtime/BlockBody.java | 1 +
core/src/main/java/org/jruby/runtime/Helpers.java | 27 +-
.../main/java/org/jruby/runtime/ThreadContext.java | 23 +-
.../org/jruby/runtime/backtrace/TraceType.java | 78 +-
.../jruby/runtime/encoding/EncodingService.java | 71 +-
.../jruby/runtime/load/ClassExtensionLibrary.java | 31 +-
.../java/org/jruby/runtime/load/LoadService.java | 4 +-
.../org/jruby/runtime/marshal/UnmarshalStream.java | 109 +-
.../runtime/profile/builtin/ProfilePrinter.java | 2 +-
.../src/main/java/org/jruby/util/ConvertBytes.java | 72 +-
.../main/java/org/jruby/util/JRubyClassLoader.java | 19 +-
.../main/java/org/jruby/util/ShellLauncher.java | 20 +-
core/src/main/java/org/jruby/util/URLResource.java | 2 +-
.../java/org/jruby/util/cli/ArgumentProcessor.java | 39 +-
.../util/collections/NonBlockingHashMapLong.java | 1569 +++++++++++++++
.../java/org/jruby/util/io/CRLFStreamWrapper.java | 12 +-
.../main/java/org/jruby/util/io/ChannelStream.java | 30 +-
.../main/java/org/jruby/util/io/EncodingUtils.java | 22 +
.../org/jruby/util/io/NonblockWritingStream.java | 12 +
.../main/java/org/jruby/util/io/SelectBlob.java | 74 +-
core/src/main/ruby/jruby/bigdecimal.rb | 113 ++
core/src/main/ruby/jruby/java/core_ext/#object.rb# | 116 ++
core/src/main/ruby/jruby/java/core_ext/module.rb | 26 +-
.../ruby/jruby/kernel/jruby/process_manager.rb | 2 +-
.../org/jruby/embed/ScriptingContainerTest.java | 69 +-
.../java/org/jruby/embed/bsf/JRubyEngineTest.java | 2 +
.../test/java/org/jruby/test/TestLoadService.java | 24 +-
.../java/org/jruby/test/TestMethodFactories.java | 25 +
.../test/java/org/jruby/util/URLResourceTest.java | 32 +-
.../src/test/resources/java_embed_utils/.jrubydir | 0
default.build.properties | 56 -
docs/man/pom.xml | 2 +-
docs/pom.xml | 2 +-
ext/pom.xml | 4 +-
ext/readline/pom.xml | 2 +-
ext/ripper/pom.xml | 4 +-
jruby.bnd.template | 6 -
lib/pom.rb | 88 +-
lib/pom.xml | 37 +-
lib/ruby/1.8/bigdecimal/math.rb | 75 +-
lib/ruby/1.9/bigdecimal/math.rb | 17 +-
lib/ruby/1.9/io/console.rb | 2 +-
lib/ruby/{shared => 1.9}/psych.rb | 270 ++-
lib/ruby/1.9/psych/class_loader.rb | 101 +
lib/ruby/{shared => 1.9}/psych/coder.rb | 0
lib/ruby/{shared => 1.9}/psych/core_ext.rb | 0
lib/ruby/{shared => 1.9}/psych/deprecated.rb | 3 +-
lib/ruby/1.9/psych/exception.rb | 13 +
lib/ruby/{shared => 1.9}/psych/handler.rb | 0
.../psych/handlers/document_stream.rb | 0
.../{shared => 1.9}/psych/handlers/recorder.rb | 0
lib/ruby/{shared => 1.9}/psych/json/ruby_events.rb | 0
lib/ruby/{shared => 1.9}/psych/json/stream.rb | 1 +
.../{shared => 1.9}/psych/json/tree_builder.rb | 0
lib/ruby/{shared => 1.9}/psych/json/yaml_events.rb | 0
lib/ruby/{shared => 1.9}/psych/nodes.rb | 0
lib/ruby/{shared => 1.9}/psych/nodes/alias.rb | 0
lib/ruby/{shared => 1.9}/psych/nodes/document.rb | 0
lib/ruby/{shared => 1.9}/psych/nodes/mapping.rb | 0
lib/ruby/{shared => 1.9}/psych/nodes/node.rb | 4 +-
lib/ruby/{shared => 1.9}/psych/nodes/scalar.rb | 0
lib/ruby/{shared => 1.9}/psych/nodes/sequence.rb | 2 +-
lib/ruby/{shared => 1.9}/psych/nodes/stream.rb | 0
lib/ruby/{shared => 1.9}/psych/omap.rb | 0
lib/ruby/{shared => 1.9}/psych/parser.rb | 0
lib/ruby/{shared => 1.9}/psych/scalar_scanner.rb | 29 +-
lib/ruby/{shared => 1.9}/psych/set.rb | 0
lib/ruby/{shared => 1.9}/psych/stream.rb | 1 +
lib/ruby/1.9/psych/streaming.rb | 27 +
lib/ruby/{shared => 1.9}/psych/syntax_error.rb | 7 +-
lib/ruby/{shared => 1.9}/psych/tree_builder.rb | 0
lib/ruby/1.9/psych/versions.rb | 3 +
lib/ruby/{shared => 1.9}/psych/visitors.rb | 0
.../{shared => 1.9}/psych/visitors/depth_first.rb | 0
lib/ruby/{shared => 1.9}/psych/visitors/emitter.rb | 0
.../{shared => 1.9}/psych/visitors/json_tree.rb | 7 +-
lib/ruby/{shared => 1.9}/psych/visitors/to_ruby.rb | 168 +-
lib/ruby/{shared => 1.9}/psych/visitors/visitor.rb | 0
.../{shared => 1.9}/psych/visitors/yaml_tree.rb | 218 +-
lib/ruby/{shared => 1.9}/psych/y.rb | 2 +
lib/ruby/1.9/win32/registry.rb | 12 +-
lib/ruby/2.0/bigdecimal/math.rb | 17 +-
lib/ruby/shared/jruby/compiler/java_class.rb | 2 +-
lib/ruby/shared/psych/json.rb | 6 -
lib/ruby/shared/psych/streaming.rb | 22 -
maven/jruby-complete/pom.xml | 2 +-
maven/jruby-complete/src/it/integrity/pom.xml | 43 +
.../src/it/integrity/somebin/icecream | 1 +
maven/jruby-complete/src/it/integrity/verify.bsh | 8 +
maven/jruby-dist/pom.rb | 51 +-
maven/jruby-dist/pom.xml | 73 +-
maven/jruby-dist/src/main/assembly/jruby.xml | 42 -
maven/jruby-jars/pom.xml | 6 +-
.../src/test/java/org/example/SimpleTest.java | 3 +-
maven/jruby-noasm/pom.xml | 2 +-
maven/jruby-rake-plugin/pom.xml | 8 +-
maven/jruby-stdlib/pom.rb | 2 +-
maven/jruby-stdlib/pom.xml | 2 +-
maven/jruby/pom.xml | 2 +-
.../src/test/java/org/example/SimpleTest.java | 4 +-
maven/jruby/src/it/j2ee_jetty/pom.rb | 4 +
.../src/it/j2ee_jetty/src/main/webapp/index.jsp | 3 +
maven/jruby/src/it/j2ee_jetty_rack/Mavenfile | 4 +
maven/jruby/src/it/j2ee_jetty_rack/config.ru | 3 +-
maven/jruby/src/it/j2ee_tomcat/pom.rb | 4 +
.../src/it/j2ee_tomcat/src/main/webapp/index.jsp | 3 +
maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile | 4 +
maven/jruby/src/it/j2ee_tomcat_rack/config.ru | 3 +-
maven/jruby/src/it/j2ee_wildfly/pom.rb | 7 +-
maven/jruby/src/it/j2ee_wildfly/pom.xml | 1 +
.../src/it/j2ee_wildfly/src/main/webapp/index.jsp | 3 +
maven/jruby/src/it/runnable/spec/one_spec.rb | 2 +-
maven/pom.rb | 2 +-
maven/pom.xml | 3 +-
mvnw | 234 +++
mvnw.cmd | 145 ++
pom.xml | 18 +-
rakelib/commands.rake | 1 +
rakelib/test.rake | 5 +-
spec/compiler/general_spec.rb | 16 +-
spec/compiler/rubyscript_spec.rb | 2 +-
spec/compiler/skinnymethodadapter_spec.rb | 10 +-
spec/java_integration/classes/name_spec.rb | 30 +
spec/java_integration/fixtures/InnerClasses.java | 49 +
spec/java_integration/fixtures/MethodNames.java | 10 +-
.../interfaces/java8_methods_spec.rb | 91 +
.../jrubyc/java/implements_spec.rb | 4 +-
spec/java_integration/methods/naming_spec.rb | 5 +
spec/java_integration/object/marshal_spec.rb | 56 +-
spec/java_integration/packages/access_spec.rb | 6 +-
spec/java_integration/spec_helper.rb | 9 +-
spec/java_integration/types/coercion_spec.rb | 136 +-
spec/java_integration/types/retrieval_spec.rb | 24 +-
spec/profiler/json_profile_printer_spec.rb | 4 +-
spec/profiler/runtime_spec.rb | 4 +-
spec/regression/GH-1371_gzip_spec.rb | 41 +
spec/ruby/core/io/gets_spec.rb | 2 +-
spec/ruby/core/io/read_spec.rb | 2 +-
spec/tags/1.8/ruby/core/file/dirname_tags.txt | 1 -
.../1.8/ruby/language/regexp/modifiers_tags.txt | 3 +-
spec/tags/1.9/ruby/core/file/dirname_tags.txt | 2 +-
.../language/regexp/character_classes_tags.txt | 1 +
.../1.9/ruby/language/regexp/modifiers_tags.txt | 1 +
test/externals/ruby1.8/logger/test_logger.rb | 1 +
test/externals/ruby1.8/ruby/test_marshal.rb | 15 +-
.../ruby1.9/bigdecimal/test_bigdecimal.rb | 46 +-
.../ruby1.9/excludes/OpenSSL/TestPKCS12.rb | 5 +-
.../ruby1.9/excludes/OpenSSL/TestPKCS7.rb | 3 +
.../ruby1.9/excludes/OpenSSL/TestPKeyDSA.rb | 3 +
.../ruby1.9/excludes/OpenSSL/TestPKeyRSA.rb | 3 +
.../externals/ruby1.9/excludes/OpenSSL/TestPair.rb | 1 +
.../ruby1.9/excludes/Psych/TestDateTime.rb | 1 +
test/externals/ruby1.9/excludes/TestArgf.rb | 1 +
.../excludes/TestCSV/Interface/DifferentOFS.rb | 3 +
test/externals/ruby1.9/excludes/TestClass.rb | 1 +
.../ruby1.9/excludes/TestEncodingConverter.rb | 4 +
test/externals/ruby1.9/excludes/TestException.rb | 5 +-
test/externals/ruby1.9/excludes/TestFiber.rb | 3 +
test/externals/ruby1.9/excludes/TestFile.rb | 4 +
.../ruby1.9/excludes/TestFileExhaustive.rb | 20 +
test/externals/ruby1.9/excludes/TestFileUtils.rb | 19 +
test/externals/ruby1.9/excludes/TestFind.rb | 4 +
test/externals/ruby1.9/excludes/TestIO.rb | 7 +
test/externals/ruby1.9/excludes/TestIO_M17N.rb | 5 +
test/externals/ruby1.9/excludes/TestIntegration.rb | 5 +
test/externals/ruby1.9/excludes/TestLogDevice.rb | 3 +
test/externals/ruby1.9/excludes/TestMarshal.rb | 1 +
test/externals/ruby1.9/excludes/TestModule.rb | 1 +
test/externals/ruby1.9/excludes/TestMonitor.rb | 3 +
test/externals/ruby1.9/excludes/TestOpen3.rb | 7 +
test/externals/ruby1.9/excludes/TestPath.rb | 3 +
test/externals/ruby1.9/excludes/TestPathname.rb | 10 +
test/externals/ruby1.9/excludes/TestSignal.rb | 3 +
.../ruby1.9/excludes/TestSocketNonblock.rb | 5 +-
.../ruby1.9/excludes/TestSocket_UNIXSocket.rb | 2 -
test/externals/ruby1.9/excludes/TestString.rb | 3 +
test/externals/ruby1.9/logger/test_logger.rb | 1 +
test/externals/ruby1.9/openssl/test_integration.rb | 18 +-
test/externals/ruby1.9/psych/helper.rb | 69 +-
test/externals/ruby1.9/psych/json/test_stream.rb | 2 +-
.../ruby1.9/psych/test_alias_and_anchor.rb | 2 +-
test/externals/ruby1.9/psych/test_array.rb | 2 +-
test/externals/ruby1.9/psych/test_boolean.rb | 2 +-
test/externals/ruby1.9/psych/test_class.rb | 2 +-
test/externals/ruby1.9/psych/test_coder.rb | 28 +-
test/externals/ruby1.9/psych/test_date_time.rb | 23 +-
test/externals/ruby1.9/psych/test_deprecated.rb | 8 +-
test/externals/ruby1.9/psych/test_document.rb | 2 +-
test/externals/ruby1.9/psych/test_emitter.rb | 5 +-
test/externals/ruby1.9/psych/test_encoding.rb | 121 +-
.../externals/ruby1.9/psych/test_engine_manager.rb | 47 -
test/externals/ruby1.9/psych/test_exception.rb | 47 +-
test/externals/ruby1.9/psych/test_hash.rb | 52 +-
test/externals/ruby1.9/psych/test_json_tree.rb | 4 +-
test/externals/ruby1.9/psych/test_marshalable.rb | 54 +
test/externals/ruby1.9/psych/test_merge_keys.rb | 50 +-
test/externals/ruby1.9/psych/test_nil.rb | 2 +-
test/externals/ruby1.9/psych/test_null.rb | 2 +-
test/externals/ruby1.9/psych/test_numeric.rb | 2 +-
test/externals/ruby1.9/psych/test_object.rb | 2 +-
.../ruby1.9/psych/test_object_references.rb | 6 +-
test/externals/ruby1.9/psych/test_omap.rb | 2 +-
test/externals/ruby1.9/psych/test_parser.rb | 2 +-
test/externals/ruby1.9/psych/test_psych.rb | 28 +-
test/externals/ruby1.9/psych/test_safe_load.rb | 97 +
test/externals/ruby1.9/psych/test_scalar.rb | 2 +-
.../externals/ruby1.9/psych/test_scalar_scanner.rb | 4 +-
.../ruby1.9/psych/test_serialize_subclasses.rb | 2 +-
test/externals/ruby1.9/psych/test_set.rb | 2 +-
test/externals/ruby1.9/psych/test_stream.rb | 2 +-
test/externals/ruby1.9/psych/test_string.rb | 112 +-
test/externals/ruby1.9/psych/test_struct.rb | 2 +-
test/externals/ruby1.9/psych/test_symbol.rb | 10 +-
test/externals/ruby1.9/psych/test_tainted.rb | 16 +-
.../ruby1.9/psych/test_to_yaml_properties.rb | 4 +-
test/externals/ruby1.9/psych/test_tree_builder.rb | 2 +-
test/externals/ruby1.9/psych/test_yaml.rb | 9 +-
test/externals/ruby1.9/psych/test_yamldbm.rb | 6 +-
test/externals/ruby1.9/psych/test_yamlstore.rb | 4 +-
.../ruby1.9/psych/visitors/test_to_ruby.rb | 15 +-
.../ruby1.9/psych/visitors/test_yaml_tree.rb | 4 +-
test/externals/ruby1.9/ruby/test_env.rb | 2 +-
test/gem.jar | Bin 0 -> 1720 bytes
test/jruby/test_jarred_gems.rb | 34 +
test/mri.1.9.index | 2 +-
.../jruby/javasupport/test/SampleInterface.java | 7 +
test/org/jruby/test/Abstract.java | 29 +-
test/pom.rb | 10 +-
test/pom.xml | 39 +-
test/test_big_decimal.rb | 13 +
test/test_command_line_switches.rb | 20 +-
test/test_file.rb | 113 +-
test/test_helper.rb | 21 +-
test/test_higher_javasupport.rb | 51 +-
test/test_io.rb | 36 +-
test/test_jarred_gems_with_spaces_in_directory.rb | 10 +
test/test_java_extension.rb | 20 +-
test/test_java_proxy.rb | 64 +
test/test_load_gem_extensions.rb | 11 +-
test/test_objectspace.rb | 26 +-
test/test_pathname.rb | 7 +
test/test_string.rb | 21 +
test/test_zlib.rb | 37 +-
{bin => tool}/generate_parser | 4 +-
{bin => tool}/optimize_parser.rb | 0
{bin => tool}/patch_parser.rb | 0
313 files changed, 8254 insertions(+), 3679 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git
More information about the pkg-java-commits
mailing list