Skip to content

Commit 68a4c66

Browse files
mhuinthomasdarimont
mhuin
and
thomasdarimont
committed
Make compatible with Keycloak 10.0.2
Depends-On: https://softwarefactory-project.io/r/18836 Change-Id: I6f91151db9a23474adc0e42aee89eb53dcb24ecd Co-Authored-By: Thomas Darimont <[email protected]>
1 parent a2dd81a commit 68a4c66

File tree

3 files changed

+153
-223
lines changed

3 files changed

+153
-223
lines changed

‎pom.xml

Lines changed: 42 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
~ See the License for the specific language governing permissions and
1515
~ limitations under the License.
1616
-->
17-
1817
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1918
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2019
<groupId>org.softwarefactory.keycloak.social.github.sshkeysmapper</groupId>
21-
<version>9.0.0</version>
20+
<version>1.0.0</version>
2221

2322
<name>Keycloak: Github provider SSH keys mapper</name>
2423
<description/>
@@ -28,168 +27,75 @@
2827
<packaging>jar</packaging>
2928

3029
<properties>
31-
<version.wildfly>18.0.1.Final</version.wildfly>
32-
<version.keycloak>${project.version}</version.keycloak>
33-
34-
<version.wildfly.maven.plugin>1.2.2.Final</version.wildfly.maven.plugin>
35-
<servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
36-
<jboss-jaxrs-api_2.1_spec>1.0.1.Final</jboss-jaxrs-api_2.1_spec>
37-
<version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin>
38-
<version.war.maven.plugin>2.6</version.war.maven.plugin>
39-
<version.enforcer.maven.plugin>1.4.1</version.enforcer.maven.plugin>
40-
<version.surefire.plugin>2.19.1</version.surefire.plugin>
41-
<version.exec.maven.plugin>1.6.0</version.exec.maven.plugin>
42-
<version.antrun.maven.plugin>1.8</version.antrun.maven.plugin>
43-
<version.frontend.maven.plugin>1.4</version.frontend.maven.plugin>
44-
<version.resources.maven.plugin>3.0.2</version.resources.maven.plugin>
45-
<version.compiler.maven.plugin>3.1</version.compiler.maven.plugin>
30+
<!-- general settings -->
31+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32+
<java.version>1.8</java.version>
33+
<maven.compiler.source>${java.version}</maven.compiler.source>
34+
<maven.compiler.target>${java.version}</maven.compiler.target>
4635

47-
<arquillian-graphene.version>2.3.2</arquillian-graphene.version>
48-
<arquillian-phantom.version>1.2.1.Final</arquillian-phantom.version>
49-
<version.wildfly.arquillian.container>2.0.2.Final</version.wildfly.arquillian.container>
50-
<version.remote.wildfly.arquillian.container>8.2.1.Final</version.remote.wildfly.arquillian.container>
51-
<version.junit>4.12</version.junit>
52-
<version.hamcrest>1.3</version.hamcrest>
53-
<version.creaper>1.6.1</version.creaper>
54-
<version.jackson>2.9.5</version.jackson>
36+
<!-- dependency versions -->
37+
<keycloak.version>10.0.2</keycloak.version>
5538

56-
<arquillian-managed>true</arquillian-managed>
57-
<jboss-cli.executable>./jboss-cli.sh</jboss-cli.executable>
58-
<keycloak.management.port>10090</keycloak.management.port>
59-
<selenium-bom.version>3.11.0</selenium-bom.version>
60-
<arquillian-bom.version>1.4.0.Final</arquillian-bom.version>
61-
<arquillian-drone-bom.version>2.5.1</arquillian-drone-bom.version>
62-
<version.json.javax>1.1.2</version.json.javax>
63-
<version.yasson>1.0.1</version.yasson>
39+
<lombok.version>1.18.12</lombok.version>
40+
<auto-service.version>1.0-rc7</auto-service.version>
6441
</properties>
6542

43+
6644
<dependencies>
6745
<dependency>
68-
<groupId>org.keycloak</groupId>
69-
<artifactId>keycloak-core</artifactId>
70-
<version>${version.keycloak}</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.keycloak</groupId>
74-
<artifactId>keycloak-server-spi</artifactId>
75-
<version>${version.keycloak}</version>
46+
<groupId>org.projectlombok</groupId>
47+
<artifactId>lombok</artifactId>
48+
<optional>true</optional>
49+
<version>${lombok.version}</version>
7650
</dependency>
51+
7752
<dependency>
78-
<groupId>org.keycloak</groupId>
79-
<artifactId>keycloak-server-spi-private</artifactId>
80-
<version>${version.keycloak}</version>
53+
<groupId>com.google.auto.service</groupId>
54+
<artifactId>auto-service</artifactId>
55+
<optional>true</optional>
56+
<version>${auto-service.version}</version>
8157
</dependency>
58+
8259
<dependency>
8360
<groupId>org.keycloak</groupId>
84-
<artifactId>keycloak-broker-oidc</artifactId>
85-
<version>1.8.1.Final</version>
61+
<artifactId>keycloak-server-spi</artifactId>
62+
<version>${keycloak.version}</version>
63+
<scope>provided</scope>
8664
</dependency>
65+
8766
<dependency>
8867
<groupId>org.keycloak</groupId>
89-
<artifactId>keycloak-model-api</artifactId>
90-
<version>1.8.1.Final</version>
68+
<artifactId>keycloak-server-spi-private</artifactId>
69+
<version>${keycloak.version}</version>
70+
<scope>provided</scope>
9171
</dependency>
72+
9273
<dependency>
9374
<groupId>org.keycloak</groupId>
94-
<artifactId>keycloak-social-github</artifactId>
95-
<version>1.8.1.Final</version>
96-
</dependency>
97-
<dependency>
98-
<groupId>org.jboss.logging</groupId>
99-
<artifactId>jboss-logging</artifactId>
100-
<version>3.4.0.Final</version>
75+
<artifactId>keycloak-services</artifactId>
76+
<version>${keycloak.version}</version>
10177
<scope>provided</scope>
10278
</dependency>
103-
<dependency>
104-
<groupId>org.hamcrest</groupId>
105-
<artifactId>hamcrest-all</artifactId>
106-
<version>1.3</version>
107-
</dependency>
10879
</dependencies>
10980

