summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mavenfile2
-rw-r--r--Rakefile5
2 files changed, 3 insertions, 4 deletions
diff --git a/Mavenfile b/Mavenfile
index 93d4348..c077435 100644
--- a/Mavenfile
+++ b/Mavenfile
@@ -1,6 +1,6 @@
#-*- mode: ruby -*-
-pom 'org.jruby:jruby:9.0.0.0.pre1', :scope => :provided
+pom 'org.jruby:jruby:${jruby.version}', :scope => :provided
jar 'org.yaml:snakeyaml:${snakeyaml.version}'
diff --git a/Rakefile b/Rakefile
index 133aa6a..bf332a7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,10 +48,9 @@ $hoe = Hoe.spec 'psych' do
require "rake/javaextensiontask"
Rake::JavaExtensionTask.new("psych", spec) do |ext|
require 'maven/ruby/maven'
- # tell maven via system properties the snakeyaml version
- ENV_JAVA['snakeyaml.version'] = Psych::DEFAULT_SNAKEYAML_VERSION
# uses Mavenfile to write classpath into pkg/classpath
- Maven::Ruby::Maven.new.exec( 'dependency:build-classpath')#, '--quiet' )
+ # and tell maven via system properties the snakeyaml version
+ Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Djruby.version=#{JRUBY_VERSION}", "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}")#, '--quiet' )
ext.source_version = '1.7'
ext.target_version = '1.7'
ext.classpath = File.read('pkg/classpath')