Hardcode Snakeyaml versions to avoid conflict with JRuby consts.

ruby · Dec 13, 2016 · cb13c8b · cb13c8b
1 parent 893d2fe
commit cb13c8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Rakefile b/Rakefile
@@ -17,7 +17,7 @@ if RUBY_PLATFORM =~ /java/
     # and tell maven via system properties the snakeyaml version
     # this is basically the same as running from the commandline:
     # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
-    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')
+    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.17", '-Dverbose=true')
     ext.source_version = '1.7'
     ext.target_version = '1.7'
     ext.classpath = File.read('pkg/classpath')

diff --git a/psych.gemspec b/psych.gemspec
@@ -34,7 +34,7 @@ DESCRIPTION
   if RUBY_ENGINE == 'jruby'
     s.platform = 'java'
     s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"]
-    s.requirements = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.requirements = "jar org.yaml:snakeyaml, 1.17"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
     s.add_development_dependency 'ruby-maven'
   else