Skip to content

Commit

Permalink
Merge pull request #237 from mkristian/no-jruby-dep
Browse files Browse the repository at this point in the history
no need to supply jruby itself to the classpath
  • Loading branch information
tenderlove committed Aug 21, 2015
2 parents d8440cc + 291f74b commit 371ace9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,5 +2,6 @@
*.bundle
*.jar
*.class
.mvn
/pkg
/tmp
2 changes: 0 additions & 2 deletions 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'
Expand Down
4 changes: 3 additions & 1 deletion Rakefile
Expand Up @@ -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')
Expand Down

0 comments on commit 371ace9

Please sign in to comment.