This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to branch master in repository jruby.
commit 886a5b6df6100bd2f81aa34c28d8746068b7e199 Merge: 0769fd1 e827cf2 Author: Miguel Landaeta <[email protected]> Date: Wed Sep 16 21:17:52 2015 -0300 Merge tag 'upstream/1.7.22' Upstream release 1.7.22 # gpg: Signature made Wed 16 Sep 2015 09:18:49 PM ART using RSA key ID 8957CDA5 # gpg: Good signature from "Miguel Landaeta <[email protected]>" # gpg: aka "Miguel Landaeta <[email protected]>" # gpg: aka "Miguel Landaeta (LDC) <[email protected]>" # gpg: aka "Miguel Landaeta (Debian) <[email protected]>" # gpg: aka "Miguel Landaeta (Restorando) <[email protected]>" .travis.yml | 1 + VERSION | 2 +- antlib/extra.xml | 10 +- core/pom.xml | 2 +- core/src/main/java/org/jruby/Main.java | 46 +- core/src/main/java/org/jruby/Ruby.java | 543 ++++++++++----------- core/src/main/java/org/jruby/RubyArray.java | 6 +- core/src/main/java/org/jruby/RubyBasicObject.java | 43 +- core/src/main/java/org/jruby/RubyClass.java | 197 ++++---- core/src/main/java/org/jruby/RubyComparable.java | 49 +- core/src/main/java/org/jruby/RubyDir.java | 4 +- core/src/main/java/org/jruby/RubyFile.java | 22 +- core/src/main/java/org/jruby/RubyGlobal.java | 123 ++--- core/src/main/java/org/jruby/RubyHash.java | 3 +- .../main/java/org/jruby/RubyInstanceConfig.java | 12 +- core/src/main/java/org/jruby/RubyModule.java | 15 +- core/src/main/java/org/jruby/RubyNumeric.java | 215 ++++---- core/src/main/java/org/jruby/RubyProcess.java | 41 +- core/src/main/java/org/jruby/RubySymbol.java | 172 ++++--- core/src/main/java/org/jruby/RubyThread.java | 3 +- core/src/main/java/org/jruby/RubyTime.java | 10 +- .../main/java/org/jruby/compiler/JITCompiler.java | 59 +-- .../jruby/embed/IsolatedScriptingContainer.java | 57 +-- .../java/org/jruby/embed/ScriptingContainer.java | 12 +- .../internal/EmbedRubyInterfaceAdapterImpl.java | 24 +- .../embed/internal/EmbedRubyObjectAdapterImpl.java | 19 +- .../internal/EmbedRubyRuntimeAdapterImpl.java | 19 +- .../jruby/embed/util/SystemPropertyCatcher.java | 109 ++--- .../java/org/jruby/ext/digest/BubbleBabble.java | 81 +++ .../main/java/org/jruby/ext/digest/RubyDigest.java | 154 +++--- .../java/org/jruby/ext/socket/SocketUtils.java | 6 +- .../main/java/org/jruby/ext/timeout/Timeout.java | 19 +- .../jruby/internal/runtime/methods/JavaMethod.java | 12 +- .../runtime/methods/ReflectedJavaMethod.java | 37 +- .../org/jruby/java/dispatch/CallableSelector.java | 179 +++++-- .../jruby/java/proxies/JavaInterfaceTemplate.java | 5 +- .../java/org/jruby/java/proxies/JavaProxy.java | 153 +++++- .../java/org/jruby/java/proxies/MapJavaProxy.java | 12 +- .../org/jruby/java/util/BlankSlateWrapper.java | 11 +- core/src/main/java/org/jruby/javasupport/Java.java | 238 +++------ .../java/org/jruby/javasupport/JavaCallable.java | 7 + .../org/jruby/javasupport/JavaConstructor.java | 9 + .../java/org/jruby/javasupport/JavaEmbedUtils.java | 17 +- .../java/org/jruby/javasupport/JavaMethod.java | 9 +- .../main/java/org/jruby/javasupport/JavaUtil.java | 24 +- core/src/main/java/org/jruby/runtime/Helpers.java | 2 +- .../org/jruby/runtime/backtrace/BacktraceData.java | 85 ++-- .../org/jruby/runtime/backtrace/FrameType.java | 17 +- core/src/main/java/org/jruby/util/ClassCache.java | 16 +- .../main/java/org/jruby/util/JRubyClassLoader.java | 57 ++- core/src/main/java/org/jruby/util/JRubyFile.java | 79 ++- .../main/java/org/jruby/util/JavaNameMangler.java | 274 ++++++----- .../main/java/org/jruby/util/OSEnvironment.java | 87 ++-- ...luedIdentityMap.java => UriLikePathHelper.java} | 54 +- .../java/org/jruby/util/cli/ArgumentProcessor.java | 9 +- core/src/main/java/org/jruby/util/cli/Options.java | 4 +- .../org/jruby/util/collections/WeakHashSet.java | 105 ++-- .../util/collections/WeakValuedIdentityMap.java | 7 +- .../org/jruby/util/collections/WeakValuedMap.java | 38 +- .../jruby/java/java_package_module_template.rb | 8 +- core/src/main/ruby/jruby/kernel19/kernel.rb | 13 +- .../org/jruby/embed/ScriptingContainerTest.java | 246 ++++++---- .../embed/util/SystemPropertyCatcherTest.java | 46 +- .../jruby/java/dispatch/CallableSelectorTest.java | 171 +++++++ .../org/jruby/javasupport/JavaEmbedUtilsTest.java | 66 +++ .../test/java/org/jruby/javasupport/TestJava.java | 58 ++- .../java/org/jruby/javasupport/TestJavaClass.java | 16 +- .../java/org/jruby/lexer/yacc/StringTermTest.java | 1 - .../src/test/resources/java_embed_utils/test_me.rb | 1 + docs/man/pom.xml | 2 +- docs/pom.xml | 2 +- ext/pom.xml | 4 +- ext/readline/pom.xml | 2 +- .../src/main/java/org/jruby/JRubyApplet.java | 3 +- ext/ripper/pom.xml | 4 +- lib/pom.rb | 4 +- lib/pom.xml | 8 +- lib/ruby/1.9/date.rb | 11 +- lib/ruby/2.0/net/http/response.rb | 4 +- lib/ruby/shared/digest/bubblebabble.rb | 1 + lib/ruby/shared/rubygems/defaults/jruby.rb | 10 +- maven/jruby-complete/pom.rb | 2 +- maven/jruby-complete/pom.xml | 4 +- .../GH-3095-gem-install-with-forked-jruby/pom.xml | 2 +- maven/jruby-complete/src/it/integrity/bin/me | 1 + maven/jruby-complete/src/it/integrity/pom.xml | 277 ++++++----- maven/jruby-complete/src/it/integrity/verify.bsh | 12 +- .../gems-bundle/pom.xml | 2 +- .../jruby/embed/osgi/test/JRubyOsgiEmbedTest.java | 74 ++- maven/jruby-dist/pom.rb | 2 +- maven/jruby-dist/pom.xml | 6 +- maven/jruby-dist/src/it/integrity/verify.bsh | 9 +- maven/jruby-jars/pom.xml | 8 +- maven/jruby-jars/src/it/integrity/verify.bsh | 7 +- 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/j2ee_jetty/pom.rb | 2 +- maven/jruby/src/it/j2ee_jetty/pom.xml | 2 +- maven/jruby/src/it/j2ee_jetty_rack/Mavenfile | 2 +- maven/jruby/src/it/j2ee_jetty_rack/pom.xml | 2 +- maven/jruby/src/it/j2ee_tomcat/pom.rb | 2 +- maven/jruby/src/it/j2ee_tomcat/pom.xml | 2 +- maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile | 2 +- maven/jruby/src/it/j2ee_tomcat_rack/pom.xml | 2 +- maven/jruby/src/it/j2ee_wildfly/pom.rb | 2 +- maven/jruby/src/it/j2ee_wildfly/pom.xml | 2 +- maven/jruby/src/it/jetty/Mavenfile | 2 +- maven/jruby/src/it/jetty/pom.xml | 2 +- .../many_jars_with_embedded_gems/zip_gem/pom.xml | 2 +- .../many_jars_with_embedded_gems_ng/gem1/pom.xml | 2 +- .../many_jars_with_embedded_gems_ng/gem2/pom.xml | 2 +- maven/jruby/src/it/runnable/Mavenfile | 11 +- maven/jruby/src/it/runnable/nested.rb | 14 + maven/jruby/src/it/runnable/pom.xml | 29 +- maven/jruby/src/it/runnable/spec/one_spec.rb | 2 +- maven/jruby/src/it/runnable/test.rb | 25 + maven/jruby/src/it/runnable/test_other.rb | 29 ++ maven/jruby/src/it/runnable/verify.bsh | 14 +- maven/jruby/src/it/tomcat/pom.rb | 2 +- maven/jruby/src/it/tomcat/pom.xml | 2 +- maven/jruby/src/templates/j2ee_wlp/pom.rb | 2 +- maven/jruby/src/templates/j2ee_wlp/pom.xml | 2 +- .../jruby/src/templates/osgi_all_inclusive/pom.xml | 2 +- .../jruby/embed/osgi/test/JRubyOsgiEmbedTest.java | 53 +- maven/pom.xml | 2 +- pom.xml | 16 +- rakelib/helpers.rb | 12 +- rakelib/release.rake | 16 +- spec/java_integration/ant/ant_spec.rb | 8 +- spec/java_integration/exceptions/rescue_spec.rb | 54 +- .../iface/SingleMethodInterfaceWith4Args.java | 11 + .../iface/SingleMethodInterfaceWithArg.java | 14 + spec/java_integration/interfaces/executor_spec.rb | 20 +- .../interfaces/implementation_spec.rb | 103 +++- .../interfaces/java8_methods_spec.rb | 79 +++ .../interfaces/static_methods_spec.rb | 37 -- spec/java_integration/methods/java_send_spec.rb | 8 + spec/java_integration/packages/access_spec.rb | 13 +- spec/java_integration/packages/include_spec.rb | 2 +- spec/java_integration/packages/name_spec.rb | 53 ++ spec/java_integration/rubygems/rubygems_spec.rb | 6 +- spec/java_integration/types/array_spec.rb | 5 + .../GH-3155_array_map_with_mutation_spec.rb | 9 + ...158_kernel_timeout_dispatches_to_module_spec.rb | 20 + spec/ruby/core/env/shared/to_hash.rb | 5 + spec/ruby/library/date/add_month_spec.rb | 8 + spec/ruby/library/date/next_year_spec.rb | 12 + spec/ruby/library/date/prev_year_spec.rb | 12 + spec/ruby/library/socket/shared/pack_sockaddr.rb | 3 + spec/tags/1.8/ruby/library/date/add_month_tags.txt | 1 + spec/tags/1.8/ruby/library/date/next_year_tags.txt | 1 + spec/tags/1.8/ruby/library/date/prev_year_tags.txt | 1 + test/DefaultPackageClass.java | 10 + .../jruby/javasupport/test/ThrowingRunnable.java | 21 + test/pom.rb | 4 +- test/pom.xml | 6 +- test/test_backtraces.rb | 177 ++++--- test/test_comparable.rb | 70 +++ test/test_file.rb | 15 + test/test_kernel.rb | 15 - test/test_load.rb | 9 + 163 files changed, 3579 insertions(+), 2216 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
