From 49cffebd9b8ad619d626e5a7f0d15eb883fcd7f9 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 10 Sep 2013 11:36:49 +1000 Subject: [PATCH] Dynamic build dates - see #526 --- proxy/pom.xml | 11 ++++++++++ .../main/java/net/md_5/bungee/BungeeCord.java | 20 +++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/proxy/pom.xml b/proxy/pom.xml index 7ed4e174..4b74ece2 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -18,6 +18,10 @@ BungeeCord-Proxy Proxy component of the Elastic Portal Suite + + yyyyMMdd + + com.google.code.gson @@ -71,6 +75,12 @@ BungeeCord + + + src/main/resources + true + + @@ -89,6 +99,7 @@ net.md_5.bungee.BungeeCord ${describe} + ${maven.build.timestamp} diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java index ab312427..171ec5ac 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.PrintStream; import java.net.InetAddress; import java.net.InetSocketAddress; +import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Collection; import java.util.Collections; @@ -167,15 +168,18 @@ public class BungeeCord extends ProxyServer */ public static void main(String[] args) throws Exception { - Calendar deadline = Calendar.getInstance(); - deadline.set( 2013, 9, 31 ); // year, month, date - if ( Calendar.getInstance().after( deadline ) ) + if ( BungeeCord.class.getPackage().getSpecificationVersion() != null ) { - System.err.println( "*** Warning, this build is outdated ***" ); - System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" ); - System.err.println( "*** You will get NO support regarding this build ***" ); - System.err.println( "*** Server will start in 30 seconds ***" ); - Thread.sleep( TimeUnit.SECONDS.toMillis( 30 ) ); + Calendar deadline = Calendar.getInstance(); + deadline.add( Calendar.WEEK_OF_YEAR, 2 ); + if ( Calendar.getInstance().after( new SimpleDateFormat( "yyyyMMdd" ).parse( BungeeCord.class.getPackage().getSpecificationVersion() ) ) ) + { + System.err.println( "*** Warning, this build is outdated ***" ); + System.err.println( "*** Please download a new build from http://ci.md-5.net/job/BungeeCord ***" ); + System.err.println( "*** You will get NO support regarding this build ***" ); + System.err.println( "*** Server will start in 30 seconds ***" ); + Thread.sleep( TimeUnit.SECONDS.toMillis( 30 ) ); + } } BungeeCord bungee = new BungeeCord();