Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #617 (maven-shade conf updates)

Browse Source 
Updated shade exclusions, org.apache.logging should now be shady enou…
This commit is contained in:
Rsl1122 2018-06-19 16:43:05 +03:00 committed by GitHub
commit 7a0aeeff97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Plan/dependency-reduced-pom.xml
View File

@ -35,7 +35,7 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>3.1.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -65,21 +65,21 @@
<pattern>org.apache</pattern> <pattern>org.apache</pattern>
<shadedPattern>plan.org.apache</shadedPattern> <shadedPattern>plan.org.apache</shadedPattern>
<excludes> <excludes>
<exclude>org.apache.logging.*</exclude> <exclude>org.apache.logging.**</exclude>
</excludes> </excludes>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.maxmind</pattern> <pattern>com.maxmind</pattern>
<shadedPattern>plan.com.maxmind</shadedPattern> <shadedPattern>plan.com.maxmind</shadedPattern>
<excludes> <excludes>
<exclude>org.apache.logging.*</exclude> <exclude>org.apache.logging.**</exclude>
</excludes> </excludes>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.fasterxml</pattern> <pattern>com.fasterxml</pattern>
<shadedPattern>plan.com.fasterxml</shadedPattern> <shadedPattern>plan.com.fasterxml</shadedPattern>
<excludes> <excludes>
<exclude>org.apache.logging.*</exclude> <exclude>org.apache.logging.**</exclude>
</excludes> </excludes>
</relocation> </relocation>
</relocations> </relocations>
@ -399,4 +399,3 @@
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
</project> </project>

8
Plan/pom.xml
View File

@ -164,7 +164,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>3.1.1</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -194,21 +194,21 @@
<pattern>org.apache</pattern> <pattern>org.apache</pattern>
<shadedPattern>plan.org.apache</shadedPattern> <shadedPattern>plan.org.apache</shadedPattern>
<excludes> <excludes>
<exclude>org.apache.logging.*</exclude> <exclude>org.apache.logging.**</exclude>
</excludes> </excludes>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.maxmind</pattern> <pattern>com.maxmind</pattern>
<shadedPattern>plan.com.maxmind</shadedPattern> <shadedPattern>plan.com.maxmind</shadedPattern>
<excludes> <excludes>
<exclude>org.apache.logging.*</exclude> <exclude>org.apache.logging.**</exclude>
</excludes> </excludes>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.fasterxml</pattern> <pattern>com.fasterxml</pattern>
<shadedPattern>plan.com.fasterxml</shadedPattern> <shadedPattern>plan.com.fasterxml</shadedPattern>
<excludes> <excludes>
<exclude>org.apache.logging.*</exclude> <exclude>org.apache.logging.**</exclude>
</excludes> </excludes>
</relocation> </relocation>
</relocations> </relocations>