Skip to content

Commit 8e62f66

Browse files
author
Jan Diederich
committed
Fixed rebase errors with module-info exclusion and moved dependencies
1 parent 3a1769b commit 8e62f66

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/main/groovy/com/github/jengelman/gradle/plugins/shadow/ShadowJavaPlugin.groovy

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class ShadowJavaPlugin implements Plugin<Project> {
2626

2727
public static final String MODULE_INFO_CLASS = 'module-info.class'
2828

29-
private final ProjectConfigurationActionContainer configurationActionContainer
3029
private final SoftwareComponentFactory softwareComponentFactory
3130

3231
@Inject
@@ -103,9 +102,6 @@ class ShadowJavaPlugin implements Plugin<Project> {
103102
project.configurations.findByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) ?:
104103
project.configurations.runtime,
105104
]
106-
shadow.exclude('META-INF/INDEX.LIST', 'META-INF/*.SF', 'META-INF/*.DSA', 'META-INF/*.RSA', 'module-info.class')
107-
shadow.configurations = [project.configurations.findByName('runtimeClasspath') ?
108-
project.configurations.runtimeClasspath : project.configurations.runtime]
109105
/*
110106
Remove excludes like this:
111107
shadowJar {

0 commit comments

Comments
 (0)