Skip to content

Commit c50bea9

Browse files
using moditect to add module-info after shading, thus no longer "requires static bcprov.jdk15on"
1 parent 2b07e67 commit c50bea9

File tree

2 files changed

+25
-35
lines changed

2 files changed

+25
-35
lines changed

pom.xml

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -84,30 +84,8 @@
8484
<plugin>
8585
<artifactId>maven-compiler-plugin</artifactId>
8686
<version>3.7.0</version>
87-
<executions>
88-
<execution>
89-
<id>default-compile</id>
90-
<configuration>
91-
<release>9</release>
92-
<includes>
93-
<include>module-info.java</include>
94-
</includes>
95-
</configuration>
96-
</execution>
97-
<execution>
98-
<id>base-compile</id>
99-
<goals>
100-
<goal>compile</goal>
101-
</goals>
102-
<configuration>
103-
<excludes>
104-
<exclude>module-info.java</exclude>
105-
</excludes>
106-
</configuration>
107-
</execution>
108-
</executions>
10987
<configuration>
110-
<source>9</source>
88+
<source>1.7</source>
11189
<target>1.7</target>
11290
<release>7</release>
11391
<encoding>UTF-8</encoding>
@@ -139,13 +117,6 @@
139117
<keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
140118
<createDependencyReducedPom>false</createDependencyReducedPom>
141119
<createSourcesJar>false</createSourcesJar>
142-
<transformers>
143-
<!-- re-add module-info.class -->
144-
<transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
145-
<resource>module-info.class</resource>
146-
<file>${project.build.outputDirectory}/module-info.class</file>
147-
</transformer>
148-
</transformers>
149120
<artifactSet>
150121
<includes>
151122
<include>org.bouncycastle:bcprov-jdk15on</include>
@@ -171,6 +142,30 @@
171142
</execution>
172143
</executions>
173144
</plugin>
145+
<plugin>
146+
<groupId>org.moditect</groupId>
147+
<artifactId>moditect-maven-plugin</artifactId>
148+
<version>1.0.0.Alpha2</version>
149+
<executions>
150+
<execution>
151+
<id>add-module-infos</id>
152+
<phase>package</phase>
153+
<goals>
154+
<goal>add-module-info</goal>
155+
</goals>
156+
<configuration>
157+
<module>
158+
<moduleInfo>
159+
<name>org.cryptomator.siv</name>
160+
<exports>
161+
org.cryptomator.siv;
162+
</exports>
163+
</moduleInfo>
164+
</module>
165+
</configuration>
166+
</execution>
167+
</executions>
168+
</plugin>
174169
<plugin>
175170
<groupId>org.sonatype.plugins</groupId>
176171
<artifactId>nexus-staging-maven-plugin</artifactId>

src/main/java/module-info.java

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)