Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f149d00f432^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f2934109537
Choose a head ref
  • 2 commits
  • 45 files changed
  • 1 contributor

Commits on Feb 2, 2015

  1. no more builtin psych

    @mkristian
    mkristian committed Feb 2, 2015
    Copy the full SHA
    2f149d0 View commit details

Commits on Feb 3, 2015

  1. no more snakeyaml in core

    @mkristian
    mkristian committed Feb 3, 2015
    Copy the full SHA
    0f29341 View commit details
Showing with 0 additions and 4,096 deletions.
  1. +0 −1 core/pom.rb
  2. +0 −5 core/pom.xml
  3. +0 −1 core/src/main/java/org/jruby/Ruby.java
  4. +0 −345 core/src/main/java/org/jruby/ext/psych/PsychEmitter.java
  5. +0 −82 core/src/main/java/org/jruby/ext/psych/PsychLibrary.java
  6. +0 −387 core/src/main/java/org/jruby/ext/psych/PsychParser.java
  7. +0 −79 core/src/main/java/org/jruby/ext/psych/PsychToRuby.java
  8. +0 −55 core/src/main/java/org/jruby/ext/psych/PsychYamlTree.java
  9. +0 −498 lib/ruby/stdlib/psych.rb
  10. +0 −101 lib/ruby/stdlib/psych/class_loader.rb
  11. +0 −94 lib/ruby/stdlib/psych/coder.rb
  12. +0 −35 lib/ruby/stdlib/psych/core_ext.rb
  13. +0 −85 lib/ruby/stdlib/psych/deprecated.rb
  14. +0 −13 lib/ruby/stdlib/psych/exception.rb
  15. +0 −249 lib/ruby/stdlib/psych/handler.rb
  16. +0 −22 lib/ruby/stdlib/psych/handlers/document_stream.rb
  17. +0 −39 lib/ruby/stdlib/psych/handlers/recorder.rb
  18. +0 −19 lib/ruby/stdlib/psych/json/ruby_events.rb
  19. +0 −16 lib/ruby/stdlib/psych/json/stream.rb
  20. +0 −12 lib/ruby/stdlib/psych/json/tree_builder.rb
  21. +0 −29 lib/ruby/stdlib/psych/json/yaml_events.rb
  22. +0 −77 lib/ruby/stdlib/psych/nodes.rb
  23. +0 −18 lib/ruby/stdlib/psych/nodes/alias.rb
  24. +0 −60 lib/ruby/stdlib/psych/nodes/document.rb
  25. +0 −56 lib/ruby/stdlib/psych/nodes/mapping.rb
  26. +0 −55 lib/ruby/stdlib/psych/nodes/node.rb
  27. +0 −67 lib/ruby/stdlib/psych/nodes/scalar.rb
  28. +0 −81 lib/ruby/stdlib/psych/nodes/sequence.rb
  29. +0 −37 lib/ruby/stdlib/psych/nodes/stream.rb
  30. +0 −4 lib/ruby/stdlib/psych/omap.rb
  31. +0 −51 lib/ruby/stdlib/psych/parser.rb
  32. +0 −149 lib/ruby/stdlib/psych/scalar_scanner.rb
  33. +0 −4 lib/ruby/stdlib/psych/set.rb
  34. +0 −37 lib/ruby/stdlib/psych/stream.rb
  35. +0 −27 lib/ruby/stdlib/psych/streaming.rb
  36. +0 −21 lib/ruby/stdlib/psych/syntax_error.rb
  37. +0 −96 lib/ruby/stdlib/psych/tree_builder.rb
  38. +0 −6 lib/ruby/stdlib/psych/visitors.rb
  39. +0 −26 lib/ruby/stdlib/psych/visitors/depth_first.rb
  40. +0 −51 lib/ruby/stdlib/psych/visitors/emitter.rb
  41. +0 −24 lib/ruby/stdlib/psych/visitors/json_tree.rb
  42. +0 −389 lib/ruby/stdlib/psych/visitors/to_ruby.rb
  43. +0 −19 lib/ruby/stdlib/psych/visitors/visitor.rb
  44. +0 −565 lib/ruby/stdlib/psych/visitors/yaml_tree.rb
  45. +0 −9 lib/ruby/stdlib/psych/y.rb
1 change: 0 additions & 1 deletion core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -67,7 +67,6 @@
jar 'junit:junit', :scope => 'test'
jar 'org.apache.ant:ant:${ant.version}', :scope => 'provided'
jar 'org.osgi:org.osgi.core:5.0.0', :scope => 'provided'
jar 'org.yaml:snakeyaml:1.14'

# joda timezone must be before joda-time to be packed correctly
jar 'org.jruby:joda-timezones:${tzdata.version}', :scope => '${tzdata.scope}'
5 changes: 0 additions & 5 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -210,11 +210,6 @@
<version>5.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.14</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
<artifactId>joda-timezones</artifactId>
1 change: 0 additions & 1 deletion core/src/main/java/org/jruby/Ruby.java
View file
Original file line number Diff line number Diff line change
@@ -1763,7 +1763,6 @@ private void initBuiltins() {

addLazyBuiltin("mathn/complex.jar", "mathn/complex", "org.jruby.ext.mathn.Complex");
addLazyBuiltin("mathn/rational.jar", "mathn/rational", "org.jruby.ext.mathn.Rational");
addLazyBuiltin("psych.jar", "psych", "org.jruby.ext.psych.PsychLibrary");
addLazyBuiltin("coverage.jar", "coverage", "org.jruby.ext.coverage.CoverageLibrary");

// TODO: implement something for these?
345 changes: 0 additions & 345 deletions core/src/main/java/org/jruby/ext/psych/PsychEmitter.java
View file

This file was deleted.

Loading