From cafaa9a38c5c662bc7f32bb595ded4cd8dc8ea87 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <sop@google.com>
Date: Tue, 15 Dec 2009 16:19:51 -0800
Subject: [PATCH] Update Ehcache to 1.7.1

Disable the automatic update check for Ehcache.  Because the library
is embedded in the Gerrit distribution our users are not likely to
update it on their own.  Letting them know there is a new version
at server startup does not help them.

Change-Id: If10710db723b5bb2e32478d8526e649f200d781e
Signed-off-by: Shawn O. Pearce <sop@google.com>
---
 .../java/com/google/gerrit/server/cache/CachePool.java    | 8 ++++++++
 gerrit-war/src/main/java/log4j.properties                 | 4 ++++
 pom.xml                                                   | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java
index 4d438e1cc2..8a3f41bb5d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java
@@ -83,6 +83,14 @@ public class CachePool {
         throw new IllegalStateException("Cache pool has already been started");
       }
 
+      try {
+        System.setProperty("net.sf.ehcache.skipUpdateCheck", "" + true);
+      } catch (SecurityException e) {
+        // Ignore it, the system is just going to ping some external page
+        // using a background thread and there's not much we can do about
+        // it now.
+      }
+
       manager = new CacheManager(new Factory().toConfiguration());
       for (CacheProvider<?, ?> p : caches.values()) {
         p.bind(manager.getEhcache(p.getName()));
diff --git a/gerrit-war/src/main/java/log4j.properties b/gerrit-war/src/main/java/log4j.properties
index 400ac3c00e..f7a5cdcf1b 100644
--- a/gerrit-war/src/main/java/log4j.properties
+++ b/gerrit-war/src/main/java/log4j.properties
@@ -48,6 +48,10 @@ log4j.logger.org.openid4java.discovery.Discovery=ERROR
 log4j.logger.org.openid4java.server.RealmVerifier=ERROR
 log4j.logger.org.openid4java.message.AuthSuccess=ERROR
 
+# Silence non-critical messages from ehcache
+#
+log4j.logger.net.sf.ehcache=WARN
+
 # Silence non-critical messages from c3p0 (if used).
 #
 log4j.logger.com.mchange.v2.c3p0=WARN
diff --git a/pom.xml b/pom.xml
index dea3bd0304..8aeb8a99fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -540,7 +540,7 @@ limitations under the License.
       <dependency>
         <groupId>net.sf.ehcache</groupId>
         <artifactId>ehcache-core</artifactId>
-        <version>1.7.0</version>
+        <version>1.7.1</version>
       </dependency>
 
       <dependency>