Skip to content

Commit 1e41f01

Browse files
authored
Merge pull request #28 from mrmateo/enchancement/JENKINS-76329
[JENKINS-76329] Update to newer dependencies that allow plugin to build with recent jenkins versions.
2 parents 11575f0 + bd3d66d commit 1e41f01

File tree

1 file changed

+60
-8
lines changed

1 file changed

+60
-8
lines changed

pom.xml

Lines changed: 60 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.88</version>
7+
<version>5.28</version>
88
<relativePath />
99
</parent>
1010

@@ -27,10 +27,12 @@
2727
<gitHubRepo>jenkinsci/keycloak-plugin</gitHubRepo>
2828
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2929
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
30-
<keycloak.version>20.0.3</keycloak.version>
30+
<keycloak.version>25.0.3</keycloak.version>
31+
<!-- authz client on own release schedule -->
32+
<keycloak.authz.client.version>26.0.7</keycloak.authz.client.version>
3133
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
32-
<jenkins.baseline>2.452</jenkins.baseline>
33-
<jenkins.version>${jenkins.baseline}.4</jenkins.version>
34+
<jenkins.baseline>2.504</jenkins.baseline>
35+
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
3436
<hpi.compatibleSinceVersion>2.3.1</hpi.compatibleSinceVersion>
3537
</properties>
3638

@@ -63,14 +65,14 @@
6365
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
6466
<developerConnection>scm:git:https://github.com/${gitHubRepo}.git</developerConnection>
6567
<url>https://github.com/${gitHubRepo}</url>
66-
<tag>${scmTag}</tag>
67-
</scm>
68+
<tag>${scmTag}</tag>
69+
</scm>
6870
<dependencyManagement>
6971
<dependencies>
7072
<dependency>
7173
<groupId>io.jenkins.tools.bom</groupId>
7274
<artifactId>bom-${jenkins.baseline}.x</artifactId>
73-
<version>3875.v1df09947cde6</version>
75+
<version>5681.v79d2ddf61465</version>
7476
<type>pom</type>
7577
<scope>import</scope>
7678
</dependency>
@@ -92,17 +94,63 @@
9294
<groupId>com.fasterxml.jackson.core</groupId>
9395
<artifactId>jackson-core</artifactId>
9496
</exclusion>
97+
<exclusion>
98+
<groupId>com.fasterxml.jackson.datatype</groupId>
99+
<artifactId>jackson-datatype-jsr310</artifactId>
100+
</exclusion>
101+
<exclusion>
102+
<groupId>com.fasterxml.jackson.datatype</groupId>
103+
<artifactId>jackson-datatype-jdk8</artifactId>
104+
</exclusion>
105+
<exclusion>
106+
<groupId>jakarta.activation</groupId>
107+
<artifactId>jakarta.activation-api</artifactId>
108+
</exclusion>
95109
</exclusions>
96110
</dependency>
97111
<dependency>
98112
<groupId>org.keycloak</groupId>
99113
<artifactId>keycloak-authz-client</artifactId>
100-
<version>${keycloak.version}</version>
114+
<version>${keycloak.authz.client.version}</version>
115+
<!-- provided by jackson2-api-->
116+
<exclusions>
117+
<exclusion>
118+
<groupId>com.fasterxml.jackson.core</groupId>
119+
<artifactId>jackson-databind</artifactId>
120+
</exclusion>
121+
<exclusion>
122+
<groupId>com.fasterxml.jackson.core</groupId>
123+
<artifactId>jackson-core</artifactId>
124+
</exclusion>
125+
<exclusion>
126+
<groupId>com.fasterxml.jackson.datatype</groupId>
127+
<artifactId>jackson-datatype-jsr310</artifactId>
128+
</exclusion>
129+
<exclusion>
130+
<groupId>com.fasterxml.jackson.datatype</groupId>
131+
<artifactId>jackson-datatype-jdk8</artifactId>
132+
</exclusion>
133+
</exclusions>
101134
</dependency>
102135
<dependency>
103136
<groupId>org.keycloak</groupId>
104137
<artifactId>keycloak-adapter-core</artifactId>
105138
<version>${keycloak.version}</version>
139+
<!-- provided by bouncycastle-api-->
140+
<exclusions>
141+
<exclusion>
142+
<groupId>org.bouncycastle</groupId>
143+
<artifactId>bcpkix-jdk18on</artifactId>
144+
</exclusion>
145+
<exclusion>
146+
<groupId>org.bouncycastle</groupId>
147+
<artifactId>bcutil-jdk18on</artifactId>
148+
</exclusion>
149+
<exclusion>
150+
<groupId>org.bouncycastle</groupId>
151+
<artifactId>bcprov-jdk18on</artifactId>
152+
</exclusion>
153+
</exclusions>
106154
</dependency>
107155
<dependency>
108156
<groupId>org.keycloak</groupId>
@@ -133,6 +181,10 @@
133181
<groupId>org.jenkins-ci.plugins</groupId>
134182
<artifactId>jackson2-api</artifactId>
135183
</dependency>
184+
<dependency>
185+
<groupId>org.jenkins-ci.plugins</groupId>
186+
<artifactId>bouncycastle-api</artifactId>
187+
</dependency>
136188
<dependency>
137189
<groupId>io.jenkins</groupId>
138190
<artifactId>configuration-as-code</artifactId>

0 commit comments

Comments
 (0)