Skip to content

Commit 455223a

Browse files
jonesbusyjonesbusy
committed
Require 2.452.4 and use jackson2-api plugin
1 parent 4bd37ab commit 455223a

File tree

3 files changed

+46
-31
lines changed

3 files changed

+46
-31
lines changed

‎.mvn/extensions.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
2+
<extension>
3+
<groupId>io.jenkins.tools.incrementals</groupId>
4+
<artifactId>git-changelist-maven-extension</artifactId>
5+
<version>1.8</version>
6+
</extension>
7+
</extensions>

‎.mvn/maven.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-Pconsume-incrementals
2+
-Pmight-produce-incrementals

‎pom.xml‎

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.54</version>
7+
<version>4.88</version>
8+
<relativePath />
89
</parent>
910

1011
<artifactId>keycloak</artifactId>
11-
<version>2.4.0-SNAPSHOT</version>
12+
<version>${revision}${changelist}</version>
1213
<name>Keycloak Authentication Plugin</name>
1314
<description>Integrates with Keycloak Authentication</description>
1415
<packaging>hpi</packaging>
@@ -21,15 +22,16 @@
2122
</issueManagement>
2223

2324
<properties>
25+
<revision>2.4.0</revision>
26+
<changelist>-SNAPSHOT</changelist>
27+
<gitHubRepo>jenkinsci/keycloak-plugin</gitHubRepo>
2428
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2529
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2630
<keycloak.version>20.0.3</keycloak.version>
27-
<jenkins.version>2.361.4</jenkins.version>
31+
<!-- 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>
2834
<hpi.compatibleSinceVersion>2.3.1</hpi.compatibleSinceVersion>
29-
<log4j.version>1.7.26</log4j.version>
30-
<configuration-as-code.version>1569.vb_72405b_80249</configuration-as-code.version>
31-
<jackson.version>2.13.4</jackson.version>
32-
<jackson.databind.version>2.13.4.2</jackson.databind.version>
3335
</properties>
3436

3537
<licenses>
@@ -58,88 +60,92 @@
5860
</developers>
5961

6062
<scm>
61-
<connection>scm:git:ssh://github.com/jenkinsci/jenkins-keycloak-plugin.git</connection>
62-
<developerConnection>scm:git:ssh://git@github.com/jenkinsci/jenkins-keycloak-plugin.git</developerConnection>
63-
<url>https://github.com/jenkinsci/jenkins-keycloak-plugin</url>
64-
<tag>HEAD</tag>
63+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
64+
<developerConnection>scm:git:https://github.com/${gitHubRepo}.git</developerConnection>
65+
<url>https://github.com/${gitHubRepo}</url>
66+
<tag>${scmTag}</tag>
6567
</scm>
68+
<dependencyManagement>
69+
<dependencies>
70+
<dependency>
71+
<groupId>io.jenkins.tools.bom</groupId>
72+
<artifactId>bom-${jenkins.baseline}.x</artifactId>
73+
<version>3875.v1df09947cde6</version>
74+
<type>pom</type>
75+
<scope>import</scope>
76+
</dependency>
77+
</dependencies>
78+
</dependencyManagement>
6679

6780
<dependencies>
6881
<dependency>
6982
<groupId>org.keycloak</groupId>
7083
<artifactId>keycloak-core</artifactId>
7184
<version>${keycloak.version}</version>
72-
<scope>compile</scope>
85+
<!-- provided by jackson2-api-->
86+
<exclusions>
87+
<exclusion>
88+
<groupId>com.fasterxml.jackson.core</groupId>
89+
<artifactId>jackson-databind</artifactId>
90+
</exclusion>
91+
<exclusion>
92+
<groupId>com.fasterxml.jackson.core</groupId>
93+
<artifactId>jackson-core</artifactId>
94+
</exclusion>
95+
</exclusions>
7396
</dependency>
7497
<dependency>
7598
<groupId>org.keycloak</groupId>
7699
<artifactId>keycloak-authz-client</artifactId>
77100
<version>${keycloak.version}</version>
78-
<scope>compile</scope>
79101
</dependency>
80102
<dependency>
81103
<groupId>org.keycloak</groupId>
82104
<artifactId>keycloak-adapter-core</artifactId>
83105
<version>${keycloak.version}</version>
84-
<scope>compile</scope>
85106
</dependency>
86107
<dependency>
87108
<groupId>org.keycloak</groupId>
88109
<artifactId>keycloak-adapter-spi</artifactId>
89110
<version>${keycloak.version}</version>
90-
<scope>compile</scope>
91111
</dependency>
92112
<dependency>
93113
<groupId>org.jenkins-ci.plugins</groupId>
94114
<artifactId>mailer</artifactId>
95-
<version>408.vd726a_1130320</version>
96115
</dependency>
97116
<dependency>
98117
<groupId>org.slf4j</groupId>
99118
<artifactId>slf4j-jdk14</artifactId>
100-
<version>${log4j.version}</version>
101119
</dependency>
102120
<dependency>
103121
<groupId>org.slf4j</groupId>
104122
<artifactId>slf4j-api</artifactId>
105-
<version>${log4j.version}</version>
106123
</dependency>
107124
<dependency>
108125
<groupId>org.slf4j</groupId>
109126
<artifactId>log4j-over-slf4j</artifactId>
110-
<version>${log4j.version}</version>
111127
</dependency>
112128
<dependency>
113129
<groupId>org.slf4j</groupId>
114130
<artifactId>jcl-over-slf4j</artifactId>
115-
<version>${log4j.version}</version>
116131
</dependency>
117132
<dependency>
118-
<groupId>com.fasterxml.jackson.core</groupId>
119-
<artifactId>jackson-core</artifactId>
120-
<version>${jackson.version}</version>
121-
</dependency>
122-
<dependency>
123-
<groupId>com.fasterxml.jackson.core</groupId>
124-
<artifactId>jackson-databind</artifactId>
125-
<version>${jackson.databind.version}</version>
133+
<groupId>org.jenkins-ci.plugins</groupId>
134+
<artifactId>jackson2-api</artifactId>
126135
</dependency>
127136
<dependency>
128137
<groupId>io.jenkins</groupId>
129138
<artifactId>configuration-as-code</artifactId>
130-
<version>${configuration-as-code.version}</version>
131139
<scope>test</scope>
132140
</dependency>
133141
<dependency>
134142
<groupId>io.jenkins.configuration-as-code</groupId>
135143
<artifactId>test-harness</artifactId>
136-
<version>${configuration-as-code.version}</version>
137144
<scope>test</scope>
138145
</dependency>
139146
<dependency>
140147
<groupId>io.jenkins.plugins</groupId>
141148
<artifactId>javax-activation-api</artifactId>
142-
<version>1.2.0-6</version>
143149
<scope>test</scope>
144150
</dependency>
145151
</dependencies>

0 commit comments

Comments
 (0)