opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.5' into stable-2.6

Browse Source 
* stable-2.5:
  Bump openid4java dependency to 0.9.8

Change-Id: Ia946c4a5a81106d6158016ac336ba7c9b7247911
This commit is contained in:
Shawn Pearce
2013-05-14 14:10:44 -07:00
parent a15ce5d9f7 af5d1dc36e
commit be320a9de5
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-openid/pom.xml
View File

@@ -51,8 +51,7 @@ limitations under the License.
<dependency> <dependency>
<groupId>org.openid4java</groupId> <groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId> <artifactId>openid4java</artifactId>
<type>pom</type>
</dependency> </dependency>
<dependency> <dependency>

4
gerrit-war/src/main/resources/log4j.properties
View File

@@ -38,10 +38,8 @@ log4j.logger.eu.medsea.mimeutil=WARN
# Silence non-critical messages from openid4java # Silence non-critical messages from openid4java
# #
log4j.logger.org.apache.http=WARN
log4j.logger.org.apache.xml=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=WARN
log4j.logger.org.openid4java.consumer.ConsumerManager=FATAL log4j.logger.org.openid4java.consumer.ConsumerManager=FATAL
log4j.logger.org.openid4java.discovery.Discovery=ERROR log4j.logger.org.openid4java.discovery.Discovery=ERROR

11
pom.xml
View File

@@ -538,9 +538,8 @@ limitations under the License.
<dependency> <dependency>
<groupId>org.openid4java</groupId> <groupId>org.openid4java</groupId>
<artifactId>openid4java-consumer</artifactId> <artifactId>openid4java</artifactId>
<version>0.9.6</version> <version>0.9.8</version>
<type>pom</type>
<exclusions> <exclusions>
<exclusion> <exclusion>
<!-- conflicts with our use of guice 3.0 --> <!-- conflicts with our use of guice 3.0 -->
@@ -586,12 +585,6 @@ limitations under the License.
<version>0.6.0</version> <version>0.6.0</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.0</version>
</dependency>
<dependency> <dependency>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>