Skip to content

Commit 83271e2

Browse files
headiusheadius
committedDec 19, 2017
Filter all module-info.class until we publish one. Fixes #4899.
See #4835.
·
10.0.0.09.1.16.0
1 parent ba18833 commit 83271e2

File tree

2 files changed

+88
-2
lines changed

2 files changed

+88
-2
lines changed
 

‎core/pom.rb

+8-2
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,10 @@
270270
'outputFile' => '${jruby.basedir}/lib/jruby.jar',
271271
'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
272272
'mainClass' => 'org.jruby.Main' } ],
273-
'createSourcesJar' => '${create.sources.jar}' )
273+
'createSourcesJar' => '${create.sources.jar}',
274+
filters:
275+
{filter: {artifact: 'com.headius:invokebinder', excludes: {exclude: '**/module-info.class'}}}
276+
)
274277
end
275278

276279
[:all, :release, :main, :osgi, :j2ee, :complete, :dist, :'jruby_complete_jar_extended', :'jruby-jars' ].each do |name|
@@ -292,7 +295,10 @@
292295
relocations: [
293296
{pattern: 'org.objectweb', shadedPattern: 'org.jruby.org.objectweb' },
294297
{pattern: 'me.qmx.jitescript', shadedPattern: 'org.jruby.me.qmx.jitescript'},
295-
] )
298+
],
299+
filters:
300+
{filter: {artifact: 'com.headius:invokebinder', excludes: {exclude: '**/module-info.class'}}}
301+
)
296302
end
297303
end
298304
end

‎core/pom.xml

+80
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,14 @@ DO NOT MODIFIY - GENERATED CODE
623623
</transformer>
624624
</transformers>
625625
<createSourcesJar>${create.sources.jar}</createSourcesJar>
626+
<filters>
627+
<filter>
628+
<artifact>com.headius:invokebinder</artifact>
629+
<excludes>
630+
<exclude>**/module-info.class</exclude>
631+
</excludes>
632+
</filter>
633+
</filters>
626634
</configuration>
627635
</execution>
628636
</executions>
@@ -687,6 +695,14 @@ DO NOT MODIFIY - GENERATED CODE
687695
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
688696
</relocation>
689697
</relocations>
698+
<filters>
699+
<filter>
700+
<artifact>com.headius:invokebinder</artifact>
701+
<excludes>
702+
<exclude>**/module-info.class</exclude>
703+
</excludes>
704+
</filter>
705+
</filters>
690706
</configuration>
691707
</execution>
692708
</executions>
@@ -725,6 +741,14 @@ DO NOT MODIFIY - GENERATED CODE
725741
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
726742
</relocation>
727743
</relocations>
744+
<filters>
745+
<filter>
746+
<artifact>com.headius:invokebinder</artifact>
747+
<excludes>
748+
<exclude>**/module-info.class</exclude>
749+
</excludes>
750+
</filter>
751+
</filters>
728752
</configuration>
729753
</execution>
730754
</executions>
@@ -763,6 +787,14 @@ DO NOT MODIFIY - GENERATED CODE
763787
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
764788
</relocation>
765789
</relocations>
790+
<filters>
791+
<filter>
792+
<artifact>com.headius:invokebinder</artifact>
793+
<excludes>
794+
<exclude>**/module-info.class</exclude>
795+
</excludes>
796+
</filter>
797+
</filters>
766798
</configuration>
767799
</execution>
768800
</executions>
@@ -801,6 +833,14 @@ DO NOT MODIFIY - GENERATED CODE
801833
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
802834
</relocation>
803835
</relocations>
836+
<filters>
837+
<filter>
838+
<artifact>com.headius:invokebinder</artifact>
839+
<excludes>
840+
<exclude>**/module-info.class</exclude>
841+
</excludes>
842+
</filter>
843+
</filters>
804844
</configuration>
805845
</execution>
806846
</executions>
@@ -839,6 +879,14 @@ DO NOT MODIFIY - GENERATED CODE
839879
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
840880
</relocation>
841881
</relocations>
882+
<filters>
883+
<filter>
884+
<artifact>com.headius:invokebinder</artifact>
885+
<excludes>
886+
<exclude>**/module-info.class</exclude>
887+
</excludes>
888+
</filter>
889+
</filters>
842890
</configuration>
843891
</execution>
844892
</executions>
@@ -877,6 +925,14 @@ DO NOT MODIFIY - GENERATED CODE
877925
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
878926
</relocation>
879927
</relocations>
928+
<filters>
929+
<filter>
930+
<artifact>com.headius:invokebinder</artifact>
931+
<excludes>
932+
<exclude>**/module-info.class</exclude>
933+
</excludes>
934+
</filter>
935+
</filters>
880936
</configuration>
881937
</execution>
882938
</executions>
@@ -915,6 +971,14 @@ DO NOT MODIFIY - GENERATED CODE
915971
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
916972
</relocation>
917973
</relocations>
974+
<filters>
975+
<filter>
976+
<artifact>com.headius:invokebinder</artifact>
977+
<excludes>
978+
<exclude>**/module-info.class</exclude>
979+
</excludes>
980+
</filter>
981+
</filters>
918982
</configuration>
919983
</execution>
920984
</executions>
@@ -953,6 +1017,14 @@ DO NOT MODIFIY - GENERATED CODE
9531017
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
9541018
</relocation>
9551019
</relocations>
1020+
<filters>
1021+
<filter>
1022+
<artifact>com.headius:invokebinder</artifact>
1023+
<excludes>
1024+
<exclude>**/module-info.class</exclude>
1025+
</excludes>
1026+
</filter>
1027+
</filters>
9561028
</configuration>
9571029
</execution>
9581030
</executions>
@@ -991,6 +1063,14 @@ DO NOT MODIFIY - GENERATED CODE
9911063
<shadedPattern>org.jruby.me.qmx.jitescript</shadedPattern>
9921064
</relocation>
9931065
</relocations>
1066+
<filters>
1067+
<filter>
1068+
<artifact>com.headius:invokebinder</artifact>
1069+
<excludes>
1070+
<exclude>**/module-info.class</exclude>
1071+
</excludes>
1072+
</filter>
1073+
</filters>
9941074
</configuration>
9951075
</execution>
9961076
</executions>

0 commit comments

Comments
 (0)
Please sign in to comment.