From 291f74b4ecc554f3faeee62a2d06b2c315822759 Mon Sep 17 00:00:00 2001 From: Christian Meier Date: Thu, 28 May 2015 10:23:52 +0200 Subject: no need to supply jruby itself to the classpath --- .gitignore | 1 + Mavenfile | 2 -- Rakefile | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 40f53fa..26036d4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ *.bundle *.jar *.class +.mvn /pkg /tmp diff --git a/Mavenfile b/Mavenfile index c077435..b6d2dd0 100644 --- a/Mavenfile +++ b/Mavenfile @@ -1,7 +1,5 @@ #-*- mode: ruby -*- -pom 'org.jruby:jruby:${jruby.version}', :scope => :provided - jar 'org.yaml:snakeyaml:${snakeyaml.version}' plugin :dependency, '2.8', :outputFile => 'pkg/classpath' diff --git a/Rakefile b/Rakefile index bf332a7..ca4885d 100644 --- a/Rakefile +++ b/Rakefile @@ -50,7 +50,9 @@ $hoe = Hoe.spec 'psych' do require 'maven/ruby/maven' # uses Mavenfile to write classpath into pkg/classpath # 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' ) + # 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')#, '--quiet' ) ext.source_version = '1.7' ext.target_version = '1.7' ext.classpath = File.read('pkg/classpath') -- cgit v1.2.3