Added default value for IGNITE_UPDATE_NOTIFIER
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ea64f3ab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ea64f3ab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ea64f3ab Branch: refs/heads/ignite-1.5.1 Commit: ea64f3abed69052f34bc743cb32903ab5051660c Parents: 58e6412 Author: Anton Vinogradov <a...@apache.org> Authored: Wed Dec 16 15:18:58 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Wed Dec 16 15:18:58 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 5 +++++ .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 3 ++- modules/core/src/main/resources/ignite.properties | 1 + parent/pom.xml | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64f3ab/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 065082d..c8702bd 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -331,6 +331,11 @@ <property name="props.file" value="../../modules/core/target/classes/ignite.properties" /> <replaceregexp file="${props.file}" byline="true"> + <regexp pattern="ignite.update.notifier.enabled.by.default=.*" /> + <substitution expression="ignite.update.notifier.enabled.by.default=${update.notifier.enabled.by.default}" /> + </replaceregexp> + + <replaceregexp file="${props.file}" byline="true"> <regexp pattern="ignite.rel.date=.*" /> <substitution expression="ignite.rel.date=${ignite.rel.date}" /> </replaceregexp> http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64f3ab/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 0f781d6..e0503fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -745,7 +745,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { // Run background network diagnostics. GridDiagnostic.runBackgroundCheck(gridName, execSvc, log); - boolean notifyEnabled = IgniteSystemProperties.getBoolean(IGNITE_UPDATE_NOTIFIER, true); + boolean notifyEnabled = IgniteSystemProperties.getBoolean(IGNITE_UPDATE_NOTIFIER, + Boolean.parseBoolean(IgniteProperties.get("ignite.update.notifier.enabled.by.default"))); // Ack 3-rd party licenses location. if (log.isInfoEnabled() && cfg.getIgniteHome() != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64f3ab/modules/core/src/main/resources/ignite.properties ---------------------------------------------------------------------- diff --git a/modules/core/src/main/resources/ignite.properties b/modules/core/src/main/resources/ignite.properties index 073c9ab..866bbc9 100644 --- a/modules/core/src/main/resources/ignite.properties +++ b/modules/core/src/main/resources/ignite.properties @@ -20,3 +20,4 @@ ignite.build=0 ignite.revision=DEV ignite.rel.date=01011970 ignite.update.status.params=test=vfvfvskfkeievskjv +ignite.update.notifier.enabled.by.default=false http://git-wip-us.apache.org/repos/asf/ignite/blob/ea64f3ab/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 486fc0d..f665d40 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -43,6 +43,7 @@ <git.exec>git</git.exec> <maven.bundle.plugin.version>2.5.4</maven.bundle.plugin.version> <javadoc.opts>-XDenableSunApiLintControl</javadoc.opts> + <update.notifier.enabled.by.default>true</update.notifier.enabled.by.default> <!-- Dependency versions. --> <activemq.version>5.12.0</activemq.version>