11081
<build>
111-
<finalName>github-ssh-mapper-${project.version}</finalName>
112-
11382
<plugins>
11483
<plugin>
11584
<groupId>org.apache.maven.plugins</groupId>
116-
<artifactId>maven-compiler-plugin</artifactId>
117-
<version>${version.compiler.maven.plugin}</version>
85+
<artifactId>maven-jar-plugin</artifactId>
86+
<version>3.2.0</version>
11887
<configuration>
119-
<source>1.8</source>
120-
<target>1.8</target>
88+
<archive>
89+
<!-- This is required since we need to add the jboss module references
90+
to the resulting jar -->
91+
<manifestEntries>
92+
<!-- Adding explicit dependencies to avoid class-loading issues at runtime -->
93+
<Dependencies>
94+
<![CDATA[org.keycloak.keycloak-common,org.keycloak.keycloak-core,org.keycloak.keycloak-server-spi,org.keycloak.keycloak-server-spi-private,org.apache.httpcomponents,org.keycloak.keycloak-services,org.jboss.logging,javax.api,javax.jms.api,javax.transaction.api,com.fasterxml.jackson.core.jackson-core,com.fasterxml.jackson.core.jackson-annotations,com.fasterxml.jackson.core.jackson-databind]]></Dependencies>
95+
</manifestEntries>
96+
</archive>
12197
</configuration>
12298
</plugin>
123-
<plugin>
124-
<groupId>org.apache.maven.plugins</groupId>
125-
<artifactId>maven-surefire-plugin</artifactId>
126-
<version>${version.surefire.plugin}</version>
127-
<configuration>
128-
<systemPropertyVariables>
129-
<keycloakManagementPort>${keycloak.management.port}</keycloakManagementPort>
130-
<buildDirectory>${project.build.directory}</buildDirectory>
131-
</systemPropertyVariables>
132-
</configuration>
133-
</plugin>
134-
<!-- Maven Assembly Plugin -->
135-
<plugin>
136-
<groupId>org.apache.maven.plugins</groupId>
137-
<artifactId>maven-assembly-plugin</artifactId>
138-
<version>2.4.1</version>
139-
<configuration>
140-
<!-- get all project dependencies -->
141-
<descriptorRefs>
142-
<descriptorRef>jar-with-dependencies</descriptorRef>
143-
</descriptorRefs>
144-
</configuration>
145-
<executions>
146-
<execution>
147-
<id>make-assembly</id>
148-
<!-- bind to the packaging phase -->
149-
<phase>package</phase>
150-
<goals>
151-
<goal>single</goal>
152-
</goals>
153-
</execution>
154-
</executions>
155-
</plugin>
156-
<plugin>
157-
<groupId>org.wildfly.plugins</groupId>
158-
<artifactId>wildfly-maven-plugin</artifactId>
159-
<version>1.2.2.Final</version>
160-
<configuration>
161-
<skip>${wildfly.skip}</skip>
162-
<filename>${project.build.finalName}.jar</filename>
163-
<port>${keycloak.management.port}</port>
164-
</configuration>
165-
<!-- <executions>
166-
<execution>
167-
<id>add-spi</id>
168-
<phase>generate-test-resources</phase>
169-
<goals>
170-
<goal>execute-commands</goal>
171-
</goals>
172-
<configuration>
173-
<commands>
174-
<command>if (outcome != success) of /subsystem=keycloak-server/spi=eventsListener:add</command>
175-
<command> /subsystem=keycloak-server/spi=eventsListener/provider=mqtt:add(enabled=true)</command>
176-
<command>end-if</command>
177-
178-
<command>reload</command>
179-
</commands>
180-
</configuration>
181-
</execution>
182-
</executions> -->
183-
</plugin>
184-
<plugin>
185-
<artifactId>maven-enforcer-plugin</artifactId>
186-
<executions>
187-
<execution>
188-
<id>enforce-quickstart-realm-file-exist</id>
189-
<phase>validate</phase>
190-
</execution>
191-
</executions>
192-
</plugin>
19399
</plugins>
194100
</build>
195101
</project>

‎src/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)