Skip to content

Commit 140a753

Browse files
MilesBHuffMilesBHuff
committed
Merge branch 'upstream'
2 parents 8689164 + 82bdc16 commit 140a753

File tree

5 files changed

+297
-407
lines changed

5 files changed

+297
-407
lines changed

‎dependency-reduced-pom.xml

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<groupId>org.dynmap</groupId>
5+
<artifactId>Dynmap-WorldGuard</artifactId>
6+
<version>1.4-beta-1</version>
7+
<build>
8+
<resources>
9+
<resource>
10+
<filtering>true</filtering>
11+
<directory>src/main/resources</directory>
12+
<includes>
13+
<include>*.yml</include>
14+
<include>*.txt</include>
15+
</includes>
16+
</resource>
17+
<resource>
18+
<directory>src/main/resources</directory>
19+
<excludes>
20+
<exclude>*.yml</exclude>
21+
<exclude>*.txt</exclude>
22+
</excludes>
23+
</resource>
24+
</resources>
25+
<plugins>
26+
<plugin>
27+
<artifactId>maven-compiler-plugin</artifactId>
28+
<version>2.0.2</version>
29+
<configuration>
30+
<source>1.8</source>
31+
<target>1.8</target>
32+
</configuration>
33+
</plugin>
34+
<plugin>
35+
<artifactId>maven-shade-plugin</artifactId>
36+
<version>3.2.1</version>
37+
<executions>
38+
<execution>
39+
<phase>package</phase>
40+
<goals>
41+
<goal>shade</goal>
42+
</goals>
43+
<configuration>
44+
<minimizeJar>true</minimizeJar>
45+
<filters>
46+
<filter>
47+
<artifact>org.bstats:bstats-bukkit:2.2.1</artifact>
48+
<includes>
49+
<include>**</include>
50+
</includes>
51+
</filter>
52+
<filter>
53+
<artifact>com.sk89q:squirrelid</artifact>
54+
<includes>
55+
<include>**</include>
56+
</includes>
57+
</filter>
58+
</filters>
59+
</configuration>
60+
</execution>
61+
</executions>
62+
<configuration>
63+
<relocations>
64+
<relocation>
65+
<pattern>com.sk89q.squirrelid</pattern>
66+
<shadedPattern>com.sk89q.worldguard.util.profile</shadedPattern>
67+
</relocation>
68+
<relocation>
69+
<pattern>org.bstats</pattern>
70+
<shadedPattern>org.dynmap.worldguard.bstats</shadedPattern>
71+
</relocation>
72+
</relocations>
73+
</configuration>
74+
</plugin>
75+
</plugins>
76+
</build>
77+
<repositories>
78+
<repository>
79+
<releases />
80+
<snapshots />
81+
<id>dynmap-repo</id>
82+
<url>https://repo.mikeprimm.com/</url>
83+
</repository>
84+
<repository>
85+
<id>spigot-repo</id>
86+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
87+
</repository>
88+
<repository>
89+
<id>enginehub-maven</id>
90+
<url>https://maven.enginehub.org/repo/</url>
91+
</repository>
92+
<repository>
93+
<releases />
94+
<snapshots />
95+
<id>essentials</id>
96+
<url>https://repo.essentialsx.net/releases/</url>
97+
</repository>
98+
</repositories>
99+
<dependencies>
100+
<dependency>
101+
<groupId>us.dynmap</groupId>
102+
<artifactId>dynmap-api</artifactId>
103+
<version>3.3-SNAPSHOT</version>
104+
<scope>provided</scope>
105+
<exclusions>
106+
<exclusion>
107+
<artifactId>DynmapCoreAPI</artifactId>
108+
<groupId>us.dynmap</groupId>
109+
</exclusion>
110+
</exclusions>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.bukkit</groupId>
114+
<artifactId>bukkit</artifactId>
115+
<version>1.13.2-R0.1-SNAPSHOT</version>
116+
<scope>provided</scope>
117+
<exclusions>
118+
<exclusion>
119+
<artifactId>commons-lang</artifactId>
120+
<groupId>commons-lang</groupId>
121+
</exclusion>
122+
<exclusion>
123+
<artifactId>json-simple</artifactId>
124+
<groupId>com.googlecode.json-simple</groupId>
125+
</exclusion>
126+
<exclusion>
127+
<artifactId>guava</artifactId>
128+
<groupId>com.google.guava</groupId>
129+
</exclusion>
130+
<exclusion>
131+
<artifactId>gson</artifactId>
132+
<groupId>com.google.code.gson</groupId>
133+
</exclusion>
134+
<exclusion>
135+
<artifactId>snakeyaml</artifactId>
136+
<groupId>org.yaml</groupId>
137+
</exclusion>
138+
</exclusions>
139+
</dependency>
140+
<dependency>
141+
<groupId>com.sk89q.worldedit</groupId>
142+
<artifactId>worldedit-bukkit</artifactId>
143+
<version>7.2.0</version>
144+
<scope>provided</scope>
145+
<exclusions>
146+
<exclusion>
147+
<artifactId>worldedit-core</artifactId>
148+
<groupId>com.sk89q.worldedit</groupId>
149+
</exclusion>
150+
<exclusion>
151+
<artifactId>bukkit</artifactId>
152+
<groupId>com.sk89q.worldedit.worldedit-libs</groupId>
153+
</exclusion>
154+
<exclusion>
155+
<artifactId>spigot-api</artifactId>
156+
<groupId>org.spigotmc</groupId>
157+
</exclusion>
158+
<exclusion>
159+
<artifactId>paperlib</artifactId>
160+
<groupId>io.papermc</groupId>
161+
</exclusion>
162+
<exclusion>
163+
<artifactId>log4j-slf4j-impl</artifactId>
164+
<groupId>org.apache.logging.log4j</groupId>
165+
</exclusion>
166+
<exclusion>
167+
<artifactId>fastutil</artifactId>
168+
<groupId>it.unimi.dsi</groupId>
169+
</exclusion>
170+
</exclusions>
171+
</dependency>
172+
<dependency>
173+
<groupId>com.sk89q.worldguard</groupId>
174+
<artifactId>worldguard-bukkit</artifactId>
175+
<version>7.0.0</version>
176+
<scope>provided</scope>
177+
<exclusions>
178+
<exclusion>
179+
<artifactId>worldguard-core</artifactId>
180+
<groupId>com.sk89q.worldguard</groupId>
181+
</exclusion>
182+
<exclusion>
183+
<artifactId>commandbook</artifactId>
184+
<groupId>com.sk89q</groupId>
185+
</exclusion>
186+
</exclusions>
187+
</dependency>
188+
</dependencies>
189+
<dependencyManagement>
190+
<dependencies>
191+
<dependency>
192+
<groupId>org.bstats</groupId>
193+
<artifactId>bstats-bukkit</artifactId>
194+
<version>2.2.1</version>
195+
<scope>compile</scope>
196+
</dependency>
197+
</dependencies>
198+
</dependencyManagement>
199+
</project>

