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

[KEYCLOAK-3134] - Remove 'org.keycloak.keycloak-authz-server' module

Browse source
This commit is contained in:
Pedro Igor 2016-06-20 11:54:32 -03:00
parent 6a1fb8f870
commit d5167c1632
4 changed files with 97 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
dependencies/server-all/pom.xml vendored
View file

@ -31,6 +31,30 @@
<name>Keycloak Dependencies Server All</name> <name>Keycloak Dependencies Server All</name>
<description /> <description />
<properties>
<!-- Drools dependencies versions -->
<version.org.eclipse.sisu>0.3.0.M1</version.org.eclipse.sisu>
<version.org.eclipse.aether>1.0.0.v20140518</version.org.eclipse.aether>
<version.org.apache.ant>1.8.3</version.org.apache.ant>
<version.org.antlr>3.5</version.org.antlr>
<version.aopalliance>1.0</version.aopalliance>
<version.org.apache.maven>3.2.5</version.org.apache.maven>
<version.org.mvel>2.2.8.Final</version.org.mvel>
<version.org.sonatype.plexus.plexus-cipher>1.7</version.org.sonatype.plexus.plexus-cipher>
<version.org.codehaus.plexus.plexus-classworlds>2.5.2</version.org.codehaus.plexus.plexus-classworlds>
<version.org.codehaus.plexus.plexus-component-annotations>1.5.5</version.org.codehaus.plexus.plexus-component-annotations>
<version.org.codehaus.plexus.plexus-interpolation>1.21</version.org.codehaus.plexus.plexus-interpolation>
<version.org.codehaus.plexus.plexus-sec-dispatcher>1.3</version.org.codehaus.plexus.plexus-sec-dispatcher>
<version.org.codehaus.plexus.plexus-utils>3.0.20</version.org.codehaus.plexus.plexus-utils>
<version.org.apache.maven.wagon>2.6</version.org.apache.maven.wagon>
<version.com.thoughtworks.xstream>1.4.7</version.com.thoughtworks.xstream>
<version.com.google.guava>13.0.1</version.com.google.guava>
<version.org.eclipse.jdt.core.compiler>4.4.2</version.org.eclipse.jdt.core.compiler>
<version.com.lowagie>2.1.2</version.com.lowagie>
<version.org.sonatype.sisu>3.2.3</version.org.sonatype.sisu>
<version.com.google.inject.extensions.guice-servlet>3.0</version.com.google.inject.extensions.guice-servlet>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
@ -107,6 +131,12 @@
<dependency> <dependency>
<groupId>org.kie</groupId> <groupId>org.kie</groupId>
<artifactId>kie-ci</artifactId> <artifactId>kie-ci</artifactId>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.kie</groupId> <groupId>org.kie</groupId>
@ -123,202 +153,217 @@
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId> <artifactId>aether-api</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId> <artifactId>aether-connector-basic</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-spi</artifactId> <artifactId>aether-spi</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId> <artifactId>aether-impl</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-file</artifactId> <artifactId>aether-transport-file</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-http</artifactId> <artifactId>aether-transport-http</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId> <artifactId>aether-transport-wagon</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.aether</groupId> <groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId> <artifactId>aether-util</artifactId>
<version>1.0.0.v20140518</version> <version>${version.org.eclipse.aether}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId> <artifactId>ant</artifactId>
<version>1.8.2</version> <version>${version.org.apache.ant}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>org.apache.ant</groupId>
<artifactId>ant-launcher</artifactId> <artifactId>ant-launcher</artifactId>
<version>1.8.2</version> <version>${version.org.apache.ant}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId> <artifactId>antlr-runtime</artifactId>
<version>3.5</version> <version>${version.org.antlr}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>aopalliance</groupId> <groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId> <artifactId>aopalliance</artifactId>
<version>1.0</version> <version>${version.aopalliance}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId> <artifactId>maven-aether-provider</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId> <artifactId>maven-compat</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId> <artifactId>maven-model</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-model-builder</artifactId> <artifactId>maven-model-builder</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId> <artifactId>maven-plugin-api</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId> <artifactId>maven-repository-metadata</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings-builder</artifactId> <artifactId>maven-settings-builder</artifactId>
<version>3.2.2</version> <version>${version.org.apache.maven}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mvel</groupId> <groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId> <artifactId>mvel2</artifactId>
<version>2.2.4.Final</version> <version>${version.org.mvel}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.sisu</groupId> <groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId> <artifactId>org.eclipse.sisu.inject</artifactId>
<version>0.0.0.M5</version> <version>${version.org.eclipse.sisu}</version>
<exclusions>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
<version>${version.com.google.inject.extensions.guice-servlet}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.sisu</groupId> <groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId> <artifactId>org.eclipse.sisu.plexus</artifactId>
<version>0.0.0.M5</version> <version>${version.org.eclipse.sisu}</version>
<exclusions>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-cipher</artifactId> <artifactId>plexus-cipher</artifactId>
<version>1.4</version> <version>${version.org.sonatype.plexus.plexus-cipher}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId> <artifactId>plexus-classworlds</artifactId>
<version>2.5.1</version> <version>${version.org.codehaus.plexus.plexus-classworlds}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId> <artifactId>plexus-component-annotations</artifactId>
<version>1.5.5</version> <version>${version.org.codehaus.plexus.plexus-component-annotations}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId> <artifactId>plexus-interpolation</artifactId>
<version>1.19</version> <version>${version.org.codehaus.plexus.plexus-interpolation}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.plexus</groupId> <groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-sec-dispatcher</artifactId> <artifactId>plexus-sec-dispatcher</artifactId>
<version>1.3</version> <version>${version.org.codehaus.plexus.plexus-sec-dispatcher}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.plexus</groupId> <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId> <artifactId>plexus-utils</artifactId>
<version>3.0.17</version> <version>${version.org.codehaus.plexus.plexus-utils}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http</artifactId> <artifactId>wagon-http</artifactId>
<version>2.0</version> <version>${version.org.apache.maven.wagon}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-http-shared4</artifactId> <artifactId>wagon-http-shared</artifactId>
<version>2.0</version> <version>${version.org.apache.maven.wagon}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.wagon</groupId> <groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId> <artifactId>wagon-provider-api</artifactId>
<version>1.0</version> <version>${version.org.apache.maven.wagon}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thoughtworks.xstream</groupId> <groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId> <artifactId>xstream</artifactId>
<version>1.4.7</version> <version>${version.com.thoughtworks.xstream}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>13.0.1</version> <version>${version.com.google.guava}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jdt.core.compiler</groupId> <groupId>org.eclipse.jdt.core.compiler</groupId>
<artifactId>ecj</artifactId> <artifactId>ecj</artifactId>
<version>4.3.1</version> <version>${version.org.eclipse.jdt.core.compiler}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
<version>4.3.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId> <artifactId>httpcore</artifactId>
<version>4.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.lowagie</groupId> <groupId>com.lowagie</groupId>
<artifactId>itext</artifactId> <artifactId>itext</artifactId>
<version>2.1.2</version> <version>${version.com.lowagie}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>bouncycastle</groupId> <groupId>bouncycastle</groupId>
@ -328,12 +373,17 @@
<groupId>bouncycastle</groupId> <groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk14</artifactId> <artifactId>bcprov-jdk14</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.sonatype.sisu</groupId> <groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId> <artifactId>sisu-guice</artifactId>
<version>3.1.0</version> <version>${version.org.sonatype.sisu}</version>
<classifier>no_aop</classifier>
</dependency> </dependency>
</dependencies> </dependencies>

