Skip to content

Commit

Permalink
jruby-core.jar or lib/jruby.jar has yaml/** ruby scripts almost the s…
Browse files Browse the repository at this point in the history 
…ame as jruby-stdlib.jar

there are differences ! and it is just a bad to have different version of the same files
in the system (load-path or classpath etc)
  • Loading branch information
@mkristian
mkristian committed Oct 7, 2014
1 parent e09f484 commit 2caa923
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 0 deletions.
4 changes: 4 additions & 0 deletions core/pom.rb
View file
Expand Up @@ -219,6 +219,8 @@
:phase => 'package',
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ],
:filters => [ { :artifact => 'org.jruby:yecht',
:excludes => [ 'yaml/**', 'okay/**', '*.rb' ] } ],
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ] )
Expand Down Expand Up @@ -280,6 +282,8 @@
'shadedClassifierName' => 'complete',
'relocations' => [ { 'pattern' => 'org.objectweb',
'shadedPattern' => 'org.jruby.org.objectweb' } ],
:filters => [ { :artifact => 'org.jruby:yecht',
:excludes => [ 'yaml/**', 'okay/**', '*.rb' ] } ],
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ] )
end
Expand Down
80 changes: 80 additions & 0 deletions core/pom.xml
View file
Expand Up @@ -522,6 +522,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<outputFile>${jruby.basedir}/lib/jruby.jar</outputFile>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
Expand Down Expand Up @@ -600,6 +610,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down Expand Up @@ -657,6 +677,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down Expand Up @@ -714,6 +744,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down Expand Up @@ -771,6 +811,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down Expand Up @@ -828,6 +878,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down Expand Up @@ -885,6 +945,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down Expand Up @@ -942,6 +1012,16 @@
<shadedPattern>org.jruby.org.objectweb</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>org.jruby:yecht</artifact>
<excludes>
<exclude>yaml/**</exclude>
<exclude>okay/**</exclude>
<exclude>*.rb</exclude>
</excludes>
</filter>
</filters>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.jruby.Main</mainClass>
Expand Down

0 comments on commit 2caa923

Please sign in to comment.