Skip to content

Commit

Permalink
psych as default gem
Browse files Browse the repository at this point in the history
  • Loading branch information
mkristian committed Feb 26, 2015
1 parent 0f29341 commit 5fec1d2
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 7 deletions.
16 changes: 12 additions & 4 deletions lib/pom.rb
Expand Up @@ -26,10 +26,11 @@ def version
ImportedGem.new( 'rake', 'rake.version', true ),
ImportedGem.new( 'rdoc', 'rdoc.version', true ),
ImportedGem.new( 'json', 'json.version', true ),
ImportedGem.new( 'jar-dependencies', '0.1.2', true ),
ImportedGem.new( 'jar-dependencies', '0.1.8', true ),
ImportedGem.new( 'minitest', 'minitest.version', true ),
ImportedGem.new( 'test-unit', 'test-unit.version', true ),
ImportedGem.new( 'power_assert', 'power_assert.version', true )
ImportedGem.new( 'power_assert', 'power_assert.version', true ),
ImportedGem.new( 'psych', '2.0.9-SNAPSHOT', true )
]

project 'JRuby Lib Setup' do
Expand Down Expand Up @@ -68,7 +69,7 @@ def to_pathname
end

# just depends on jruby-core so we are sure the jruby.jar is in place
jar "org.jruby:jruby-core:#{version}"
jar "org.jruby:jruby-core:#{version}", :scope => 'provided'

repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
:id => 'rubygems-releases' )
Expand All @@ -81,14 +82,20 @@ def to_pathname

# tell maven to download the respective gem artifacts
default_gems.each do |g|
gem g.name, g.version
dependency 'rubygems', g.name, g.version, :type => 'gem' do
exclusion 'rubygems:jar-dependencies'
end
end

# this is not an artifact for maven central
plugin :deploy, :skip => true

gem 'ruby-maven', '3.1.1.0.8', :scope => :provided

plugin :dependency, :useRepositoryLayout => true, :outputDirectory => 'ruby/stdlib', :excludeGroupIds => 'rubygems', :includeScope => :runtime do
execute_goal 'copy-dependencies', :phase => 'package'
end

execute :install_gems, :'package' do |ctx|
require 'fileutils'

Expand Down Expand Up @@ -127,6 +134,7 @@ def to_pathname
require 'rubygems/package'

puts 'install gems unless already installed'
ENV_JAVA['jars.skip'] = 'true'
ctx.project.artifacts.select do |a|
a.group_id == 'rubygems' || a.group_id == 'org.jruby.gems'
end.each do |a|
Expand Down
96 changes: 93 additions & 3 deletions lib/pom.xml
Expand Up @@ -21,66 +21,139 @@
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>9.0.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.6</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-readline</artifactId>
<version>1.0.dev-SNAPSHOT</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-ripper</artifactId>
<version>2.1.0.dev-SNAPSHOT</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rake</artifactId>
<version>${rake.version}</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rdoc</artifactId>
<version>${rdoc.version}</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>json</artifactId>
<version>${json.version}</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>0.1.2</version>
<version>0.1.8</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>minitest</artifactId>
<version>${minitest.version}</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>test-unit</artifactId>
<version>${test-unit.version}</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>power_assert</artifactId>
<version>${power_assert.version}</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>psych</artifactId>
<version>2.0.9-SNAPSHOT</version>
<type>gem</type>
<exclusions>
<exclusion>
<artifactId>jar-dependencies</artifactId>
<groupId>rubygems</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>rubygems</groupId>
Expand Down Expand Up @@ -123,10 +196,27 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
</execution>
</executions>
<configuration>
<useRepositoryLayout>true</useRepositoryLayout>
<outputDirectory>ruby/stdlib</outputDirectory>
<excludeGroupIds>rubygems</excludeGroupIds>
<includeScope>runtime</includeScope>
</configuration>
</plugin>
<plugin>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-maven-plugin</artifactId>
<version>${tesla.version}</version>
<version>0.1.2-SNAPSHOT</version>
<executions>
<execution>
<id>install_gems</id>
Expand All @@ -144,7 +234,7 @@
<dependency>
<groupId>io.tesla.polyglot</groupId>
<artifactId>tesla-polyglot-ruby</artifactId>
<version>${tesla.version}</version>
<version>0.1.2-SNAPSHOT</version>
</dependency>
</dependencies>
</plugin>
Expand Down

0 comments on commit 5fec1d2

Please sign in to comment.