Skip to content

Commit 2f151ce

Browse files
authored
feat: multi-release jars - add module name (#77)
resolves #66
1 parent 0fc8cde commit 2f151ce

File tree

5 files changed

+55
-4
lines changed

5 files changed

+55
-4
lines changed

core/src/main/java9/module-info.java

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module owasp.encoder {
2+
exports org.owasp.encoder;
3+
}

esapi/src/main/java9/module-info.java

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module owasp.encoder.esapi {
2+
requires owasp.encoder;
3+
4+
exports org.owasp.encoder.esapi;
5+
}
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module owasp.encoder.jakarta {
2+
requires owasp.encoder;
3+
4+
exports org.owasp.encoder.tag;
5+
}

jsp/src/main/java9/module-info.java

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module owasp.encoder.jsp {
2+
requires owasp.encoder;
3+
4+
exports org.owasp.encoder.tag;
5+
}

pom.xml

+37-4
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<plugin>
168168
<groupId>org.apache.maven.plugins</groupId>
169169
<artifactId>maven-jar-plugin</artifactId>
170-
<version>3.2.2</version>
170+
<version>3.3.0</version>
171171
</plugin>
172172
<plugin>
173173
<groupId>org.apache.maven.plugins</groupId>
@@ -241,7 +241,7 @@
241241
<plugin>
242242
<groupId>org.apache.felix</groupId>
243243
<artifactId>maven-bundle-plugin</artifactId>
244-
<version>3.3.0</version>
244+
<version>3.5.1</version>
245245
</plugin>
246246
<plugin>
247247
<groupId>org.codehaus.mojo</groupId>
@@ -265,9 +265,42 @@
265265
<plugin>
266266
<groupId>org.apache.maven.plugins</groupId>
267267
<artifactId>maven-compiler-plugin</artifactId>
268+
<executions>
269+
<execution>
270+
<id>compile-java-8</id>
271+
<goals>
272+
<goal>compile</goal>
273+
</goals>
274+
<configuration>
275+
<source>1.8</source>
276+
<target>1.8</target>
277+
</configuration>
278+
</execution>
279+
<execution>
280+
<id>compile-java-9</id>
281+
<phase>compile</phase>
282+
<goals>
283+
<goal>compile</goal>
284+
</goals>
285+
<configuration>
286+
<release>9</release>
287+
<compileSourceRoots>
288+
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
289+
</compileSourceRoots>
290+
<multiReleaseOutput>true</multiReleaseOutput>
291+
</configuration>
292+
</execution>
293+
</executions>
294+
</plugin>
295+
<plugin>
296+
<groupId>org.apache.maven.plugins</groupId>
297+
<artifactId>maven-jar-plugin</artifactId>
268298
<configuration>
269-
<source>1.6</source>
270-
<target>1.6</target>
299+
<archive>
300+
<manifestEntries>
301+
<Multi-Release>true</Multi-Release>
302+
</manifestEntries>
303+
</archive>
271304
</configuration>
272305
</plugin>
273306
<plugin>

0 commit comments

Comments
 (0)