KEYCLOAK-9601 KEYCLOAK-9602 Jetty 8.1 and 9.1 removal

This commit is contained in:
Sebastian Laskawiec 2019-04-09 12:01:11 +02:00 committed by Hynek Mlnařík
parent 53019fcbe6
commit 7506d9173c
11 changed files with 11 additions and 99 deletions

View file

@ -32,7 +32,6 @@ include::topics/oidc/java/spring-boot-adapter.adoc[]
ifeval::[{project_community}==true] ifeval::[{project_community}==true]
include::topics/oidc/java/tomcat-adapter.adoc[] include::topics/oidc/java/tomcat-adapter.adoc[]
include::topics/oidc/java/jetty9-adapter.adoc[] include::topics/oidc/java/jetty9-adapter.adoc[]
include::topics/oidc/java/jetty8-adapter.adoc[]
include::topics/oidc/java/spring-security-adapter.adoc[] include::topics/oidc/java/spring-security-adapter.adoc[]
endif::[] endif::[]
@ -88,8 +87,6 @@ include::topics/saml/java/tomcat-adapter/tomcat_adapter_per_war_config.adoc[]
include::topics/saml/java/jetty-adapter.adoc[] include::topics/saml/java/jetty-adapter.adoc[]
include::topics/saml/java/jetty-adapter/jetty9_installation.adoc[] include::topics/saml/java/jetty-adapter/jetty9_installation.adoc[]
include::topics/saml/java/jetty-adapter/jetty9_per_war_config.adoc[] include::topics/saml/java/jetty-adapter/jetty9_per_war_config.adoc[]
include::topics/saml/java/jetty-adapter/jetty8-installation.adoc[]
include::topics/saml/java/jetty-adapter/jetty8-per_war_config.adoc[]
endif::[] endif::[]
include::topics/saml/java/servlet-filter-adapter.adoc[] include::topics/saml/java/servlet-filter-adapter.adoc[]

View file

@ -84,9 +84,9 @@ javax.servlet;version="[3,4)",
javax.servlet.http;version="[3,4)", javax.servlet.http;version="[3,4)",
org.apache.camel.*, org.apache.camel.*,
org.apache.camel;version="[2.13,3)", org.apache.camel;version="[2.13,3)",
org.eclipse.jetty.security;version="[8,10)", org.eclipse.jetty.security;version="[9,10)",
org.eclipse.jetty.server.nio;version="[8,10)", org.eclipse.jetty.server.nio;version="[9,10)",
org.eclipse.jetty.util.security;version="[8,10)", org.eclipse.jetty.util.security;version="[9,10)",
org.keycloak.*;version="{project_versionMvn}", org.keycloak.*;version="{project_versionMvn}",
org.osgi.service.blueprint, org.osgi.service.blueprint,
org.osgi.service.blueprint.container, org.osgi.service.blueprint.container,

View file

@ -85,8 +85,8 @@ META-INF.cxf.osgi;version="[2.7,3.2)";resolution:=optional,
org.apache.cxf.transport.http;version="[2.7,3.2)", org.apache.cxf.transport.http;version="[2.7,3.2)",
org.apache.cxf.*;version="[2.7,3.2)", org.apache.cxf.*;version="[2.7,3.2)",
com.fasterxml.jackson.jaxrs.json;version="[2.5,3)", com.fasterxml.jackson.jaxrs.json;version="[2.5,3)",
org.eclipse.jetty.security;version="[8,10)", org.eclipse.jetty.security;version="[9,10)",
org.eclipse.jetty.util.security;version="[8,10)", org.eclipse.jetty.util.security;version="[9,10)",
org.keycloak.*;version="{project_versionMvn}", org.keycloak.*;version="{project_versionMvn}",
org.keycloak.adapters.jetty;version="{project_versionMvn}", org.keycloak.adapters.jetty;version="{project_versionMvn}",
*;resolution:=optional *;resolution:=optional

View file

@ -104,7 +104,7 @@ org.apache.cxf.bus.resource;version="[2.7,3.2)",
org.apache.cxf.transport.http;version="[2.7,3.2)", org.apache.cxf.transport.http;version="[2.7,3.2)",
org.apache.cxf.*;version="[2.7,3.2)", org.apache.cxf.*;version="[2.7,3.2)",
org.springframework.beans.factory.config, org.springframework.beans.factory.config,
org.eclipse.jetty.security;version="[8,10)", org.eclipse.jetty.security;version="[9,10)",
org.eclipse.jetty.util.security;version="[8,10)", org.eclipse.jetty.util.security;version="[9,10)",
org.keycloak.*;version="{project_versionMvn}" org.keycloak.*;version="{project_versionMvn}"
---- ----

View file

@ -43,7 +43,6 @@ features:install keycloak
features:install keycloak-jetty9-adapter features:install keycloak-jetty9-adapter
---- ----
+ +
NOTE: If you are using JBoss Fuse 6.2 or later, use `keycloak-jetty8-adapter`. However, upgrading to {fuseVersion} is recommended.
. Ensure that the features were installed: . Ensure that the features were installed:

View file

