Skip to content

Commit f174d6b

Browse files
zbynekalecharpMarkEWaite
authored
Update gitlab4j to 6.2.0, require Jenkins 2.504.3 (#121)
* Update dependencies * Correct plugin name Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com> * Correct plugin name Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com> * Apply suggestion from @alecharp Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com> * Use released version of Jersey3 Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com> * Remove incrementals repository from pom.xml Removed the incrementals repository from the pom.xml file. * Update Jenkins baseline version to 2.504.3 * Update Jenkins baseline version to 2.504 * Update jackson2-api version in pom.xml * Rely on plugin versions from newest plugin BOM * Remove unused test library exclusion * Use a better issue management URL Copied from https://plugins.jenkins.io/gitlab-api/ * Remove exclusion of jakarta activation API plugin Not needed * Rely of transitive dependency for apache-httpcomponents-client-4-api * Remove unnecessary jersey exclusions * Use most recent plugin BOM * Use GitLab API 6.2.0 --------- Co-authored-by: Adrien Lecharpentier <adrien.lecharpentier@gmail.com> Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
1 parent b40ee07 commit f174d6b

File tree

1 file changed

+8
-39
lines changed

1 file changed

+8
-39
lines changed

pom.xml

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<packaging>hpi</packaging>
1515

1616
<properties>
17-
<revision>5.8.1</revision>
17+
<revision>6.2.0</revision>
1818
<changelist>999999-SNAPSHOT</changelist>
1919
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
20-
<jenkins.baseline>2.492</jenkins.baseline>
20+
<jenkins.baseline>2.504</jenkins.baseline>
2121
<jenkins.version>${jenkins.baseline}.3</jenkins.version>
2222
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
23-
<hpi.bundledArtifacts>gitlab4j-api</hpi.bundledArtifacts>
23+
<hpi.bundledArtifacts>gitlab4j-api,gitlab4j-models</hpi.bundledArtifacts>
2424
<hpi.strictBundledArtifacts>true</hpi.strictBundledArtifacts>
2525
</properties>
2626

@@ -29,7 +29,7 @@
2929
<url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
3030

3131
<issueManagement>
32-
<url>https://issues.jenkins-ci.org/browse/JENKINS-57445?jql=project%20%3D%20JENKINS%20AND%20component%20%3D%20gitlab-api-plugin</url>
32+
<url>https://issues.jenkins.io/issues/?jql=resolution%20is%20EMPTY%20and%20component%3D25128</url>
3333
<system>JIRA</system>
3434
</issueManagement>
3535

@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>io.jenkins.tools.bom</groupId>
6363
<artifactId>bom-${jenkins.baseline}.x</artifactId>
64-
<version>5473.vb_9533d9e5d88</version>
64+
<version>5659.vecf9e2dc5a_ed</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
@@ -71,60 +71,29 @@
7171
<dependencies>
7272
<dependency>
7373
<groupId>io.jenkins.plugins</groupId>
74-
<artifactId>javax-activation-api</artifactId>
74+
<artifactId>jakarta-activation-api</artifactId>
7575
</dependency>
7676
<dependency>
7777
<groupId>io.jenkins.plugins</groupId>
78-
<artifactId>jersey2-api</artifactId>
78+
<artifactId>jersey3-api</artifactId>
7979
</dependency>
8080
<dependency>
8181
<groupId>org.gitlab4j</groupId>
8282
<artifactId>gitlab4j-api</artifactId>
8383
<version>${revision}</version>
8484
<exclusions>
85-
<!-- Provided by javax-activation-api plugin -->
86-
<exclusion>
87-
<groupId>jakarta.activation</groupId>
88-
<artifactId>jakarta.activation-api</artifactId>
89-
</exclusion>
9085
<!-- Provided by core -->
9186
<exclusion>
9287
<groupId>jakarta.servlet</groupId>
9388
<artifactId>jakarta.servlet-api</artifactId>
9489
</exclusion>
95-
<!-- Provided by jersey2-api plugin -->
96-
<exclusion>
97-
<groupId>org.glassfish.jersey.connectors</groupId>
98-
<artifactId>jersey-apache-connector</artifactId>
99-
</exclusion>
90+
<!-- Provided by jersey3-api plugin -->
10091
<exclusion>
10192
<groupId>org.glassfish.jersey.core</groupId>
10293
<artifactId>jersey-client</artifactId>
10394
</exclusion>
104-
<exclusion>
105-
<groupId>org.glassfish.jersey.inject</groupId>
106-
<artifactId>jersey-hk2</artifactId>
107-
</exclusion>
108-
<exclusion>
109-
<groupId>org.glassfish.jersey.media</groupId>
110-
<artifactId>jersey-media-json-jackson</artifactId>
111-
</exclusion>
112-
<exclusion>
113-
<groupId>org.glassfish.jersey.media</groupId>
114-
<artifactId>jersey-media-multipart</artifactId>
115-
</exclusion>
116-
<!-- TODO Unneeded test library https://github.com/gitlab4j/gitlab4j-api/pull/840 -->
117-
<exclusion>
118-
<groupId>uk.org.webcompere</groupId>
119-
<artifactId>system-stubs-jupiter</artifactId>
120-
</exclusion>
12195
</exclusions>
12296
</dependency>
123-
<!-- Needed by jersey-apache-connector, but jersey2-api plugin declares it as optional -->
124-
<dependency>
125-
<groupId>org.jenkins-ci.plugins</groupId>
126-
<artifactId>apache-httpcomponents-client-4-api</artifactId>
127-
</dependency>
12897
<dependency>
12998
<groupId>org.jenkins-ci.plugins</groupId>
13099
<artifactId>jackson2-api</artifactId>

0 commit comments

Comments
 (0)