Skip to content

Commit

Permalink
Filter all module-info.class until we publish one. Fixes #4899.
Browse files Browse the repository at this point in the history 
See #4835.
@headius
headius committed Dec 19, 2017
1 parent ba18833 commit 83271e2
Showing 2 changed files with 88 additions and 2 deletions.
10 changes: 8 additions & 2 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -270,7 +270,10 @@
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
'mainClass' => 'org.jruby.Main' } ],
'createSourcesJar' => '${create.sources.jar}' )
'createSourcesJar' => '${create.sources.jar}',
filters:
{filter: {artifact: 'com.headius:invokebinder', excludes: {exclude: '**/module-info.class'}}}
)
end

[:all, :release, :main, :osgi, :j2ee, :complete, :dist, :'jruby_complete_jar_extended', :'jruby-jars' ].each do |name|
@@ -292,7 +295,10 @@
relocations: [
{pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
{pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript'},
] )
],
filters:
{filter: {artifact: 'com.headius:invokebinder', excludes: {exclude: '**/module-info.class'}}}
)
end
end
end
80 changes: 80 additions & 0 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -623,6 +623,14 @@ DO NOT MODIFIY - GENERATED CODE
</transformer>
</transformers>
<createSourcesJar>${create.sources.jar}</createSourcesJar>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -687,6 +695,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -725,6 +741,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -763,6 +787,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -801,6 +833,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -839,6 +879,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -877,6 +925,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -915,6 +971,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -953,6 +1017,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
@@ -991,6 +1063,14 @@ DO NOT MODIFIY - GENERATED CODE
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>
<artifact>com.headius:invokebinder</artifact>
<excludes>
<exclude>**/module-info.class</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>

0 comments on commit 83271e2

Please sign in to comment.