‎pom.xml

Lines changed: 93 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,48 @@
2929
<artifactId>maven-compiler-plugin</artifactId>
3030
<version>2.0.2</version>
3131
<configuration>
32-
<source>1.7</source>
33-
<target>1.7</target>
32+
<source>1.8</source>
33+
<target>1.8</target>
3434
</configuration>
3535
</plugin>
3636
<plugin>
3737
<groupId>org.apache.maven.plugins</groupId>
3838
<artifactId>maven-shade-plugin</artifactId>
3939
<version>3.2.1</version>
40+
<configuration>
41+
<relocations>
42+
<relocation>
43+
<pattern>com.sk89q.squirrelid</pattern>
44+
<shadedPattern>com.sk89q.worldguard.util.profile</shadedPattern>
45+
</relocation>
46+
<relocation>
47+
<pattern>org.bstats</pattern>
48+
<shadedPattern>org.dynmap.worldguard.bstats</shadedPattern>
49+
</relocation>
50+
</relocations>
51+
</configuration>
4052
<executions>
4153
<execution>
4254
<phase>package</phase>
4355
<goals>
4456
<goal>shade</goal>
4557
</goals>
4658
<configuration>
47-
<artifactSet>
48-
<includes>
49-
<include>org.dynmap:Dynmap-WorldGuard</include>
50-
</includes>
51-
</artifactSet>
52-
<relocations>
53-
<relocation>
54-
<pattern>com.sk89q.squirrelid</pattern>
55-
<shadedPattern>com.sk89q.worldguard.util.profile</shadedPattern>
56-
</relocation>
57-
</relocations>
59+
<minimizeJar>true</minimizeJar>
60+
<filters>
61+
<filter>
62+
<artifact>org.bstats:bstats-bukkit:2.2.1</artifact>
63+
<includes>
64+
<include>**</include>
65+
</includes>
66+
</filter>
67+
<filter>
68+
<artifact>com.sk89q:squirrelid</artifact>
69+
<includes>
70+
<include>**</include>
71+
</includes>
72+
</filter>
73+
</filters>
5874
</configuration>
5975
</execution>
6076
</executions>
@@ -64,45 +80,79 @@
6480

