Skip to content

Commit

Permalink
OC-102: trying to fix package relocations, as classes in top-level pa…
Browse files Browse the repository at this point in the history 
…ckage from <include> were not relocated
  • Loading branch information
@marek-parfianowicz
marek-parfianowicz committed Jul 2, 2024
1 parent 264e488 commit b3d08fa
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion clover-ant/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>clover.org.apache.commons.lang3</shadedPattern>
<includes>
<include>org.apache.commons.lang3.**</include>
<include>org.apache.commons.lang3.*</include>
</includes>
</relocation>
</relocations>
Expand Down
18 changes: 9 additions & 9 deletions clover-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,64 +435,64 @@
<pattern>antlr</pattern>
<shadedPattern>clover.antlr</shadedPattern>
<includes>
<include>antlr.**</include>
<include>antlr.*</include>
</includes>
</relocation>
<relocation>
<pattern>com.lowagie</pattern>
<shadedPattern>clover.com.lowagie</shadedPattern>
<includes>
<include>com.lowagie.**</include>
<include>com.lowagie.*</include>
</includes>
</relocation>
<!-- note: we do not shade org.jetbrains:annotations -->
<relocation>
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>clover.org.apache.commons.codec</shadedPattern>
<includes>
<include>org.apache.commons.codec.**</include>
<include>org.apache.commons.codec.*</include>
</includes>
</relocation>
<relocation>
<pattern>org.apache.commons.collections</pattern>
<shadedPattern>clover.org.apache.commons.collections</shadedPattern>
<includes>
<include>org.apache.commons.collections.**</include>
<include>org.apache.commons.collections.*</include>
</includes>
</relocation>
<relocation>
<pattern>org.apache.commons.lang</pattern>
<shadedPattern>clover.org.apache.commons.lang</shadedPattern>
<includes>
<include>org.apache.commons.lang.**</include>
<include>org.apache.commons.lang.*</include>
</includes>
</relocation>
<relocation>
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>clover.org.apache.commons.lang3</shadedPattern>
<includes>
<include>org.apache.commons.lang3.**</include>
<include>org.apache.commons.lang3.*</include>
</includes>
</relocation>
<relocation>
<pattern>org.jdom</pattern>
<shadedPattern>clover.org.jdom</shadedPattern>
<includes>
<include>org.jdom.**</include>
<include>org.jdom.*</include>
</includes>
</relocation>
<relocation>
<pattern>org.jfree</pattern>
<shadedPattern>clover.org.jfree</shadedPattern>
<includes>
<include>org.jfree.**</include>
<include>org.jfree.*</include>
</includes>
</relocation>
<relocation>
<pattern>it.unimi.dsi.fastutil</pattern>
<shadedPattern>clover.it.unimi.dsi.fastutil</shadedPattern>
<includes>
<include>it.unimi.dsi.fastutil.**</include>
<include>it.unimi.dsi.fastutil.*</include>
</includes>
</relocation>
</relocations>
Expand Down
6 changes: 3 additions & 3 deletions clover-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,21 +250,21 @@
<pattern>antlr</pattern>
<shadedPattern>clover.antlr</shadedPattern>
<includes>
<include>antlr.**</include>
<include>antlr.*</include>
</includes>
</relocation>
<relocation>
<pattern>gnu.cajo</pattern>
<shadedPattern>clover.gnu.cajo</shadedPattern>
<includes>
<include>gnu.cajo.**</include>
<include>gnu.cajo.*</include>
</includes>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>clover.org.slf4j</shadedPattern>
<includes>
<include>org.slf4j.**</include>
<include>org.slf4j.*</include>
</includes>
</relocation>
</relocations>
Expand Down

0 comments on commit b3d08fa

Please sign in to comment.