Skip to content

Commit 5519bb8

Browse files
committed
Bump version to 1.2.0
Require Java 8 Update techcable-parent Remove uneeded dependency
1 parent 3e9a56e commit 5519bb8

File tree

8 files changed

+17
-39
lines changed

8 files changed

+17
-39
lines changed

api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>net.techcable.spawnshield</groupId>
55
<artifactId>parent</artifactId>
6-
<version>1.1.0-stable-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<artifactId>api</artifactId>

base/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@
33
<parent>
44
<groupId>net.techcable.spawnshield</groupId>
55
<artifactId>parent</artifactId>
6-
<version>1.1.0-stable-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
</parent>
88
<artifactId>base</artifactId>
99
<dependencies>
1010
<dependency>
1111
<groupId>net.techcable</groupId>
1212
<artifactId>techutils</artifactId>
13-
<version>1.1.0-SNAPSHOT</version>
13+
<version>1.1.2-SNAPSHOT</version>
1414
<scope>compile</scope>
1515
</dependency>
16-
<dependency>
17-
<groupId>com.trc202</groupId>
18-
<artifactId>combattag</artifactId>
19-
<version>6.4.1-SNAPSHOT</version>
20-
<scope>provided</scope>
21-
<optional>true</optional>
22-
</dependency>
2316
<!-- The current version of TechUtils doesn't include Yamler -->
2417
<dependency>
2518
<groupId>net.cubespace</groupId>

base/src/main/java/net/techcable/spawnshield/combattag/CombatTagHelper.java

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,34 +22,16 @@
2222
*/
2323
package net.techcable.spawnshield.combattag;
2424

25-
import com.google.common.base.Predicate;
26-
import com.google.common.collect.Iterables;
27-
import com.google.common.collect.Sets;
28-
import org.bukkit.Bukkit;
29-
import org.bukkit.entity.Entity;
30-
import org.bukkit.entity.Player;
31-
32-
import com.trc202.CombatTag.CombatTag;
33-
import com.trc202.CombatTagApi.CombatTagApi;
34-
35-
import org.bukkit.plugin.Plugin;
36-
3725
import java.lang.reflect.Constructor;
38-
import java.lang.reflect.Field;
3926
import java.lang.reflect.InvocationTargetException;
40-
import java.lang.reflect.Method;
4127
import java.util.HashSet;
4228
import java.util.Set;
43-
import java.util.UUID;
4429

45-
import net.techcable.techutils.Reflection;
46-
import org.reflections.ReflectionUtils;
47-
import org.reflections.Reflections;
48-
import org.reflections.util.ClasspathHelper;
49-
50-
import javax.annotation.Nullable;
30+
import com.google.common.collect.Iterables;
5131

52-
import static net.techcable.techutils.Reflection.*;
32+
import org.bukkit.entity.Entity;
33+
import org.bukkit.entity.Player;
34+
import org.reflections.Reflections;
5335

5436
/**
5537
* class to interface with Combat Tag, Combat Tag Reloaded, and PvPManager

combat-tag-plus/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>parent</artifactId>
88
<groupId>net.techcable.spawnshield</groupId>
9-
<version>1.1.0-stable-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>combat-tag-plus</artifactId>
1212

combat-tag/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>parent</artifactId>
88
<groupId>net.techcable.spawnshield</groupId>
9-
<version>1.1.0-stable-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>combat-tag</artifactId>
1212

pom.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,21 @@
33
<parent>
44
<groupId>net.techcable</groupId>
55
<artifactId>parent</artifactId>
6-
<version>1.0.4</version>
6+
<version>1.0.9</version>
77
</parent>
88
<groupId>net.techcable.spawnshield</groupId>
99
<artifactId>parent</artifactId>
1010
<packaging>pom</packaging>
1111
<name>SpawnShield</name>
12-
<version>1.1.0-stable-SNAPSHOT</version>
12+
<version>1.2.0</version>
1313
<description>Prevents people from entering spawn in combat</description>
14+
<properties>
15+
<java.version>1.8</java.version>
16+
</properties>
1417
<repositories>
1518
<repository>
1619
<id>techcable-repo</id>
17-
<url>http://repo.techcable.net/content/groups/public/</url>
20+
<url>https://repo.techcable.net/content/groups/public/</url>
1821
</repository>
1922
<repository>
2023
<id>minelink-repo</id>

pvp-manager/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>parent</artifactId>
88
<groupId>net.techcable.spawnshield</groupId>
9-
<version>1.1.0-stable-SNAPSHOT</version>
9+
<version>1.2.0</version>
1010
</parent>
1111
<artifactId>pvp-manager</artifactId>
1212

worldguard6/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>net.techcable.spawnshield</groupId>
55
<artifactId>parent</artifactId>
6-
<version>1.1.0-stable-SNAPSHOT</version>
6+
<version>1.2.0</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<artifactId>worldguard6</artifactId>

0 commit comments

Comments
 (0)