Skip to content

Fixes #759 - Plugin generates corrupted shaded sources beyond recognition #759 #760

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

Fixes #759 - Plugin generates corrupted shaded sources beyond recognition #759 #760

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/main/java/org/apache/maven/plugins/shade/relocation/SimpleRelocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class SimpleRelocator implements Relocator {
/**
* Match dot, slash or space at end of string
*/
private static final Pattern RX_ENDS_WITH_DOT_SLASH_SPACE = Pattern.compile("[./ ]$");
private static final Pattern RX_ENDS_WITH_DOT_SLASH_SPACE = Pattern.compile("(\\.|/|[^<?:+\\-*/^|&] )$");

/**
* Match <ul>
Expand All @@ -46,7 +46,7 @@ public class SimpleRelocator implements Relocator {
* at end of string
*/
private static final Pattern RX_ENDS_WITH_JAVA_KEYWORD = Pattern.compile(
"\\b(import|package|public|protected|private|static|final|synchronized|abstract|volatile|extends|implements|throws) $"
"\\b(import|package|public|protected|private|static|final|synchronized|abstract|volatile|extends|implements|instanceof|throws|throw|return|new|case) $"
+ "|"
+ "\\{@link( \\*)* $"
+ "|"
Expand Down
48 changes: 48 additions & 0 deletions src/test/java/org/apache/maven/plugins/shade/relocation/SimpleRelocatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,30 @@ public void testRelocateMavenFiles() {
+ " /** Javadoc, followed by default visibility method with fully qualified return type */\n"
+ " org.apache.maven.MyReturnType doSomething( org.apache.maven.Bar bar, org.objectweb.asm.sub.Something something) {\n"
+ " org.apache.maven.Bar bar;\n"
+ " Map<org.apache.maven.Key, org.apache.maven.Value> map1;\n"
+ " Map< org.apache.maven.Key, org.apache.maven.Value > map2;\n"
+ " throw org.apache.maven.Error.newError();\n"
+ " throw new org.apache.maven.Error();\n"
+ " boolean flag1 = bar instanceof org.apache.maven.Bar;\n"
+ " boolean flag2 = org.apache.maven.Utils.yes() ? org.apache.maven.Utils.one() : org.apache.maven.Utils.zero();\n"
+ " boolean flag3 = org.apache.maven.Utils.yes() || org.apache.maven.Utils.no();\n"
+ " boolean flag4 = org.apache.maven.Utils.yes() && org.apache.maven.Utils.no();\n"
+ " boolean flag5 = org.apache.maven.Utils.yes() ^^ org.apache.maven.Utils.no();\n"
+ " int value1 = org.apache.maven.Utils.x() + org.apache.maven.Utils.y()\n"
+ " int value2 = org.apache.maven.Utils.x() - org.apache.maven.Utils.y()\n"
+ " int value3 = org.apache.maven.Utils.x() * org.apache.maven.Utils.y()\n"
+ " int value4 = org.apache.maven.Utils.x() / org.apache.maven.Utils.y()\n"
+ " int value5 = org.apache.maven.Utils.one() | org.apache.maven.Utils.two()\n"
+ " int value6 = org.apache.maven.Utils.one() & org.apache.maven.Utils.two()\n"
+ " int value7 = org.apache.maven.Utils.one() ^ org.apache.maven.Utils.two()\n"
+ " switch (org.apache.maven.Utils.getValue()) {\n"
+ " case org.apache.maven.Utils.STATIC_VALUE:\n"
+ " org.apache.maven.Utils.info(\"known value\"):\n"
+ " break;\n"
+ " default:\n"
+ " org.apache.maven.Utils.warn(\"unknown value\"):\n"
+ " break;\n"
+ " }\n"
+ " org.objectweb.asm.sub.Something something;\n"
+ " String io, val;\n"
+ " String noRelocation = \"NoWordBoundaryXXXorg.apache.maven.In\";\n"
Expand Down Expand Up @@ -241,6 +265,30 @@ public void testRelocateMavenFiles() {
+ " /** Javadoc, followed by default visibility method with fully qualified return type */\n"
+ " com.acme.maven.MyReturnType doSomething( com.acme.maven.Bar bar, aj.org.objectweb.asm.sub.Something something) {\n"
+ " com.acme.maven.Bar bar;\n"
+ " Map<com.acme.maven.Key, com.acme.maven.Value> map1;\n"
+ " Map< com.acme.maven.Key, com.acme.maven.Value > map2;\n"
+ " throw com.acme.maven.Error.newError();\n"
+ " throw new com.acme.maven.Error();\n"
+ " boolean flag1 = bar instanceof com.acme.maven.Bar;\n"
+ " boolean flag2 = com.acme.maven.Utils.yes() ? com.acme.maven.Utils.one() : com.acme.maven.Utils.zero();\n"
+ " boolean flag3 = com.acme.maven.Utils.yes() || com.acme.maven.Utils.no();\n"
+ " boolean flag4 = com.acme.maven.Utils.yes() && com.acme.maven.Utils.no();\n"
+ " boolean flag5 = com.acme.maven.Utils.yes() ^^ com.acme.maven.Utils.no();\n"
+ " int value1 = com.acme.maven.Utils.x() + com.acme.maven.Utils.y()\n"
+ " int value2 = com.acme.maven.Utils.x() - com.acme.maven.Utils.y()\n"
+ " int value3 = com.acme.maven.Utils.x() * com.acme.maven.Utils.y()\n"
+ " int value4 = com.acme.maven.Utils.x() / com.acme.maven.Utils.y()\n"
+ " int value5 = com.acme.maven.Utils.one() | com.acme.maven.Utils.two()\n"
+ " int value6 = com.acme.maven.Utils.one() & com.acme.maven.Utils.two()\n"
+ " int value7 = com.acme.maven.Utils.one() ^ com.acme.maven.Utils.two()\n"
+ " switch (com.acme.maven.Utils.getValue()) {\n"
+ " case com.acme.maven.Utils.STATIC_VALUE:\n"
+ " com.acme.maven.Utils.info(\"known value\"):\n"
+ " break;\n"
+ " default:\n"
+ " com.acme.maven.Utils.warn(\"unknown value\"):\n"
+ " break;\n"
+ " }\n"
+ " aj.org.objectweb.asm.sub.Something something;\n"
+ " String io, val;\n"
+ " String noRelocation = \"NoWordBoundaryXXXorg.apache.maven.In\";\n"
Expand Down