[KEYCLOAK-11764] Upgrade to Wildfly 19

This commit is contained in:
Douglas Palmer 2020-03-24 15:10:34 -07:00 committed by Bruno Oliveira da Silva
parent d3e5bf48f0
commit d4eeed306b
36 changed files with 146 additions and 138 deletions

View file

@ -21,7 +21,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>34</version>
<version>35</version>
</parent>
<groupId>org.keycloak.bom</groupId>

View file

@ -4,88 +4,88 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.60</version>
<version>1.62</version>
<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.60</version>
<version>1.62</version>
<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.10/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.10/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.1</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10.1/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>

View file

@ -1,7 +1,7 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,

View file

@ -1,7 +1,7 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,

View file

@ -4,110 +4,110 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.60</version>
<version>1.62</version>
<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.60</version>
<version>1.62</version>
<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.9.10/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-annotations/jackson-annotations-2.10.1/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.9.10/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-core/jackson-core-2.10.1/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.1</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.9.10.1/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-databind/jackson-databind-2.10.1/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-base</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.9.10/json/src/main/resources/META-INF/LICENSE</url>
<url>https://raw.githubusercontent.com/FasterXML/jackson-jaxrs-providers/jackson-jaxrs-providers-2.10.1/json/src/main/resources/META-INF/LICENSE</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.4</version>
<version>4.5.11</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-client.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.5.4</url>
<url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-client.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.5.11</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.5</version>
<version>4.4.13</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>
<url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-core.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.4.5</url>
<url>https://git-wip-us.apache.org/repos/asf?p=httpcomponents-core.git;a=blob_plain;f=LICENSE.txt;hb=refs/tags/rel/v4.4.13</url>
</license>
</licenses>
</dependency>

View file

@ -1,7 +1,7 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,

View file

@ -1,7 +1,7 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,

View file

@ -554,7 +554,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-cbor</artifactId>
<version>2.9.10</version>
<version>2.10.1</version>
<licenses>
<license>
<name>Apache Software License 2.0</name>

View file

@ -4,22 +4,22 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.60</version>
<version>1.62</version>
<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.60</version>
<version>1.62</version>
<licenses>
<license>
<name>MIT License</name>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv60/LICENSE.html</url>
<url>https://raw.githubusercontent.com/bcgit/bc-java/r1rv62/LICENSE.html</url>
</license>
</licenses>
</dependency>

View file

@ -1,22 +0,0 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
<p>
The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
<p>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
</body>
</html>

View file

@ -0,0 +1,22 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
<p>
The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
<p>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
</body>
</html>

View file

@ -1,22 +0,0 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
<p>
The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
<p>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
</body>
</html>

View file

@ -0,0 +1,22 @@
<html>
<body bgcolor=#ffffff>
Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
<p>
Permission is hereby granted, free of charge, to any person obtaining a copy of this software
and associated documentation files (the "Software"), to deal in the Software without restriction,
including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
<p>
The above copyright notice and this permission notice shall be included in all copies or substantial
portions of the Software.
<p>
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
</body>
</html>

View file

@ -14,7 +14,7 @@
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@ -30,7 +30,7 @@
<pluginRepository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
<url>https://repository.jboss.org/nexus/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>

72
pom.xml
View file