@ -1,47 +0,0 @@
[[_jetty8_adapter]]
==== Jetty 8.1.x Adapter
Keycloak has a separate adapter for Jetty 8.1.x that you will have to install into your Jetty installation.
You then have to provide some extra configuration in each WAR you deploy to Jetty.
Let's go over these steps.
[[_jetty8_adapter_installation]]
===== Adapter Installation
Adapters are no longer included with the appliance or war distribution. Each adapter is a separate download on the Keycloak download site.
They are also available as a maven artifact.
You must unzip the Jetty 8.1.x distro into Jetty 8.1.x's root directory.
Including adapter's jars within your WEB-INF/lib directory will not work!
[source]
----
$ cd $JETTY_HOME
$ unzip keycloak-jetty81-adapter-dist.zip
----
Next, you will have to enable the keycloak option.
Edit start.ini and add keycloak to the options
[source]
----
#===========================================================
# Start classpath OPTIONS.
# These control what classes are on the classpath
# for a full listing do
# java -jar start.jar --list-options
#-----------------------------------------------------------
OPTIONS=Server,jsp,jmx,resources,websocket,ext,plus,annotations,keycloak
----
===== Required Per WAR Configuration
Enabling Keycloak for your WARs is the same as the Jetty 9.x adapter.
Our 8.1.x adapter supports both keycloak.json and the jboss-web.xml advanced configuration.
See <<_jetty9_per_war,Required Per WAR Configuration>>

View file

@ -2,7 +2,7 @@
[[_jetty9_adapter]] [[_jetty9_adapter]]
==== Jetty 9.x Adapters ==== Jetty 9.x Adapters
Keycloak has a separate adapter for Jetty 9.1.x, Jetty 9.2.x and Jetty 9.3.x that you will have to install into your Jetty installation. Keycloak has a separate adapter for Jetty 9.2.x, Jetty 9.3.x and Jetty 9.4.x that you will have to install into your Jetty installation.
You then have to provide some extra configuration in each WAR you deploy to Jetty. You then have to provide some extra configuration in each WAR you deploy to Jetty.
Let's go over these steps. Let's go over these steps.
@ -59,7 +59,7 @@ Next you must create a `keycloak.json` adapter config file within the `WEB-INF`
The format of this config file is described in the <<_java_adapter_config,Java adapter configuration>> section. The format of this config file is described in the <<_java_adapter_config,Java adapter configuration>> section.
WARNING: The Jetty 9.1.x adapter will not be able to find the `keycloak.json` file. WARNING: The Jetty 9.x adapter will not be able to find the `keycloak.json` file.
You will have to define all adapter settings within the `jetty-web.xml` file as described below. You will have to define all adapter settings within the `jetty-web.xml` file as described below.
Instead of using keycloak.json, you can define everything within the `jetty-web.xml`. Instead of using keycloak.json, you can define everything within the `jetty-web.xml`.

View file

@ -10,7 +10,7 @@ endif::[]
* <<_fuse_adapter,Fuse>> * <<_fuse_adapter,Fuse>>
ifeval::[{project_community}==true] ifeval::[{project_community}==true]
* <<_tomcat_adapter,Tomcat>> * <<_tomcat_adapter,Tomcat>>
* <<_jetty8_adapter,Jetty 8>> * <<_jetty9_adapter,Jetty 9>>
endif::[] endif::[]
* <<_servlet_filter_adapter,Servlet Filter>> * <<_servlet_filter_adapter,Servlet Filter>>

View file

@ -2,6 +2,6 @@
==== Jetty SAML Adapters ==== Jetty SAML Adapters
To be able to secure WAR apps deployed on Jetty you must install the {project_name} Jetty 9.x or 8.x SAML adapter into your Jetty installation. To be able to secure WAR apps deployed on Jetty you must install the {project_name} Jetty 9.x SAML adapter into your Jetty installation.
You then have to provide some extra configuration in each WAR you deploy to Jetty. You then have to provide some extra configuration in each WAR you deploy to Jetty.
Let's go over these steps. Let's go over these steps.

View file

@ -1,32 +0,0 @@
===== Jetty 8 Adapter Installation
Keycloak has a separate SAML adapter for Jetty 8.1.x that you will have to install into your Jetty installation.
You then have to provide some extra configuration in each WAR you deploy to Jetty.
Let's go over these steps.
Adapters are no longer included with the appliance or war distribution. Each adapter is a separate download on the Keycloak download site.
They are also available as a maven artifact.
You must unzip the Jetty 8.1.x distro into Jetty 8.1.x's root directory.
Including adapter's jars within your WEB-INF/lib directory will not work!
[source]
----
$ cd $JETTY_HOME
$ unzip keycloak-saml-jetty81-adapter-dist.zip
----
Next, you will have to enable the keycloak option.
Edit start.ini and add keycloak to the options
[source]
----
#===========================================================
# Start classpath OPTIONS.
# These control what classes are on the classpath
# for a full listing do
# java -jar start.jar --list-options
#-----------------------------------------------------------
OPTIONS=Server,jsp,jmx,resources,websocket,ext,plus,annotations,keycloak
----

View file

@ -1,5 +0,0 @@
===== Jetty 8 Per WAR Configuration
Enabling Keycloak for your WARs is the same as the Jetty 9.x adapter.
See <<_saml-jetty9-per-war, Jetty 9 Per War Configuration>>