Merge branch 'stable-2.5' into stable-2.6
* stable-2.5:
Bump openid4java dependency to 0.9.8
Change-Id: Ia946c4a5a81106d6158016ac336ba7c9b7247911
diff --git a/gerrit-openid/pom.xml b/gerrit-openid/pom.xml
index bb8b93d..dbcd6a8 100644
--- a/gerrit-openid/pom.xml
+++ b/gerrit-openid/pom.xml
@@ -51,8 +51,7 @@
<dependency>
<groupId>org.openid4java</groupId>
- <artifactId>openid4java-consumer</artifactId>
- <type>pom</type>
+ <artifactId>openid4java</artifactId>
</dependency>
<dependency>
diff --git a/gerrit-war/src/main/resources/log4j.properties b/gerrit-war/src/main/resources/log4j.properties
index 250fa4c..1fcca6d 100644
--- a/gerrit-war/src/main/resources/log4j.properties
+++ b/gerrit-war/src/main/resources/log4j.properties
@@ -38,10 +38,8 @@
# Silence non-critical messages from openid4java
#
+log4j.logger.org.apache.http=WARN
log4j.logger.org.apache.xml=WARN
-log4j.logger.httpclient.wire=WARN
-log4j.logger.org.apache.commons.httpclient=WARN
-log4j.logger.org.apache.commons.httpclient.HttpMethodBase=ERROR
log4j.logger.org.openid4java=WARN
log4j.logger.org.openid4java.consumer.ConsumerManager=FATAL
log4j.logger.org.openid4java.discovery.Discovery=ERROR
diff --git a/pom.xml b/pom.xml
index 24da1a3..be5accf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -538,9 +538,8 @@
<dependency>
<groupId>org.openid4java</groupId>
- <artifactId>openid4java-consumer</artifactId>
- <version>0.9.6</version>
- <type>pom</type>
+ <artifactId>openid4java</artifactId>
+ <version>0.9.8</version>
<exclusions>
<exclusion>
<!-- conflicts with our use of guice 3.0 -->
@@ -587,12 +586,6 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.0</version>
- </dependency>
-
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.44-1</version>
