diff options
author | Christian Meier <m.kristian@web.de> | 2015-05-06 11:01:35 +0200 |
---|---|---|
committer | Christian Meier <m.kristian@web.de> | 2015-05-06 11:01:35 +0200 |
commit | 4a60719c6a4b0c383b7deb4ff5cc8b94e3b1ba76 (patch) | |
tree | d39a1fa42833944b935fe1ce4d47fc0e66b2897b | |
parent | e36e98192dcb90bec267fb04000678017f7d1cb0 (diff) | |
download | psych-4a60719c6a4b0c383b7deb4ff5cc8b94e3b1ba76.zip |
little ruby-maven related improvements
* pass in the snakeyaml.version via the commandline
* use the jruby version which runs rake for the java compilation as well
-rw-r--r-- | Mavenfile | 2 | ||||
-rw-r--r-- | Rakefile | 5 |
2 files changed, 3 insertions, 4 deletions
@@ -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}' @@ -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') |