Skip to content

Commit a2dd81a

Browse files
committed
some changes
* Initialize Zuul CI * add naming convention for jar * attempt to make module compatible with keycloak 9 Depends-On: https://softwarefactory-project.io/r/17993 Change-Id: Ic3694564ae840735f06654d97463273b35c5787c
1 parent 61d522d commit a2dd81a

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

.zuul.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
- project:
3+
check:
4+
jobs:
5+
- maven-build
6+
- keycloak-test-deploy:
7+
dependencies:
8+
- maven-build
9+
gate:
10+
jobs:
11+
- keycloak-test-deploy

pom.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1919
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2020
<groupId>org.softwarefactory.keycloak.social.github.sshkeysmapper</groupId>
21-
<version>7.0.0</version>
21+
<version>9.0.0</version>
2222

2323
<name>Keycloak: Github provider SSH keys mapper</name>
2424
<description/>
@@ -28,7 +28,7 @@
2828
<packaging>jar</packaging>
2929

3030
<properties>
31-
<version.wildfly>14.0.1.Final</version.wildfly>
31+
<version.wildfly>18.0.1.Final</version.wildfly>
3232
<version.keycloak>${project.version}</version.keycloak>
3333

3434
<version.wildfly.maven.plugin>1.2.2.Final</version.wildfly.maven.plugin>
@@ -73,25 +73,21 @@
7373
<groupId>org.keycloak</groupId>
7474
<artifactId>keycloak-server-spi</artifactId>
7575
<version>${version.keycloak}</version>
76-
<scope>provided</scope>
7776
</dependency>
7877
<dependency>
7978
<groupId>org.keycloak</groupId>
8079
<artifactId>keycloak-server-spi-private</artifactId>
8180
<version>${version.keycloak}</version>
82-
<scope>provided</scope>
8381
</dependency>
8482
<dependency>
8583
<groupId>org.keycloak</groupId>
8684
<artifactId>keycloak-broker-oidc</artifactId>
8785
<version>1.8.1.Final</version>
88-
<scope>provided</scope>
8986
</dependency>
9087
<dependency>
9188
<groupId>org.keycloak</groupId>
9289
<artifactId>keycloak-model-api</artifactId>
9390
<version>1.8.1.Final</version>
94-
<scope>provided</scope>
9591
</dependency>
9692
<dependency>
9793
<groupId>org.keycloak</groupId>
@@ -112,7 +108,7 @@
112108
</dependencies>
113109

114110
<build>
115-
<finalName>github-ssh-mapper</finalName>
111+
<finalName>github-ssh-mapper-${project.version}</finalName>
116112

117113
<plugins>
118114
<plugin>

src/META-INF/services/org.keycloak.social.SocialIdentityProviderFactory renamed to src/META-INF/services/org.keycloak.broker.provider.IdentityProviderMapper

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
org.keycloak.social.github.GitHubIdentityProviderFactory
18+
# org.keycloak.social.github.GitHubIdentityProviderFactory
19+
org.softwarefactory.keycloak.social.github.GithubSSHKeyMapper

src/main/java/org/softwarefactory/keycloak/social/github/GithubSSHKeyMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class GithubSSHKeyMapper extends AbstractIdentityProviderMapper {
4444

4545
public static final String CONF_KEY_ATTRIBUTE = "keyAttribute";
4646

47-
private static final List<ProviderConfigProperty> configProperties = new ArrayList<>();
47+
private static final List<ProviderConfigProperty> configProperties = new ArrayList<ProviderConfigProperty>();
4848

4949
static {
5050
ProviderConfigProperty property = new ProviderConfigProperty();

0 commit comments

Comments
 (0)