-
Notifications
You must be signed in to change notification settings - Fork 235
Fix JPMS split-package error by bundling shims into the main JAR #379
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
aleruz-dt
wants to merge
1
commit into
OWASP:main
Choose a base branch
from
aleruz-dt:fix/jpms-split-package
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−1
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,5 @@ target | |
| .settings | ||
| .idea | ||
| out | ||
| PLAN.md | ||
| dependency-reduced-pom.xml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,6 +67,10 @@ | |
| <configuration> | ||
| <instructions> | ||
| <Export-Package>org.owasp.html</Export-Package> | ||
| <!-- Explicit JPMS automatic module name so consumers using the | ||
| module path can require this module by a stable name that | ||
| is independent of the JAR filename. --> | ||
| <Automatic-Module-Name>owasp.java.html.sanitizer</Automatic-Module-Name> | ||
| </instructions> | ||
| </configuration> | ||
| </plugin> | ||
|
|
@@ -86,17 +90,57 @@ | |
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-shade-plugin</artifactId> | ||
| <executions> | ||
| <execution> | ||
| <phase>package</phase> | ||
| <goals><goal>shade</goal></goals> | ||
| <configuration> | ||
| <!-- Inline java8-shim and java10-shim into this JAR so that | ||
| consumers using the JPMS module path do not encounter a | ||
| split-package error from org.owasp.shim appearing in | ||
| multiple JARs. See https://github.com/OWASP/java-html-sanitizer/issues/341 --> | ||
| <artifactSet> | ||
| <includes> | ||
| <include>com.googlecode.owasp-java-html-sanitizer:java8-shim</include> | ||
| <include>com.googlecode.owasp-java-html-sanitizer:java10-shim</include> | ||
| </includes> | ||
| </artifactSet> | ||
| <filters> | ||
| <filter> | ||
| <artifact>*:*</artifact> | ||
| <excludes> | ||
| <!-- Exclude shim Maven metadata to avoid duplicate | ||
| pom.properties / pom.xml entries in the JAR --> | ||
| <exclude>META-INF/maven/com.googlecode.owasp-java-html-sanitizer/java*/**</exclude> | ||
| </excludes> | ||
| </filter> | ||
| </filters> | ||
| <!-- Replace the original JAR with the shaded one as the | ||
| main artifact; do not attach a separate shaded artifact --> | ||
| <shadedArtifactAttached>false</shadedArtifactAttached> | ||
| <!-- Generate a reduced POM that omits the now-inlined shim | ||
| dependencies, keeping the published POM accurate --> | ||
| <createDependencyReducedPom>true</createDependencyReducedPom> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>com.googlecode.owasp-java-html-sanitizer</groupId> | ||
| <artifactId>java8-shim</artifactId> | ||
| <optional>true</optional> | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the shims are included in the final JAR then there's no sense in publishing them separately to Maven Central. They should be skipped from deployment. |
||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.googlecode.owasp-java-html-sanitizer</groupId> | ||
| <artifactId>java10-shim</artifactId> | ||
| <optional>true</optional> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>commons-codec</groupId> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would make more sense to use a proper module descriptor at this point. The module descriptor should be placed in the versioned space of the JAR, i.e,
META-INF/versions/9