libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-1189 Add apache httpclient module with slot 4.3

Browse source
This commit is contained in:
Stian Thorgersen 2015-04-27 16:27:08 +02:00
parent f17863041a
commit 215a3497ae
53 changed files with 107 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
distribution/adapters/as7-adapter-zip/assembly.xml
View file

@ -10,27 +10,20 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/unpacked</directory> <directory>${project.build.directory}/unpacked</directory>
<includes>
<include>net/iharder/base64/**</include>
<include>org/apache/httpcomponents/**</include>
<include>org/keycloak/keycloak-core/**</include>
<include>org/keycloak/keycloak-adapter-core/**</include>
<include>org/keycloak/keycloak-jboss-adapter-core/**</include>
<include>org/keycloak/keycloak-undertow-adapter/**</include>
<include>org/keycloak/keycloak-as7-adapter/**</include>
<include>org/keycloak/keycloak-as7-subsystem/**</include>
</includes>
<excludes> <excludes>
<exclude>org/picketlink/**</exclude> <exclude>**/*.war</exclude>
<exclude>org/keycloak/keycloak-undertow-adapter/**</exclude>
<exclude>org/keycloak/keycloak-wildfly-adapter/**</exclude>
<exclude>org/jboss/**</exclude>
<exclude>org/keycloak/keycloak-subsystem/**</exclude>
</excludes> </excludes>
<outputDirectory>modules</outputDirectory> <outputDirectory>modules/system/layers/base</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>
<!--
<dependencySets>
<dependencySet>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.keycloak:keycloak-as7-adapter</include>
</includes>
<outputDirectory>lib/as7-eap6-adapter</outputDirectory>
</dependencySet>
</dependencySets>
-->
</assembly> </assembly>

30
distribution/adapters/eap6-adapter-zip/assembly.xml
View file

@ -10,27 +10,21 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/unpacked</directory> <directory>${project.build.directory}/unpacked</directory>
<includes>
<include>net/iharder/base64/**</include>
<include>org/bouncycastle/**</include>
<include>org/apache/httpcomponents/**</include>
<include>org/keycloak/keycloak-core/**</include>
<include>org/keycloak/keycloak-adapter-core/**</include>
<include>org/keycloak/keycloak-jboss-adapter-core/**</include>
<include>org/keycloak/keycloak-undertow-adapter/**</include>
<include>org/keycloak/keycloak-as7-adapter/**</include>
<include>org/keycloak/keycloak-subsystem/**</include>
</includes>
<excludes> <excludes>
<exclude>org/picketlink/**</exclude> <exclude>**/*.war</exclude>
<exclude>org/keycloak/keycloak-undertow-adapter/**</exclude>
<exclude>org/keycloak/keycloak-wildfly-adapter/**</exclude>
<exclude>org/keycloak/keycloak-as7-subsystem/**</exclude>
<exclude>org/jboss/**</exclude>
</excludes> </excludes>
<outputDirectory>modules/system/layers/base</outputDirectory> <outputDirectory>modules/system/layers/base</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>
<!--
<dependencySets>
<dependencySet>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.keycloak:keycloak-as7-adapter</include>
</includes>
<outputDirectory>lib/as7-eap6-adapter</outputDirectory>
</dependencySet>
</dependencySets>
-->
</assembly> </assembly>

8
distribution/adapters/osgi/thirdparty/pom.xml vendored
View file

@ -18,7 +18,7 @@
<properties> <properties>
<keycloak.osgi.export> <keycloak.osgi.export>
net.iharder;version="${base64.version}", net.iharder;version="${base64.version}",
org.apache.http.*;version=${keycloak.apache.httpcomponents.version} org.apache.http.*;version=${apache.httpcomponents.version}
</keycloak.osgi.export> </keycloak.osgi.export>
<keycloak.osgi.import> <keycloak.osgi.import>
*;resolution:=optional *;resolution:=optional
@ -30,15 +30,9 @@
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>
<artifactId>base64</artifactId> <artifactId>base64</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

28
distribution/adapters/wildfly-adapter-zip/assembly.xml
View file

@ -10,26 +10,20 @@
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.build.directory}/unpacked</directory> <directory>${project.build.directory}/unpacked</directory>
<includes>
<include>net/iharder/base64/**</include>
<include>org/apache/httpcomponents/**</include>
<include>org/keycloak/keycloak-core/**</include>
<include>org/keycloak/keycloak-adapter-core/**</include>
<include>org/keycloak/keycloak-jboss-adapter-core/**</include>
<include>org/keycloak/keycloak-undertow-adapter/**</include>
<include>org/keycloak/keycloak-wildfly-adapter/**</include>
<include>org/keycloak/keycloak-subsystem/**</include>
</includes>
<excludes> <excludes>
<exclude>org/keycloak/keycloak-as7-adapter/**</exclude> <exclude>**/*.war</exclude>
<exclude>org/keycloak/keycloak-as7-subsystem/**</exclude>
<exclude>org/bouncycastle/**</exclude>
<exclude>org/picketlink/**</exclude>
</excludes> </excludes>
<outputDirectory>modules/system/layers/base</outputDirectory> <outputDirectory>modules/system/layers/base</outputDirectory>
</fileSet> </fileSet>
</fileSets> </fileSets>
<!--
<dependencySets>
<dependencySet>
<unpack>false</unpack>
<useTransitiveDependencies>true</useTransitiveDependencies>
<useTransitiveFiltering>true</useTransitiveFiltering>
<includes>
<include>org.keycloak:keycloak-undertow-adapter</include>
</includes>
<outputDirectory>lib/wildfly-adapter</outputDirectory>
</dependencySet>
</dependencySets>
-->
</assembly> </assembly>

7
distribution/modules/build.xml
View file

@ -338,6 +338,13 @@
<module-def name="org.keycloak.keycloak-as7-subsystem"> <module-def name="org.keycloak.keycloak-as7-subsystem">
<maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/> <maven-resource group="org.keycloak" artifact="keycloak-as7-subsystem"/>
</module-def> </module-def>
<module-def name="org.apache.httpcomponents" slot="4.3">
<maven-resource group="org.apache.httpcomponents" artifact="httpclient"/>
<maven-resource group="org.apache.httpcomponents" artifact="httpcore"/>
<maven-resource group="org.apache.httpcomponents" artifact="httpmime"/>
</module-def>
</target> </target>
<target name="clean-target"> <target name="clean-target">

8
distribution/modules/pom.xml
View file

@ -67,6 +67,14 @@
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-as7-subsystem</artifactId> <artifactId>keycloak-as7-subsystem</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

14
distribution/modules/src/main/resources/modules/org/apache/httpcomponents/4.3/module.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.1" name="org.apache.httpcomponents" slot="4.3">
<resources>
<!-- Insert resources here -->
</resources>
<dependencies>
<module name="javax.api"/>
<module name="org.apache.commons.codec"/>
<module name="org.apache.commons.logging"/>
<module name="org.apache.james.mime4j"/>
</dependencies>
</module>

4
distribution/modules/src/main/resources/modules/org/bouncycastle/main/module.xml
View file

@ -2,11 +2,9 @@
<module xmlns="urn:jboss:module:1.1" name="org.bouncycastle"> <module xmlns="urn:jboss:module:1.1" name="org.bouncycastle">
<resources> <resources>
<resource-root path="bcprov-jdk15on-1.50.jar"/> <!-- Insert resources here -->
<resource-root path="bcpkix-jdk15on-1.50.jar"/>
</resources> </resources>
<dependencies> <dependencies>
<module name="javax.api"/> <module name="javax.api"/>
</dependencies> </dependencies>
</module> </module>

2
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-adapter-core/main/module.xml
View file

@ -11,7 +11,7 @@
<module name="org.codehaus.jackson.jackson-core-asl"/> <module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/> <module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3" />
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.keycloak.keycloak-core"/> <module name="org.keycloak.keycloak-core"/>
<module name="net.iharder.base64"/> <module name="net.iharder.base64"/>

2
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-as7-adapter/main/module.xml
View file

@ -12,7 +12,7 @@
<module name="org.codehaus.jackson.jackson-core-asl"/> <module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/> <module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3" />
<module name="javax.servlet.api"/> <module name="javax.servlet.api"/>
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.jboss.as.security"/> <module name="org.jboss.as.security"/>

2
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml
View file

@ -16,7 +16,7 @@
<module name="org.keycloak.keycloak-login-api"/> <module name="org.keycloak.keycloak-login-api"/>
<module name="org.keycloak.keycloak-services"/> <module name="org.keycloak.keycloak-services"/>
<module name="org.keycloak.keycloak-forms-common-freemarker"/> <module name="org.keycloak.keycloak-forms-common-freemarker"/>
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3" />
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="javax.ws.rs.api"/> <module name="javax.ws.rs.api"/>
<module name="org.jboss.resteasy.resteasy-jaxrs"/> <module name="org.jboss.resteasy.resteasy-jaxrs"/>

2
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
View file

@ -77,7 +77,7 @@
<module name="net.iharder.base64"/> <module name="net.iharder.base64"/>
<module name="javax.api"/> <module name="javax.api"/>
<module name="javax.activation.api"/> <module name="javax.activation.api"/>
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents" slot="4.3" />
</dependencies> </dependencies>
</module> </module>

2
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-undertow-adapter/main/module.xml
View file

@ -12,7 +12,7 @@
<module name="org.codehaus.jackson.jackson-core-asl"/> <module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/> <module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3" />
<module name="javax.servlet.api"/> <module name="javax.servlet.api"/>
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.jboss.xnio"/> <module name="org.jboss.xnio"/>

2
distribution/modules/src/main/resources/modules/org/keycloak/keycloak-wildfly-adapter/main/module.xml
View file

@ -12,7 +12,7 @@
<module name="org.codehaus.jackson.jackson-core-asl"/> <module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/> <module name="org.codehaus.jackson.jackson-mapper-asl"/>
<module name="org.codehaus.jackson.jackson-xc"/> <module name="org.codehaus.jackson.jackson-xc"/>
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3" />
<module name="javax.servlet.api"/> <module name="javax.servlet.api"/>
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="io.undertow.core"/> <module name="io.undertow.core"/>

8
distribution/server-dist/assembly.xml
View file

@ -18,8 +18,16 @@
<exclude>docs/**</exclude> <exclude>docs/**</exclude>
<exclude>standalone/deployments</exclude> <exclude>standalone/deployments</exclude>
<exclude>standalone/deployments/*</exclude> <exclude>standalone/deployments/*</exclude>
<exclude>standalone/configuration/standalone*.xml</exclude>
</excludes> </excludes>
</fileSet> </fileSet>
<fileSet>
<directory>${project.build.directory}/unpacked</directory>
<outputDirectory>standalone/configuration</outputDirectory>
<includes>
<include>standalone*.xml</include>
</includes>
</fileSet>
<fileSet> <fileSet>
<directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory> <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>

2
distribution/server-dist/pom.xml
View file

@ -72,7 +72,7 @@
<includes> <includes>
<include>standalone*.xml</include> <include>standalone*.xml</include>
</includes> </includes>
<outputDir>${project.build.directory}/unpacked/wildfly-${wildfly.version}/standalone/configuration</outputDir> <outputDir>${project.build.directory}/unpacked</outputDir>
</transformationSet> </transformationSet>
</transformationSets> </transformationSets>
</configuration> </configuration>

1
examples/basic-auth/pom.xml
View file

@ -49,7 +49,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

1
examples/cors/database-service/pom.xml
View file

@ -47,7 +47,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

1
examples/demo-template/admin-access-app/pom.xml
View file

@ -41,7 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
examples/demo-template/admin-access-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
View file

@ -3,7 +3,7 @@
<dependencies> <dependencies>
<!-- the Demo code uses classes in these modules. These are optional to import if you are not using <!-- the Demo code uses classes in these modules. These are optional to import if you are not using
Apache Http Client or the HttpClientBuilder that comes with the adapter core --> Apache Http Client or the HttpClientBuilder that comes with the adapter core -->
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents" slot="4.3"/>
</dependencies> </dependencies>
</deployment> </deployment>
</jboss-deployment-structure> </jboss-deployment-structure>

1
examples/demo-template/customer-app/pom.xml
View file

@ -41,7 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
examples/demo-template/customer-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
View file

@ -3,7 +3,7 @@
<dependencies> <dependencies>
<!-- the Demo code uses classes in these modules. These are optional to import if you are not using <!-- the Demo code uses classes in these modules. These are optional to import if you are not using
Apache Http Client or the HttpClientBuilder that comes with the adapter core --> Apache Http Client or the HttpClientBuilder that comes with the adapter core -->
<module name="org.apache.httpcomponents"/> <module name="org.apache.httpcomponents" slot="4.3"/>
</dependencies> </dependencies>
</deployment> </deployment>
</jboss-deployment-structure> </jboss-deployment-structure>

1
examples/demo-template/database-service/pom.xml
View file

@ -47,7 +47,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

1
examples/demo-template/product-app/pom.xml
View file

@ -41,7 +41,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
examples/demo-template/product-app/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
View file

@ -3,7 +3,7 @@
<dependencies> <dependencies>
<!-- the Demo code uses classes in these modules. These are optional to import if you are not using <!-- the Demo code uses classes in these modules. These are optional to import if you are not using
Apache Http Client or the HttpClientBuilder that comes with the adapter core --> Apache Http Client or the HttpClientBuilder that comes with the adapter core -->
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3"/>
</dependencies> </dependencies>
</deployment> </deployment>
</jboss-deployment-structure> </jboss-deployment-structure>

1
examples/demo-template/third-party-cdi/pom.xml
View file

@ -56,7 +56,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
examples/demo-template/third-party-cdi/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
View file

@ -3,7 +3,7 @@
<dependencies> <dependencies>
<!-- the Demo code uses classes in these modules. These are optional to import if you are not using <!-- the Demo code uses classes in these modules. These are optional to import if you are not using
Apache Http Client or the HttpClientBuilder that comes with the adapter core --> Apache Http Client or the HttpClientBuilder that comes with the adapter core -->
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3"/>
</dependencies> </dependencies>
</deployment> </deployment>
</jboss-deployment-structure> </jboss-deployment-structure>

1
examples/demo-template/third-party/pom.xml vendored
View file

@ -38,7 +38,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
examples/demo-template/third-party/src/main/webapp/WEB-INF/jboss-deployment-structure.xml vendored
View file

@ -3,7 +3,7 @@
<dependencies> <dependencies>
<!-- the Demo code uses classes in these modules. These are optional to import if you are not using <!-- the Demo code uses classes in these modules. These are optional to import if you are not using
Apache Http Client or the HttpClientBuilder that comes with the adapter core --> Apache Http Client or the HttpClientBuilder that comes with the adapter core -->
<module name="org.apache.httpcomponents" /> <module name="org.apache.httpcomponents" slot="4.3"/>
</dependencies> </dependencies>
</deployment> </deployment>
</jboss-deployment-structure> </jboss-deployment-structure>

3
examples/fuse/customer-app-fuse/pom.xml
View file

@ -18,7 +18,7 @@
<keycloak.osgi.export> <keycloak.osgi.export>
</keycloak.osgi.export> </keycloak.osgi.export>
<keycloak.osgi.import> <keycloak.osgi.import>
org.apache.http.*;version=${keycloak.apache.httpcomponents.version}, org.apache.http.*;version=${apache.httpcomponents.version},
javax.servlet.*;version="[2.5,4)", javax.servlet.*;version="[2.5,4)",
org.keycloak.adapters.jetty;version="${project.version}", org.keycloak.adapters.jetty;version="${project.version}",
org.keycloak.adapters;version="${project.version}", org.keycloak.adapters;version="${project.version}",
@ -51,7 +51,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

3
integration/adapter-core/pom.xml
View file

@ -19,7 +19,7 @@
</keycloak.osgi.export> </keycloak.osgi.export>
<keycloak.osgi.import> <keycloak.osgi.import>
org.keycloak.*;version="${project.version}", org.keycloak.*;version="${project.version}",
org.apache.http.*;version=${keycloak.apache.httpcomponents.version}, org.apache.http.*;version=${apache.httpcomponents.version},
org.apache.karaf.jaas.boot.principal;resolution:=optional, org.apache.karaf.jaas.boot.principal;resolution:=optional,
org.apache.karaf.jaas.modules;resolution:=optional, org.apache.karaf.jaas.modules;resolution:=optional,
*;resolution:=optional *;resolution:=optional
@ -71,7 +71,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

1
integration/admin-client/pom.xml
View file

@ -27,7 +27,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

1
integration/as7-eap6/adapter/pom.xml
View file

@ -29,7 +29,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/installed/pom.xml
View file

@ -29,7 +29,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/jboss-adapter-core/pom.xml
View file

@ -31,7 +31,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/jetty/jetty-core/pom.xml
View file

@ -42,7 +42,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/jetty/jetty8.1/pom.xml
View file

@ -45,7 +45,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/jetty/jetty9.1/pom.xml
View file

@ -60,7 +60,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/jetty/jetty9.2/pom.xml
View file

@ -46,7 +46,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/servlet-oauth-client/pom.xml
View file

@ -32,7 +32,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

1
integration/tomcat/tomcat-core/pom.xml
View file

@ -35,7 +35,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/tomcat/tomcat6/pom.xml
View file

@ -51,7 +51,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/tomcat/tomcat7/pom.xml
View file

@ -52,7 +52,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/tomcat/tomcat8/pom.xml
View file

@ -64,7 +64,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/undertow/pom.xml
View file

@ -31,7 +31,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

1
integration/wildfly-adapter/pom.xml
View file

@ -39,7 +39,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.iharder</groupId> <groupId>net.iharder</groupId>

21
pom.xml
View file

@ -23,7 +23,8 @@
<base64.version>2.3.8</base64.version> <base64.version>2.3.8</base64.version>
<bouncycastle.crypto.version>1.50</bouncycastle.crypto.version> <bouncycastle.crypto.version>1.50</bouncycastle.crypto.version>
<jackson.version>1.9.9</jackson.version> <jackson.version>1.9.9</jackson.version>
<keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version> <apache.httpcomponents.version>4.3.6</apache.httpcomponents.version>
<apache.httpcomponents.httpcore.version>4.3.3</apache.httpcomponents.httpcore.version>
<resteasy.version>3.0.10.Final</resteasy.version> <resteasy.version>3.0.10.Final</resteasy.version>
<undertow.version>1.1.1.Final</undertow.version> <undertow.version>1.1.1.Final</undertow.version>
<picketlink.version>2.7.0.Final</picketlink.version> <picketlink.version>2.7.0.Final</picketlink.version>
@ -427,7 +428,17 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version> <version>${apache.httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${apache.httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${apache.httpcomponents.httpcore.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wildfly.core</groupId> <groupId>org.wildfly.core</groupId>
@ -1063,6 +1074,12 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>distribution</id>
<modules>
<module>distribution</module>
</modules>
</profile>
<profile> <profile>
<id>jboss-release</id> <id>jboss-release</id>
<modules> <modules>

1
testsuite/jetty/jetty81/pom.xml
View file

@ -93,7 +93,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

1
testsuite/jetty/jetty91/pom.xml
View file

@ -93,7 +93,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

1
testsuite/jetty/jetty92/pom.xml
View file

@ -93,7 +93,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

1
testsuite/proxy/pom.xml
View file

@ -97,7 +97,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

1
testsuite/tomcat7/pom.xml
View file

@ -108,7 +108,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>

1
testsuite/tomcat8/pom.xml
View file

@ -92,7 +92,6 @@
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>${keycloak.apache.httpcomponents.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>