Skip to content

Commit

Permalink
[build] use the jruby-core noasm dependency - fixes #2219
Browse files Browse the repository at this point in the history
it also excludes the asm and com.github.jnr:jnr-ffi from dependencies list
so the BND for packaging the osgi does not include those anymore
  • Loading branch information
mkristian committed Nov 19, 2014
1 parent c2bfd56 commit 2a9ccce
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
7 changes: 6 additions & 1 deletion maven/jruby-complete/pom.rb
Expand Up @@ -19,7 +19,12 @@
'jruby.complete.home' => '${project.build.outputDirectory}/META-INF/jruby.home' )

scope :provided do
jar 'org.jruby:jruby-core:${project.version}'
jar( 'org.jruby:jruby-core:${project.version}:noasm',
:exclusions => [ 'com.github.jnr:jnr-ffi',
'org.ow2.asm:asm',
'org.ow2.asm:asm-commons',
'org.ow2.asm:asm-analysis',
'org.ow2.asm:asm-util' ] )
jar 'org.jruby:jruby-stdlib:${project.version}'
end

Expand Down
23 changes: 23 additions & 0 deletions maven/jruby-complete/pom.xml
Expand Up @@ -23,7 +23,30 @@
<groupId>org.jruby</groupId>
<artifactId>jruby-core</artifactId>
<version>${project.version}</version>
<classifier>noasm</classifier>
<scope>provided</scope>
<exclusions>
<exclusion>
<artifactId>jnr-ffi</artifactId>
<groupId>com.github.jnr</groupId>
</exclusion>
<exclusion>
<artifactId>asm</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
<exclusion>
<artifactId>asm-commons</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
<exclusion>
<artifactId>asm-analysis</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
<exclusion>
<artifactId>asm-util</artifactId>
<groupId>org.ow2.asm</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
Expand Down

0 comments on commit 2a9ccce

Please sign in to comment.