Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-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 A2033175D4 for ; Thu, 30 Apr 2015 09:25:55 +0000 (UTC) Received: (qmail 70815 invoked by uid 500); 30 Apr 2015 09:25:55 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70786 invoked by uid 500); 30 Apr 2015 09:25:55 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 70777 invoked by uid 99); 30 Apr 2015 09:25:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 09:25:55 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 09:25:50 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 642D9437C7 for ; Thu, 30 Apr 2015 09:25:29 +0000 (UTC) Received: (qmail 61745 invoked by uid 99); 30 Apr 2015 09:25:28 -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; Thu, 30 Apr 2015 09:25:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9DE33E3A55; Thu, 30 Apr 2015 09:25:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 30 Apr 2015 09:25:32 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/18] incubator-ignite git commit: # ignite-776 WIP X-Virus-Checked: Checked by ClamAV on apache.org # ignite-776 WIP Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5330a51d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5330a51d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5330a51d Branch: refs/heads/ignite-728 Commit: 5330a51d3d6a0b15da8d52e9c4f71041742f56b7 Parents: 5dc5a6a Author: Andrey Authored: Wed Apr 29 09:28:10 2015 +0700 Committer: Andrey Committed: Wed Apr 29 09:28:10 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridUpdateNotifier.java | 4 ++-- .../apache/ignite/internal/GridUpdateNotifierSelfTest.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5330a51d/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java index 089321b..3020313 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridUpdateNotifier.java @@ -110,7 +110,7 @@ class GridUpdateNotifier { this.ver = ver; - url = "http://tiny.cc/updater/update_status_ignite.php"; + url = "http://tiny.cc/updater/update_status_community.php"; this.gridName = gridName == null ? "null" : gridName; this.gw = gw; @@ -118,7 +118,7 @@ class GridUpdateNotifier { pluginVers = U.newHashMap(pluginProviders.size()); for (PluginProvider provider : pluginProviders) - pluginVers.put("plugins." + provider.name(), provider.version()); + pluginVers.put(provider.name() + "-plugin-version", provider.version()); this.reportOnlyNew = reportOnlyNew; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5330a51d/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java index bd0ccca..65e927b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridUpdateNotifierSelfTest.java @@ -18,9 +18,9 @@ package org.apache.ignite.internal; import org.apache.ignite.*; +import org.apache.ignite.lang.*; import org.apache.ignite.plugin.*; import org.apache.ignite.testframework.junits.common.*; -import org.h2.constant.*; import org.jetbrains.annotations.*; import java.util.*; @@ -54,7 +54,9 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testNotifier() throws Exception { - GridUpdateNotifier ntf = new GridUpdateNotifier(null, IgniteProperties.get("ignite.version"), + String nodeVer = IgniteProperties.get("ignite.version"); + + GridUpdateNotifier ntf = new GridUpdateNotifier(null, nodeVer, TEST_GATEWAY, Collections.emptyList(), false); ntf.checkForNewVersion(new SelfExecutor(), log); @@ -65,6 +67,9 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest { assertNotNull("Ignite latest version has not been detected.", ver); + assertEquals("Wrong latest version.", IgniteProductVersion.fromString(nodeVer).maintenance(), + IgniteProductVersion.fromString(ver).maintenance()); + ntf.reportStatus(log); }