diff options
| author | Shawn Pearce <sop@google.com> | 2013-05-14 14:10:44 -0700 |
|---|---|---|
| committer | Shawn Pearce <sop@google.com> | 2013-05-14 14:25:51 -0700 |
| commit | be320a9de5d87cd6d4a095dbbf2d6e9beaab44d2 (patch) | |
| tree | 1a3388feee1aca47c004a3bc94fd9adb26b132d4 | |
| parent | a15ce5d9f7857a37c0b5a40a24885714b4ad00e2 (diff) | |
| parent | af5d1dc36ed40828dad1ec5d9b1ed3126c0df165 (diff) | |
Merge branch 'stable-2.5' into stable-2.6v2.6-rc3
* stable-2.5:
Bump openid4java dependency to 0.9.8
Change-Id: Ia946c4a5a81106d6158016ac336ba7c9b7247911
| -rw-r--r-- | gerrit-openid/pom.xml | 3 | ||||
| -rw-r--r-- | gerrit-war/src/main/resources/log4j.properties | 4 | ||||
| -rw-r--r-- | pom.xml | 11 |
3 files changed, 4 insertions, 14 deletions
diff --git a/gerrit-openid/pom.xml b/gerrit-openid/pom.xml index bb8b93d6f6..dbcd6a864b 100644 --- a/gerrit-openid/pom.xml +++ b/gerrit-openid/pom.xml @@ -51,8 +51,7 @@ limitations under the License. <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 250fa4c4a9..1fcca6df02 100644 --- a/gerrit-war/src/main/resources/log4j.properties +++ b/gerrit-war/src/main/resources/log4j.properties @@ -38,10 +38,8 @@ log4j.logger.eu.medsea.mimeutil=WARN # 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 @@ -538,9 +538,8 @@ limitations under the License. <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 @@ limitations under the License. </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> |