diff --git a/Home.md b/Home.md
index a63c7a5..cf850d9 100644
--- a/Home.md
+++ b/Home.md
@@ -1,20 +1,25 @@
MITREid Connect is a reference implementation of the OpenID Connect protocol server and client, built on the Java, Spring, and Spring Security platforms. Java API documentation and a technical overview for the current version (generated by the Maven Site plugin) is always available at [http://mitreid-connect.github.com/](http://mitreid-connect.github.com).
-The current stable release is **1.1.5**. Development of this is currently tracked on the **master** branch.
+The current stable release is **1.1.6**. Development of this is currently tracked on the **master** branch.
The current legacy release is **1.0.15**. Development of this is currently tracked on the **1.0.x** branch and will be limited to major bugfixes and security updates. To upgrade from the legacy 1.0 series, see instructions at [Upgrading from 1.0 to 1.1](wiki/Upgrading-1.0-to-1.1).
# Project Information
+## Development
* [Maven Artifacts](wiki/Maven-Dependency), a listing of our published Maven artifacts
* [Build Instructions](wiki/Build-instructions), how to build this project using Maven
- * [Client Filter Configuration](wiki/Client-configuration), how to configure the MITREid Connect Client-side filter
- * [Server Configuration](wiki/Server-configuration), how to configure the MITREid Connect server
+ * [Maven Overlay](wiki/Maven-Overlay-Project-How-To), the recommended way to build and deploy a custom server
* [Supported Features](wiki/Features), a list of current and planned features implemented in MITREid Connect
* [Architecture](wiki/Architecture), an overview of the server's architecture
- * [Maven Overlay](wiki/Maven-Overlay-Project-How-To), the recommended way to build and deploy a custom server
- * [Server API](wiki/API), RESTful API for managing clients, scopes, whitelists, blacklists, approvals, and tokens
+
+## Clients
+ * [Client Filter Configuration](wiki/Client-configuration), how to configure the MITREid Connect Client-side filter
* [Token Introspecting Client Filter](wiki/Token-Introspecting-Client-Config), uses Token Introspection to configure a client that can accept tokens from a remote authorization server
+
+## Servers
+ * [Server Configuration](wiki/Server-configuration), how to configure the MITREid Connect server
+ * [Server API](wiki/API), RESTful API for managing clients, scopes, whitelists, blacklists, approvals, and tokens
# Related Github projects
diff --git a/Maven-Dependency.md b/Maven-Dependency.md
index 6b4d11d..306665b 100644
--- a/Maven-Dependency.md
+++ b/Maven-Dependency.md
@@ -11,7 +11,7 @@ The parent Maven project, which depends on each of the following artifacts. Incl
org.mitre
openid-connect-parent
- 1.1.5
+ 1.1.6
pom
```
@@ -22,7 +22,7 @@ Includes common classes, service and repository interfaces, and JPA-annotated mo
org.mitre
openid-connect-common
- 1.1.5
+ 1.1.6
jar
```
@@ -33,7 +33,7 @@ Includes our RP/client implementation, built around spring security filters. Dep
org.mitre
openid-connect-client
- 1.1.5
+ 1.1.6
jar
```
@@ -44,7 +44,7 @@ Includes implementations of services and repositories from common which are used
org.mitre
openid-connect-server
- 1.1.5
+ 1.1.6
jar
```
@@ -56,7 +56,7 @@ Includes IdP/server implementation, deployable as a webapp. Depends on openid-co
org.mitre
openid-connect-server-webapp
- 1.1.5
+ 1.1.6
war
```
\ No newline at end of file
diff --git a/Maven-Overlay-Project-How-To.md b/Maven-Overlay-Project-How-To.md
index 19aa172..d7bf795 100644
--- a/Maven-Overlay-Project-How-To.md
+++ b/Maven-Overlay-Project-How-To.md
@@ -41,7 +41,7 @@ You can find an example of the results of this guide [here](https://github.com/m
3.2.3.RELEASE
1.5.10
3.1.0.RELEASE
- 1.1.3
+ 1.1.6
diff --git a/Server-configuration.md b/Server-configuration.md
index a252d73..e25dddb 100644
--- a/Server-configuration.md
+++ b/Server-configuration.md
@@ -9,7 +9,9 @@ The MITREid Connect server can function as an OpenID Connect Identity Provider (
## user-context.xml
-If you override this file, be sure to include the `promptFilter` in your configured filters stack for handling `prompt=login`, `prompt=consent`, and `prompt=none` functions. Also make sure your primary authentication filter references `authenticationTimeStamper` as its `authenticationSuccessHandler`. An example of a custom configuration follows:
+If you override this file, be sure to include the `promptFilter` in your configured filters stack for handling `prompt=login`, `prompt=consent`, `prompt=none`, and `max_auth_age` functions. Ensure that the primary authentication filter references `authenticationTimeStamper` as its `authenticationSuccessHandler` in order for the server to keep track of the end user's authentication time.
+
+An example of a custom configuration follows:
```xml
diff --git a/Upgrading-1.0-to-1.1.md b/Upgrading-1.0-to-1.1.md
index c683142..a363348 100644
--- a/Upgrading-1.0-to-1.1.md
+++ b/Upgrading-1.0-to-1.1.md
@@ -1,4 +1,4 @@
-The **1.1** version of MITREid Connect contains several changes from the **1.0** version series that will require a manual upgrade process.
+The **1.1** version of MITREid Connect contains several changes from the **1.0** version series that will require a manual upgrade process. There is not currently any automated upgrade process, though one is being developed.
## Project Layout
@@ -8,7 +8,7 @@ The project now contains four modules instead of three. The `openid-connect-serv
The underlying data model has changed between 1.0 and 1.1, and updates to the database are required.
-If you are running the server with a persistent database store, you will need to run the database upgrade script found in [openid-connect-server-webapp/src/main/resources/db/upgrade](https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/tree/master/openid-connect-server-webapp/src/main/resources/db/upgrade). Upgrade scripts are included for both MySQL and HSQL databases. These are designed to be run in-place on the database in question.
+If you are running the server with a persistent database store, you will need to run the database upgrade script found in [openid-connect-server-webapp/src/main/resources/db/upgrade](https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/tree/master/openid-connect-server-webapp/src/main/resources/db/upgrade). Upgrade scripts are included for both MySQL and HSQL databases. These are designed to be run in-place on the database in question. The safest process is as follows:
1. Shut down the version 1.0 server
1. Connect to the MySQL or HSQL database as a user with appropriate rights
@@ -17,4 +17,6 @@ If you are running the server with a persistent database store, you will need to
## Existing data
-Existing authorizations are incompatible between 1.0 and 1.1. All active access tokens must be revoked (or translated using some form of external process) during the upgrade process. Note that this includes any Registration Access Tokens used for dynamically registered clients. Otherwise, all authorization grants, clients, whitelists, blacklists, and scopes may remain in place following the instructions above.
\ No newline at end of file
+Due to an upstream library change, existing authorizations are incompatible between 1.0 and 1.1. This effectively means that **all active access tokens must be revoked** (or translated using some form of external process) during the upgrade process. Note that this includes any **Registration Access Tokens** used for dynamically registered clients.
+
+Otherwise, all authorization grants, clients, whitelists, blacklists, and scopes may remain in place following the instructions above.
\ No newline at end of file