From 7c1f232e85b5c4024db7748c4bbc262b75022f25 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 8 Feb 2015 13:07:41 +1100 Subject: [PATCH] Update depend versions, limit use of most Java 1.7 APIs. --- bootstrap/pom.xml | 2 +- chat/pom.xml | 3 +- .../java/net/md_5/bungee/event/EventBus.java | 2 +- pom.xml | 34 ++++++++++++++----- proxy/pom.xml | 4 +-- .../net/md_5/bungee/BungeeServerInfo.java | 4 +-- .../java/net/md_5/bungee/ServerConnector.java | 4 +-- .../java/net/md_5/bungee/UserConnection.java | 4 +-- .../bungee/connection/DownstreamBridge.java | 4 +-- 9 files changed, 39 insertions(+), 22 deletions(-) diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index fcc94a64..3bbc4d61 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -32,7 +32,7 @@ net.sf.jopt-simple jopt-simple - 4.6 + 4.8 compile diff --git a/chat/pom.xml b/chat/pom.xml index 283c87e3..f424c0a3 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -22,12 +22,11 @@ com.google.code.gson gson - 2.3 + 2.3.1 compile - diff --git a/event/src/main/java/net/md_5/bungee/event/EventBus.java b/event/src/main/java/net/md_5/bungee/event/EventBus.java index 9e05c7a8..cd4057f9 100644 --- a/event/src/main/java/net/md_5/bungee/event/EventBus.java +++ b/event/src/main/java/net/md_5/bungee/event/EventBus.java @@ -29,7 +29,7 @@ public class EventBus public EventBus(Logger logger) { - this.logger = ( logger == null ) ? Logger.getGlobal() : logger; + this.logger = ( logger == null ) ? Logger.getLogger( Logger.GLOBAL_LOGGER_NAME ) : logger; } public void post(Object event) diff --git a/pom.xml b/pom.xml index a4d05fb2..c4f603b0 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,9 @@ unknown - 4.0.23.Final + 4.0.25.Final + 1.7 + 1.7 UTF-8 @@ -73,7 +75,7 @@ junit junit - 4.11 + 4.12 test @@ -91,7 +93,7 @@ org.projectlombok lombok - 1.14.8 + 1.16.0 provided @@ -116,12 +118,28 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 + org.codehaus.mojo + animal-sniffer-maven-plugin + 1.13 + + + process-classes + + check + + + - 1.7 - 1.7 + + java.lang.ClassLoader + java.lang.Throwable + java.util.Locale + + + org.codehaus.mojo.signature + java16 + 1.1 + diff --git a/proxy/pom.xml b/proxy/pom.xml index 8c5b61c6..f60ba371 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -65,13 +65,13 @@ mysql mysql-connector-java - 5.1.32 + 5.1.34 runtime org.javassist javassist - 3.18.2-GA + 3.19.0-GA runtime diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java index be3debb4..1dd0aeba 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java @@ -1,5 +1,6 @@ package net.md_5.bungee; +import com.google.common.base.Objects; import com.google.common.base.Preconditions; import io.netty.bootstrap.Bootstrap; import io.netty.channel.ChannelFuture; @@ -11,7 +12,6 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.LinkedList; -import java.util.Objects; import java.util.Queue; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -79,7 +79,7 @@ public class BungeeServerInfo implements ServerInfo @Override public boolean equals(Object obj) { - return ( obj instanceof ServerInfo ) && Objects.equals( getAddress(), ( (ServerInfo) obj ).getAddress() ); + return ( obj instanceof ServerInfo ) && Objects.equal( getAddress(), ( (ServerInfo) obj ).getAddress() ); } @Override diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java index 257606d6..6d4ea8a7 100644 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java @@ -1,9 +1,9 @@ package net.md_5.bungee; +import com.google.common.base.Objects; import com.google.common.base.Preconditions; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; -import java.util.Objects; import java.util.Queue; import java.util.Set; import lombok.Getter; @@ -265,7 +265,7 @@ public class ServerConnector extends PacketHandler public void handle(Kick kick) throws Exception { ServerInfo def = bungee.getServerInfo( user.getPendingConnection().getListener().getFallbackServer() ); - if ( Objects.equals( target, def ) ) + if ( Objects.equal( target, def ) ) { def = null; } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index 4a85f4eb..66791296 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -1,5 +1,6 @@ package net.md_5.bungee; +import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import io.netty.bootstrap.Bootstrap; @@ -15,7 +16,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Locale; import java.util.Map; -import java.util.Objects; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.logging.Level; @@ -228,7 +228,7 @@ public final class UserConnection implements ProxiedPlayer final BungeeServerInfo target = (BungeeServerInfo) event.getTarget(); // Update in case the event changed target - if ( getServer() != null && Objects.equals( getServer().getInfo(), target ) ) + if ( getServer() != null && Objects.equal( getServer().getInfo(), target ) ) { sendMessage( bungee.getTranslation( "already_connected" ) ); return; diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 01c6eec8..afbc88c4 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -1,9 +1,9 @@ package net.md_5.bungee.connection; +import com.google.common.base.Objects; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import java.io.DataInput; -import java.util.Objects; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.Unpooled; @@ -458,7 +458,7 @@ public class DownstreamBridge extends PacketHandler public void handle(Kick kick) throws Exception { ServerInfo def = bungee.getServerInfo( con.getPendingConnection().getListener().getFallbackServer() ); - if ( Objects.equals( server.getInfo(), def ) ) + if ( Objects.equal( server.getInfo(), def ) ) { def = null; }