You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/05 08:56:55 UTC
[09/50] incubator-ignite git commit: # ignite-776 WIP
# 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-157-2
Commit: 5330a51d3d6a0b15da8d52e9c4f71041742f56b7
Parents: 5dc5a6a
Author: Andrey <an...@gridgain.com>
Authored: Wed Apr 29 09:28:10 2015 +0700
Committer: Andrey <an...@gridgain.com>
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.<PluginProvider>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);
}