Skip to content

Commit

Permalink
relocate objectweb.asm classes in me.qmx.jitescript as well
Browse files Browse the repository at this point in the history 
fixes #4223
  • Loading branch information
@mkristian
mkristian committed Oct 13, 2016
1 parent 576e401 commit ee0b9b1
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
6 changes: 6 additions & 0 deletions core/pom.rb
View file
Expand Up @@ -281,12 +281,18 @@

[:all, :release, :main, :osgi, :j2ee, :complete, :dist, :'jruby_complete_jar_extended', :'jruby-jars' ].each do |name|
profile name do
# we shade in all dependencies which use the asm classes and relocate
# the asm package-name. with all jruby artifacts behave the same
# regarding asm: lib/jruby, jruby-core and jruby-complete via maven
plugin :shade do
execute_goals( 'shade',
:id => 'shade the asm classes',
:phase => 'package',
'artifactSet' => {
# IMPORTANT these needs to match exclusions in
# maven/jruby-complete/pom.rb
'includes' => [ 'com.github.jnr:jnr-ffi',
'me.qmx.jitescript:jitescript',
'org.ow2.asm:*' ]
},
'relocations' => [ { 'pattern' => 'org.objectweb',
Expand Down
9 changes: 9 additions & 0 deletions core/pom.xml
View file
Expand Up @@ -687,6 +687,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -720,6 +721,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -753,6 +755,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -786,6 +789,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -819,6 +823,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -852,6 +857,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -885,6 +891,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -918,6 +925,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down Expand Up @@ -951,6 +959,7 @@ DO NOT MODIFIY - GENERATED CODE
<artifactSet>
<includes>
<include>com.github.jnr:jnr-ffi</include>
<include>me.qmx.jitescript:jitescript</include>
<include>org.ow2.asm:*</include>
</includes>
</artifactSet>
Expand Down
3 changes: 2 additions & 1 deletion maven/jruby-complete/pom.rb
View file
Expand Up @@ -23,7 +23,8 @@
jar 'org.jruby:jruby-core:${project.version}' do
# this needs to match the Embed-Dependency on the maven-bundle-plugin
exclusion 'com.github.jnr:jnr-ffi'
# HACK workaround a bug in maven + ruby-dsl
exclusion 'me.qmx.jitescript:jitescript'
# HACK workaround a bug in maven + ruby-dsl + felix-plugin
['asm', 'asm-commons', 'asm-tree', 'asm-analysis', 'asm-util' ].each do |e|
exclusion "org.ow2.asm:#{e}"
end
Expand Down

1 comment on commit ee0b9b1

@headius
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Please sign in to comment.