Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D9909173C6 for ; Fri, 20 Mar 2015 17:00:31 +0000 (UTC) Received: (qmail 30426 invoked by uid 500); 20 Mar 2015 17:00:22 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 30390 invoked by uid 500); 20 Mar 2015 17:00:22 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 30381 invoked by uid 99); 20 Mar 2015 17:00:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2015 17:00:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 20 Mar 2015 16:59:57 +0000 Received: (qmail 30020 invoked by uid 99); 20 Mar 2015 16:59:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2015 16:59:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 74BBEE1102; Fri, 20 Mar 2015 16:59:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: <9f911b0c0c63489cbcf6012e9b946840@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-aurora git commit: Adding check to see if java version is below 1.8 Date: Fri, 20 Mar 2015 16:59:54 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 3cb8af1ef -> 9473549b9 Adding check to see if java version is below 1.8 Bugs closed: AURORA-1189 Reviewed at https://reviews.apache.org/r/32231/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/9473549b Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/9473549b Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/9473549b Branch: refs/heads/master Commit: 9473549b9e5526542cbb8d6d13bb54836ca17963 Parents: 3cb8af1 Author: Florian Pfeiffer Authored: Fri Mar 20 09:59:32 2015 -0700 Committer: Bill Farner Committed: Fri Mar 20 09:59:32 2015 -0700 ---------------------------------------------------------------------- .../aurora/scheduler/app/SchedulerMain.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/9473549b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java index 66fb432..2af009d 100644 --- a/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java +++ b/src/main/java/org/apache/aurora/scheduler/app/SchedulerMain.java @@ -15,6 +15,7 @@ package org.apache.aurora.scheduler.app; import java.net.InetSocketAddress; import java.util.List; +import java.util.logging.Logger; import javax.inject.Inject; @@ -67,6 +68,8 @@ import static com.twitter.common.logging.RootLogConfig.Configuration; */ public class SchedulerMain extends AbstractApplication { + private static final Logger LOG = Logger.getLogger(SchedulerMain.class.getName()); + @NotNull @CmdLine(name = "cluster_name", help = "Name to identify the cluster being served.") private static final Arg CLUSTER_NAME = Arg.create(); @@ -236,6 +239,21 @@ public class SchedulerMain extends AbstractApplication { logConfiguration.apply(); Log4jConfigurator.configureConsole(logConfiguration); + String javaVersion = System.getProperty("java.version"); + char javaVersionMinor = javaVersion.charAt(2); + if (javaVersionMinor < '8') { + LOG.warning( + "\n**************************************************************************\n" + + "*\n" + + "*\n" + + "*\tBeginning with Aurora 0.9.0, you'll need Java 1.8 to run aurora!\n" + + "*\tCurrently you're running \"" + javaVersion + "\"\n" + + "*\n" + + "*\n" + + "**************************************************************************" + ); + } + LeadershipListener leaderListener = schedulerLifecycle.prepare(); Optional httpSocket =