Skip to content

[#798] Add an opt-out for the separator newline #802

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.

Sign up for GitHub

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
jafarre-bi wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

[#798] Add an opt-out for the separator newline #802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/main/java/org/apache/maven/plugins/shade/resource/AppendingTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@

/**
* A resource processor that appends content for a resource, separated by a newline.
* The newline separator can be disabled with {@code <separator>false</separator>}.
*/
public class AppendingTransformer extends AbstractCompatibilityTransformer {
String resource;
boolean separator = true;

ByteArrayOutputStream data = new ByteArrayOutputStream();

Expand All @@ -47,7 +49,9 @@ public boolean canTransformResource(String r) {
public void processResource(String resource, InputStream is, List<Relocator> relocators, long time)
throws IOException {
IOUtil.copy(is, data);
data.write('\n');
if (separator || !data.toString().endsWith("\n")) {
data.write('\n');
}
if (time > this.time) {
this.time = time;
}
Expand Down