[jruby] 01/02: Merge tag 'upstream/1.7.21'
Miguel Landaeta
nomadium at moszumanska.debian.org
Fri Jul 10 14:59:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
nomadium pushed a commit to branch master
in repository jruby.
commit 7651ed01291ae6a6784a54ced3b453ddb6c319c8
Merge: 9ee644d 6c575f8
Author: Miguel Landaeta <nomadium at debian.org>
Date: Wed Jul 8 13:02:40 2015 -0300
Merge tag 'upstream/1.7.21'
Upstream release 1.7.21
# gpg: Signature made Wed 08 Jul 2015 01:01:15 PM ART 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>"
# gpg: aka "Miguel Landaeta (Restorando) <miguel at restorando.com>"
.travis.yml | 20 +-
VERSION | 2 +-
antlib/extra.xml | 10 +-
bin/rdoc | 2 +-
bin/ri | 2 +-
core/pom.xml | 2 +-
core/src/main/java/org/jruby/RubyArray.java | 315 +++----
core/src/main/java/org/jruby/RubyBasicObject.java | 132 +--
core/src/main/java/org/jruby/RubyBignum.java | 38 +-
core/src/main/java/org/jruby/RubyDir.java | 63 +-
core/src/main/java/org/jruby/RubyEnumerable.java | 609 +++++++------
core/src/main/java/org/jruby/RubyEnumerator.java | 137 +--
core/src/main/java/org/jruby/RubyFile.java | 26 +-
core/src/main/java/org/jruby/RubyGlobal.java | 13 +-
core/src/main/java/org/jruby/RubyHash.java | 90 +-
core/src/main/java/org/jruby/RubyIO.java | 16 +-
.../main/java/org/jruby/RubyInstanceConfig.java | 118 +--
core/src/main/java/org/jruby/RubyInteger.java | 56 +-
core/src/main/java/org/jruby/RubyKernel.java | 200 ++---
core/src/main/java/org/jruby/RubyModule.java | 58 +-
core/src/main/java/org/jruby/RubyString.java | 6 +-
core/src/main/java/org/jruby/RubySymbol.java | 8 +-
core/src/main/java/org/jruby/RubyTime.java | 175 ++--
.../jruby/embed/IsolatedScriptingContainer.java | 55 +-
.../java/org/jruby/embed/ScriptingContainer.java | 118 +--
.../embed/osgi/OSGiIsolatedScriptingContainer.java | 110 +++
.../org/jruby/ext/bigdecimal/RubyBigDecimal.java | 983 ++++++++++-----------
.../java/org/jruby/ext/ffi/AbstractMemory.java | 5 +-
.../main/java/org/jruby/ext/socket/Addrinfo.java | 16 +-
.../main/java/org/jruby/ext/socket/RubySocket.java | 39 +-
.../java/org/jruby/ext/socket/SocketUtils.java | 70 +-
.../main/java/org/jruby/ext/timeout/Timeout.java | 205 +++--
.../org/jruby/ext/zlib/JZlibRubyGzipReader.java | 9 +
.../jruby/internal/runtime/methods/JavaMethod.java | 84 +-
.../java/org/jruby/java/proxies/MapJavaProxy.java | 106 ++-
core/src/main/java/org/jruby/javasupport/Java.java | 10 +-
.../main/java/org/jruby/javasupport/JavaUtil.java | 5 +-
core/src/main/java/org/jruby/runtime/Helpers.java | 12 +-
.../jruby/runtime/load/ClassExtensionLibrary.java | 124 +--
.../java/org/jruby/util/ClasspathLauncher.java | 29 +
.../java/org/jruby/util/ClasspathResource.java | 5 +-
core/src/main/java/org/jruby/util/Dir.java | 378 ++++----
core/src/main/java/org/jruby/util/JRubyFile.java | 25 +-
.../main/java/org/jruby/util/ShellLauncher.java | 14 +-
core/src/main/java/org/jruby/util/URLResource.java | 26 +-
core/src/main/java/org/jruby/util/URLUtil.java | 10 +
.../java/org/jruby/util/cli/ArgumentProcessor.java | 78 +-
.../org/jruby/util/encoding/CharsetTranscoder.java | 46 +-
.../ruby/jruby/kernel/jruby/process_manager.rb | 10 +-
.../org/jruby/embed/ScriptingContainerTest.java | 73 +-
.../test/java/org/jruby/util/URLResourceTest.java | 18 +-
docs/man/pom.xml | 2 +-
docs/pom.xml | 2 +-
ext/pom.xml | 4 +-
ext/readline/pom.xml | 2 +-
ext/ripper/pom.xml | 4 +-
lib/pom.rb | 9 +-
lib/pom.xml | 8 +-
lib/ruby/1.8/pathname.rb | 4 +-
lib/ruby/1.9/date/format.rb | 6 +-
lib/ruby/1.9/pathname.rb | 4 +-
lib/ruby/2.0/net/http.rb | 2 +-
lib/ruby/2.0/uri/generic.rb | 47 +-
.../ffi/platform/x86_64-windows/platform.conf | 2 +-
lib/ruby/shared/rubygems/defaults/jruby.rb | 7 +-
maven/jruby-complete/pom.xml | 2 +-
.../GH-3095-gem-install-with-forked-jruby/pom.xml | 62 ++
maven/jruby-complete/src/it/extended/Mavenfile | 39 +
maven/jruby-complete/src/it/extended/pom.xml | 104 +++
.../jruby/embed/osgi/test/JRubyOsgiEmbedTest.java | 6 +-
maven/jruby-dist/pom.rb | 24 +-
maven/jruby-dist/pom.xml | 21 +-
maven/jruby-dist/src/main/assembly/jruby.xml | 43 +-
maven/jruby-jars/pom.xml | 6 +-
maven/jruby-noasm/pom.xml | 2 +-
maven/jruby-rake-plugin/pom.xml | 2 +-
maven/jruby-stdlib/pom.xml | 2 +-
maven/jruby/pom.xml | 2 +-
maven/jruby/src/it/integrity/pom.xml | 154 +++-
.../src/it/integrity/src/main/resources/hello.jar | Bin 0 -> 483 bytes
.../src/it/integrity/src/main/resources/hello.rb | 1 +
maven/jruby/src/it/integrity/verify.bsh | 23 +
maven/jruby/src/it/j2ee_jetty_rack/Mavenfile | 7 +-
maven/jruby/src/it/j2ee_jetty_rack/pom.xml | 6 +-
maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile | 10 +-
maven/jruby/src/it/j2ee_tomcat_rack/pom.xml | 7 +-
maven/jruby/src/it/runnable/.rspec | 1 +
maven/jruby/src/it/runnable/Gemfile | 2 +-
maven/jruby/src/it/runnable/Gemfile.lock | 27 +-
maven/jruby/src/it/runnable/Mavenfile | 15 +-
maven/jruby/src/it/runnable/Rakefile | 4 +-
maven/jruby/src/it/runnable/pom.xml | 31 +-
maven/jruby/src/it/runnable/spec/one_spec.rb | 16 +-
maven/jruby/src/it/runnable/spec/spec_helper.rb | 2 +
.../jruby/src/it/runnable/src/main/java/Main.java | 40 -
maven/jruby/src/it/runnable/verify.bsh | 11 +-
.../jruby/embed/osgi/test/JRubyOsgiEmbedTest.java | 4 +-
maven/pom.xml | 2 +-
pom.xml | 2 +-
spec/ffi/pointer_spec.rb | 9 +
spec/java_integration/types/array_spec.rb | 295 ++++---
spec/java_integration/types/map_spec.rb | 80 +-
...58_socket_hostname_and_address_encoding_spec.rb | 15 +
...bad_character_transcode_should_not_hang_spec.rb | 15 +
spec/regression/GH-2883_date_sec_fraction_spec.rb | 14 +
test/jruby.1.8.index | 3 +
test/jruby.1.9.index | 3 +
test/pom.xml | 2 +-
test/relative.rb | 0
test/require_relative.rb | 1 +
test/test_backquote.rb | 40 +-
test/test_big_decimal.rb | 192 +++-
test/test_dir.rb | 59 +-
test/test_file.rb | 130 +++
test/test_hash.rb | 35 +
test/test_higher_javasupport.rb | 8 +
test/test_kernel.rb | 77 +-
test/test_load.rb | 8 +
test/test_load_gem_extensions.rb | 34 +
test/test_pathname.rb | 38 +
test/test_respond_to.rb | 42 +-
test/test_timeout.rb | 43 +-
test/test_uri_classloader.rb | 3 +-
123 files changed, 4057 insertions(+), 2633 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