@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>34</version>
<version>35</version>
</parent>
<name>Keycloak</name>
@ -41,10 +41,10 @@
<product.build-time>${timestamp}</product.build-time>
<wildfly.version>18.0.1.Final</wildfly.version>
<wildfly.build-tools.version>1.2.12.Final</wildfly.build-tools.version>
<wildfly.version>19.0.0.Final</wildfly.version>
<wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
<eap.version>7.3.0.GA-redhat-00004</eap.version>
<wildfly.core.version>10.0.3.Final</wildfly.core.version>
<wildfly.core.version>11.0.0.Final</wildfly.core.version>
<jboss.as.version>7.2.0.Final</jboss.as.version>
<jboss.as.subsystem.test.version>7.5.22.Final-redhat-1</jboss.as.subsystem.test.version>
@ -52,22 +52,21 @@
<!-- Versions used mostly for Undertow server, aligned with WildFly -->
<jboss.aesh.version>0.66.19</jboss.aesh.version>
<aesh.version>2.4</aesh.version>
<apache.httpcomponents.version>4.5.4</apache.httpcomponents.version>
<apache.httpcomponents.httpcore.version>4.4.5</apache.httpcomponents.httpcore.version>
<apache.httpcomponents.version>4.5.11</apache.httpcomponents.version>
<apache.httpcomponents.httpcore.version>4.4.13</apache.httpcomponents.httpcore.version>
<apache.mime4j.version>0.6</apache.mime4j.version>
<jboss.dmr.version>1.5.0.Final</jboss.dmr.version>
<bouncycastle.version>1.60</bouncycastle.version>
<cxf.version>3.3.4</cxf.version>
<cxf.jetty.version>3.3.4</cxf.jetty.version>
<cxf.jaxrs.version>3.3.4</cxf.jaxrs.version>
<cxf.undertow.version>3.3.4</cxf.undertow.version>
<bouncycastle.version>1.62</bouncycastle.version>
<cxf.version>3.3.5</cxf.version>
<cxf.jetty.version>3.3.5</cxf.jetty.version>
<cxf.jaxrs.version>3.3.5</cxf.jaxrs.version>
<cxf.undertow.version>3.3.5</cxf.undertow.version>
<dom4j.version>2.1.1</dom4j.version>
<github.relaxng.version>2.3.1</github.relaxng.version>
<h2.version>1.4.193</h2.version>
<h2.version>1.4.197</h2.version>
<jakarta.persistence.version>2.2.3</jakarta.persistence.version>
<hibernate.core.version>5.3.14.Final</hibernate.core.version>
<hibernate.c3p0.version>5.3.14.Final</hibernate.c3p0.version>
<infinispan.version>9.4.16.Final</infinispan.version>
<hibernate.core.version>5.3.15.Final</hibernate.core.version>
<hibernate.c3p0.version>5.3.15.Final</hibernate.c3p0.version>
<infinispan.version>9.4.18.Final</infinispan.version>
<!-- Will be used in the product. Upstream versions are overridden in the community profile -->
<jackson.version>2.10.0</jackson.version>
<jackson.databind.version>${jackson.version}</jackson.databind.version>
@ -85,22 +84,22 @@
<owasp.html.sanitizer.version>20191001.1</owasp.html.sanitizer.version>
<slf4j-api.version>1.7.22</slf4j-api.version>
<slf4j.version>1.7.22</slf4j.version>
<sun.istack.version>3.0.7</sun.istack.version>
<sun.xml.bind.version>2.3.1</sun.xml.bind.version>
<javax.xml.bind.jaxb.version>2.3.1</javax.xml.bind.jaxb.version>
<sun.istack.version>3.0.10</sun.istack.version>
<sun.xml.bind.version>2.3.3-b02</sun.xml.bind.version>
<javax.xml.bind.jaxb.version>2.4.0-b180830.0359</javax.xml.bind.jaxb.version>
<sun.xml.ws.version>2.3.1</sun.xml.ws.version>
<sun.activation.version>1.2.1</sun.activation.version>
<org.glassfish.jaxb.xsom.version>2.3.1</org.glassfish.jaxb.xsom.version>
<undertow.version>2.0.28.Final</undertow.version>
<elytron.version>1.10.4.Final</elytron.version>
<elytron.undertow-server.version>1.6.0.Final</elytron.undertow-server.version>
<org.glassfish.jaxb.xsom.version>2.3.3-b02</org.glassfish.jaxb.xsom.version>
<undertow.version>2.0.30.Final</undertow.version>
<elytron.version>1.11.2.Final</elytron.version>
<elytron.undertow-server.version>1.7.0.Final</elytron.undertow-server.version>
<jetty92.version>9.2.4.v20141103</jetty92.version>
<jetty93.version>9.3.9.v20160517</jetty93.version>
<jetty94.version>9.4.2.v20170220</jetty94.version>
<woodstox.version>5.0.3</woodstox.version>
<woodstox.version>6.0.3</woodstox.version>
<xmlsec.version>2.1.4</xmlsec.version>
<glassfish.json.version>1.1.6</glassfish.json.version>
<wildfly.common.version>1.5.1.Final</wildfly.common.version>
<wildfly.common.version>1.5.2.Final</wildfly.common.version>
<ua-parser.version>1.4.3</ua-parser.version>
<picketbox.version>5.0.3.Final</picketbox.version>
<google.guava.version>25.0-jre</google.guava.version>
@ -111,8 +110,9 @@
<!-- Others -->
<commons-lang.version>2.6</commons-lang.version>
<commons-lang3.version>3.9</commons-lang3.version>
<apacheds.version>2.0.0-M21</apacheds.version>
<apacheds.codec.version>1.0.0-M33</apacheds.codec.version>
<commons-io.version>2.6</commons-io.version>
<apacheds.version>2.0.0-M24</apacheds.version>
<apacheds.codec.version>1.0.0</apacheds.codec.version>
<google.zxing.version>3.4.0</google.zxing.version>
<freemarker.version>2.3.29</freemarker.version>
@ -146,7 +146,7 @@
<jmeter.analysis.plugin.version>1.0.4</jmeter.analysis.plugin.version>
<minify.plugin.version>1.7.6</minify.plugin.version>
<osgi.bundle.plugin.version>2.3.7</osgi.bundle.plugin.version>
<wildfly.plugin.version>1.2.1.Final</wildfly.plugin.version>
<wildfly.plugin.version>2.0.0.Final</wildfly.plugin.version>
<nexus.staging.plugin.version>1.6.5</nexus.staging.plugin.version>
<frontend.plugin.version>1.8.0</frontend.plugin.version>
<docker.maven.plugin.version>0.28.0</docker.maven.plugin.version>
@ -247,11 +247,6 @@
<artifactId>jboss-dmr</artifactId>
<version>${jboss.dmr.version}</version>
</dependency>
<dependency>
<groupId>com.github.relaxng</groupId>
<artifactId>relaxngDatatype</artifactId>
<version>${github.relaxng.version}</version>
</dependency>
<dependency>
<groupId>com.sun.istack</groupId>
<artifactId>istack-commons-runtime</artifactId>
@ -1475,6 +1470,11 @@
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@ -1617,9 +1617,9 @@
<product.name-html>\u003Cdiv class="kc-logo-text"\u003E\u003Cspan\u003EKeycloak\u003C\u002Fspan\u003E\u003C\u002Fdiv\u003E</product.name-html>
<product.version>${project.version}</product.version>
<product.default-profile>community</product.default-profile>
<jackson.version>2.9.10</jackson.version>
<jackson.databind.version>2.9.10.1</jackson.databind.version>
<resteasy.version>3.9.1.Final</resteasy.version>
<jackson.version>2.10.1</jackson.version>
<jackson.databind.version>${jackson.version}</jackson.databind.version>
<resteasy.version>3.11.0.Final</resteasy.version>
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
</properties>
</profile>

