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>
This commit is contained in:
@@ -83,6 +83,14 @@ public class CachePool {
|
|||||||
throw new IllegalStateException("Cache pool has already been started");
|
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());
|
manager = new CacheManager(new Factory().toConfiguration());
|
||||||
for (CacheProvider<?, ?> p : caches.values()) {
|
for (CacheProvider<?, ?> p : caches.values()) {
|
||||||
p.bind(manager.getEhcache(p.getName()));
|
p.bind(manager.getEhcache(p.getName()));
|
||||||
|
|||||||
@@ -48,6 +48,10 @@ log4j.logger.org.openid4java.discovery.Discovery=ERROR
|
|||||||
log4j.logger.org.openid4java.server.RealmVerifier=ERROR
|
log4j.logger.org.openid4java.server.RealmVerifier=ERROR
|
||||||
log4j.logger.org.openid4java.message.AuthSuccess=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).
|
# Silence non-critical messages from c3p0 (if used).
|
||||||
#
|
#
|
||||||
log4j.logger.com.mchange.v2.c3p0=WARN
|
log4j.logger.com.mchange.v2.c3p0=WARN
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -540,7 +540,7 @@ limitations under the License.
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.sf.ehcache</groupId>
|
<groupId>net.sf.ehcache</groupId>
|
||||||
<artifactId>ehcache-core</artifactId>
|
<artifactId>ehcache-core</artifactId>
|
||||||
<version>1.7.0</version>
|
<version>1.7.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
Reference in New Issue
Block a user