Update openid4java to 0.9.6

Change-Id: I05b21ca4f2ee75fc0e3ec789712f7314c7fd1cda
Signed-off-by: Shawn O. Pearce <sop@google.com>

Documentation/licenses.txt

@@ -50,6 +50,7 @@ Included Components
 |AOP Alliance               | Public Domain
 |JSR 305                    | <<jsr305,New-Style BSD>>
 |dk.brics.automaton         | <<automaton,New-Style BSD>>
+|Java Concurrency in Practice Annotations | <<jcip,Create Commons Attribution License>>
 |======================================================================
 
 Cryptography Notice
@@ -667,6 +668,24 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ----
 
+[[jcip]]
+Java Concurrency in Practice Annotations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* link:http://jcip.net/[book website]
+* link:http://jcip.net/jcip-annotations-src.jar[sources]
+* link:http://creativecommons.org/licenses/by/2.5/[license]
+
+----
+Copyright (c) 2005 Brian Goetz and Tim Peierls
+Released under the Creative Commons Attribution License
+  (http://creativecommons.org/licenses/by/2.5)
+Official home: http://www.jcip.net
+
+Any republication or derived work distributed in source code form
+must include this copyright and license notice.
+----
+
 [[mpl1_1]]
 Mozilla Public License 1.1
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

ReleaseNotes/ReleaseNotes-2.1.7.txt

@@ -138,9 +138,9 @@ different URL by using a reverse proxy that does URL rewriting.
 * Internal dependencies updated
 +
 Updated H2 Database to 1.2.147, PostgreSQL JDBC Client to 9.0-801,
-ANTLR to 3.2, GWT to 2.1.1, JSch to 0.1.44, Gson to 1.6, Apache
+openid4java to 0.9.6, ANTLR to 3.2, GWT to 2.1.1, JSch to 0.1.44, Gson
-Commons Net to 2.2, Apache Commons Pool to 1.5.5, JGit to
+to 1.6, Apache Commons Net to 2.2, Apache Commons Pool to 1.5.5, JGit
-0.12.1.41-g4b4df4c, MINA SSHD to 0.5.1-r1095809.
+to 0.12.1.41-g4b4df4c, MINA SSHD to 0.5.1-r1095809.
 
 Bug Fixes
 ---------

gerrit-httpd/pom.xml

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

pom.xml

@@ -446,7 +446,8 @@ limitations under the License.
       <dependency>
         <groupId>org.openid4java</groupId>
         <artifactId>openid4java-consumer</artifactId>
-        <version>0.9.5</version>
+        <version>0.9.6</version>
+        <type>pom</type>
         <exclusions>
           <exclusion>
             <!-- jug-1.1 is LGPL, and the source has been lost -->