View file

@ -70,7 +70,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
<scope>test</scope>
</dependency>
<dependency>

View file

@ -117,7 +117,7 @@ public class SAMLLoginResponseHandlingTest extends AbstractSAMLServletAdapterTes
@Test
public void testErrorHandlingUnsigned() throws Exception {
SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder()
.destination(employeeSigServletPage.toString() + "/saml")
.destination(employeeSigServletPage.toString() + "saml")
.issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo")
.status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get());
Document document = builder.buildDocument();
@ -131,7 +131,7 @@ public class SAMLLoginResponseHandlingTest extends AbstractSAMLServletAdapterTes
@Test
public void testErrorHandlingSigned() throws Exception {
SAML2ErrorResponseBuilder builder = new SAML2ErrorResponseBuilder()
.destination(employeeSigServletPage.toString() + "/saml")
.destination(employeeSigServletPage.toString() + "saml")
.issuer("http://localhost:" + System.getProperty("auth.server.http.port", "8180") + "/realms/demo")
.status(JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get());
Document document = builder.buildDocument();

View file

@ -74,6 +74,7 @@
<argument>-Pspring-boot-adapter-${adapter.container}</argument>
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
<argument>-Dspringboot-version=${springboot.version.option}</argument>
<argument>-Dinsecure.repositories=WARN</argument>
</arguments>
</configuration>
</execution>
@ -97,6 +98,7 @@
<argument>-Dspringboot-version=${springboot.version.option}</argument>
<argument>-Dapp.server.debug.port=${app.server.debug.port}</argument>
<argument>-Dapp.server.debug.suspend=${app.server.debug.suspend}</argument>
<argument>-Dinsecure.repositories=WARN</argument>
</arguments>
</configuration>
</execution>
@ -154,6 +156,7 @@
<argument>-Pspring-boot-adapter-${adapter.container}</argument>
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
<argument>-Dspringboot-version=${springboot.version.option}</argument>
<argument>-Dinsecure.repositories=WARN</argument>
<argument>${repo.argument}</argument>
</arguments>
</configuration>
@ -180,6 +183,7 @@
<argument>-Dspringboot-version=${springboot.version.option}</argument>
<argument>-Dapp.server.debug.port=${app.server.debug.port}</argument>
<argument>-Dapp.server.debug.suspend=${app.server.debug.suspend}</argument>
<argument>-Dinsecure.repositories=WARN</argument>
<argument>${repo.argument}</argument>
</arguments>
</configuration>

View file

@ -5,7 +5,7 @@ function run-server-tests() {
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml install -B -nsu -Pauth-server-wildfly -DskipTests
cd tests/base
mvn test -B -nsu -Pauth-server-wildfly "-Dtest=$1" $2 2>&1 | java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml test -B -nsu -Pauth-server-wildfly "-Dtest=$1" $2 2>&1 | java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer
exit ${PIPESTATUS[0]}
}
@ -69,9 +69,9 @@ kill $COMPILING_PID
travis_fold end compile_keycloak
if [ $1 == "unit" ]; then
mvn -B test -DskipTestsuite
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml test -B -DskipTestsuite
# Generate documentation to catch potential issues earlier than during the release
mvn test -B -nsu -f services -Pjboss-release
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml test -B -nsu -f services -Pjboss-release
fi
if [ $1 == "server-group1" ]; then
@ -103,7 +103,7 @@ if [ $1 == "crossdc-server" ]; then
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml install -B -nsu -Pauth-servers-crossdc-jboss,auth-server-wildfly,cache-server-infinispan -DskipTests
cd tests/base
mvn clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly -Dtest=org.keycloak.testsuite.crossdc.**.* 2>&1 |
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly -Dtest=org.keycloak.testsuite.crossdc.**.* 2>&1 |
java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer
exit ${PIPESTATUS[0]}
fi
@ -113,7 +113,7 @@ if [ $1 == "crossdc-adapter" ]; then
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml install -B -nsu -Pauth-servers-crossdc-jboss,auth-server-wildfly,cache-server-infinispan,app-server-wildfly -DskipTests
cd tests/base
mvn clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly,app-server-wildfly -Dtest=org.keycloak.testsuite.adapter.**.crossdc.**.* 2>&1 |
mvn -s $TRAVIS_BUILD_DIR/maven-settings.xml clean test -B -nsu -Pcache-server-infinispan,auth-servers-crossdc-jboss,auth-server-wildfly,app-server-wildfly -Dtest=org.keycloak.testsuite.adapter.**.crossdc.**.* 2>&1 |
java -cp ../../../utils/target/classes org.keycloak.testsuite.LogTrimmer
exit ${PIPESTATUS[0]}
fi

View file

@ -35,6 +35,10 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>

View file

@ -17,6 +17,7 @@
package org.keycloak.util.ldap;
import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@ -181,12 +182,12 @@ public class RangedAttributeInterceptor extends BaseInterceptor {
}
@Override
public void close() {
public void close() throws IOException {
c.close();
}
@Override
public void close(Exception excptn) {
public void close(Exception excptn) throws IOException {
c.close(excptn);
}