6581
<repositories>
6682
<repository>
83+
<releases></releases>
84+
<snapshots></snapshots>
6785
<id>dynmap-repo</id>
6886
<url>https://repo.mikeprimm.com/</url>
6987
</repository>
7088
<repository>
71-
<id>sk89q-repo</id>
72-
<url>http://maven.sk89q.com/repo/</url>
89+
<id>spigot-repo</id>
90+
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
91+
</repository>
92+
<repository>
93+
<id>enginehub-maven</id>
94+
<url>https://maven.enginehub.org/repo/</url>
95+
</repository>
96+
<repository>
97+
<releases></releases>
98+
<snapshots></snapshots>
99+
<id>essentials</id>
100+
<url>https://repo.essentialsx.net/releases/</url>
73101
</repository>
74102
<repository>
75103
<id>spigot-repo</id>
76104
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
77105
</repository>
78106
</repositories>
79107

80-
<dependencies>
81-
<dependency>
82-
<groupId>us.dynmap</groupId>
83-
<artifactId>dynmap-api</artifactId>
84-
<version>3.0-SNAPSHOT</version>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.bukkit</groupId>
88-
<artifactId>bukkit</artifactId>
89-
<version>1.14.4-R0.1-SNAPSHOT</version>
90-
</dependency>
91-
<dependency>
92-
<groupId>com.sk89q.worldguard</groupId>
93-
<artifactId>worldguard-bukkit</artifactId>
94-
<version>7.0.1-SNAPSHOT</version>
95-
</dependency>
96-
<dependency>
97-
<groupId>com.sk89q.worldedit</groupId>
98-
<artifactId>worldedit-bukkit</artifactId>
99-
<version>7.1.0-SNAPSHOT</version>
100-
</dependency>
101-
<dependency>
102-
<groupId>com.sk89q</groupId>
103-
<artifactId>squirrelid</artifactId>
104-
<version>0.2.0-SNAPSHOT</version>
105-
</dependency>
106-
</dependencies>
107-
<version>1.3-SNAPSHOT</version>
108+
<dependencyManagement>
109+
<dependencies>
110+
<dependency>
111+
<groupId>org.bstats</groupId>
112+
<artifactId>bstats-bukkit</artifactId>
113+
<version>2.2.1</version>
114+
<scope>compile</scope>
115+
</dependency>
116+
</dependencies>
117+
</dependencyManagement>
118+
119+
<dependencies>
120+
<dependency>
121+
<groupId>us.dynmap</groupId>
122+
<artifactId>dynmap-api</artifactId>
123+
<version>3.3-SNAPSHOT</version>
124+
<scope>provided</scope>
125+
</dependency>
126+
<dependency>
127+
<groupId>org.bukkit</groupId>
128+
<artifactId>bukkit</artifactId>
129+
<version>1.13.2-R0.1-SNAPSHOT</version>
130+
<scope>provided</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.bstats</groupId>
134+
<artifactId>bstats-bukkit</artifactId>
135+
<version>2.2.1</version>
136+
<scope>compile</scope>
137+
</dependency>
138+
<dependency>
139+
<groupId>com.sk89q</groupId>
140+
<artifactId>squirrelid</artifactId>
141+
<version>0.2.0</version>
142+
<scope>compile</scope>
143+
</dependency>
144+
<dependency>
145+
<groupId>com.sk89q.worldedit</groupId>
146+
<artifactId>worldedit-bukkit</artifactId>
147+
<version>7.2.0</version>
148+
<scope>provided</scope>
149+
</dependency>
150+
<dependency>
151+
<groupId>com.sk89q.worldguard</groupId>
152+
<artifactId>worldguard-bukkit</artifactId>
153+
<version>7.0.0</version>
154+
<scope>provided</scope>
155+
</dependency>
156+
</dependencies>
157+
<version>1.4-SNAPSHOT</version>
108158
</project>

0 commit comments

Comments
 (0)