5
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/drools/main/module.xml
View file

@ -58,7 +58,7 @@
<artifact name="${org.sonatype.plexus:plexus-sec-dispatcher}"/> <artifact name="${org.sonatype.plexus:plexus-sec-dispatcher}"/>
<artifact name="${org.codehaus.plexus:plexus-utils}"/> <artifact name="${org.codehaus.plexus:plexus-utils}"/>
<artifact name="${org.apache.maven.wagon:wagon-http}"/> <artifact name="${org.apache.maven.wagon:wagon-http}"/>
<artifact name="${org.apache.maven.wagon:wagon-http-shared4}"/> <artifact name="${org.apache.maven.wagon:wagon-http-shared}"/>
<artifact name="${org.apache.maven.wagon:wagon-provider-api}"/> <artifact name="${org.apache.maven.wagon:wagon-provider-api}"/>
<artifact name="${com.thoughtworks.xstream:xstream}"/> <artifact name="${com.thoughtworks.xstream:xstream}"/>
<artifact name="${com.google.guava:guava}"/> <artifact name="${com.google.guava:guava}"/>
@ -66,7 +66,8 @@
<artifact name="${org.apache.httpcomponents:httpclient}"/> <artifact name="${org.apache.httpcomponents:httpclient}"/>
<artifact name="${org.apache.httpcomponents:httpcore}"/> <artifact name="${org.apache.httpcomponents:httpcore}"/>
<artifact name="${com.lowagie:itext}"/> <artifact name="${com.lowagie:itext}"/>
<artifact name="${org.sonatype.sisu:sisu-guice}"/> <artifact name="${org.sonatype.sisu:sisu-guice::no_aop}"/>
<artifact name="${com.google.inject.extensions:guice-servlet}"/>
</resources> </resources>
<dependencies> <dependencies>
<module name="javax.api"/> <module name="javax.api"/>

9
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-authz-server/main/module.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-authz-server">
<dependencies>
<module name="org.keycloak.keycloak-authz-policy-common" export="true" services="export"/>
<module name="org.keycloak.keycloak-authz-policy-drools" export="true" services="export"/>
</dependencies>
</module>

3
distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml
View file

@ -45,7 +45,8 @@
<module name="org.keycloak.keycloak-wildfly-extensions" services="import"/> <module name="org.keycloak.keycloak-wildfly-extensions" services="import"/>
<!-- Authorization --> <!-- Authorization -->
<module name="org.keycloak.keycloak-authz-server" services="import"/> <module name="org.keycloak.keycloak-authz-policy-common" services="import"/>
<module name="org.keycloak.keycloak-authz-policy-drools" services="import"/>
<module name="org.freemarker"/> <module name="org.freemarker"/>
<module name="javax.ws.rs.api"/> <module name="javax.ws.rs.api"/>