Skip to content

Commit

Permalink
Relocate jitescript to avoid conflicts with other libraries.
Browse files Browse the repository at this point in the history 
Fixes #4831
@headius
headius committed Oct 27, 2017
1 parent 6906808 commit d44209e
Showing 2 changed files with 43 additions and 4 deletions.
11 changes: 7 additions & 4 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -264,8 +264,9 @@
execute_goals( 'shade',
:id => 'create lib/jruby.jar',
:phase => 'package',
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ],
relocations: [
{pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
],
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ],
@@ -288,8 +289,10 @@
'me.qmx.jitescript:jitescript',
'org.ow2.asm:*' ]
},
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ] )
relocations: [
{pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
{pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript'},
] )
end
end
end
36 changes: 36 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -682,6 +682,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -716,6 +720,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -750,6 +758,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -784,6 +796,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -818,6 +834,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -852,6 +872,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -886,6 +910,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -920,6 +948,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
@@ -954,6 +986,10 @@ DO NOT MODIFIY - GENERATED CODE
<pattern>org.objectweb</pattern>
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
<relocation>
<pattern>me.qmx.jitescript</pattern>
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>

0 comments on commit d44209e

Please sign in to comment.