Skip to content

Commit 64a4c68

Browse files
committed
Add appropriate exclusion and comments
1 parent e0375a6 commit 64a4c68

File tree

1 file changed

+33
-13
lines changed

1 file changed

+33
-13
lines changed

pom.xml

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,31 @@
6565
</dependencyManagement>
6666

6767
<dependencies>
68+
<dependency>
69+
<groupId>io.jenkins.plugins</groupId>
70+
<artifactId>javax-activation-api</artifactId>
71+
</dependency>
72+
<dependency>
73+
<groupId>io.jenkins.plugins</groupId>
74+
<artifactId>jersey2-api</artifactId>
75+
<version>2.35-6</version> <!-- TODO https://github.com/jenkinsci/bom/pull/1011 -->
76+
</dependency>
6877
<dependency>
6978
<groupId>org.gitlab4j</groupId>
7079
<artifactId>gitlab4j-api</artifactId>
7180
<version>5.0.1</version>
7281
<exclusions>
82+
<!-- Provided by javax-activation-api plugin -->
7383
<exclusion>
74-
<groupId>org.glassfish.jersey.inject</groupId>
75-
<artifactId>jersey-hk2</artifactId>
84+
<groupId>jakarta.activation</groupId>
85+
<artifactId>jakarta.activation-api</artifactId>
86+
</exclusion>
87+
<!-- Provided by core -->
88+
<exclusion>
89+
<groupId>jakarta.servlet</groupId>
90+
<artifactId>jakarta.servlet-api</artifactId>
7691
</exclusion>
92+
<!-- Provided by jersey2-api plugin -->
7793
<exclusion>
7894
<groupId>org.glassfish.jersey.connectors</groupId>
7995
<artifactId>jersey-apache-connector</artifactId>
@@ -83,29 +99,33 @@
8399
<artifactId>jersey-client</artifactId>
84100
</exclusion>
85101
<exclusion>
86-
<groupId>org.glassfish.jersey.media</groupId>
87-
<artifactId>jersey-media-multipart</artifactId>
102+
<groupId>org.glassfish.jersey.inject</groupId>
103+
<artifactId>jersey-hk2</artifactId>
88104
</exclusion>
89105
<exclusion>
90106
<groupId>org.glassfish.jersey.media</groupId>
91107
<artifactId>jersey-media-json-jackson</artifactId>
92108
</exclusion>
109+
<exclusion>
110+
<groupId>org.glassfish.jersey.media</groupId>
111+
<artifactId>jersey-media-multipart</artifactId>
112+
</exclusion>
113+
<!-- TODO Unneeded test library https://github.com/gitlab4j/gitlab4j-api/pull/840 -->
114+
<exclusion>
115+
<groupId>uk.org.webcompere</groupId>
116+
<artifactId>system-stubs-jupiter</artifactId>
117+
</exclusion>
93118
</exclusions>
94119
</dependency>
95-
<dependency>
96-
<groupId>io.jenkins.plugins</groupId>
97-
<artifactId>jersey2-api</artifactId>
98-
<!-- TODO https://github.com/jenkinsci/bom/pull/1011 -->
99-
<version>2.35-6</version>
100-
</dependency>
120+
<!-- Needed by jersey-apache-connector, but jersey2-api plugin declares it as optional -->
101121
<dependency>
102122
<groupId>org.jenkins-ci.plugins</groupId>
103-
<artifactId>jackson2-api</artifactId>
104-
<version>2.13.2.20220328-273.v11d70a_b_a_1a_52</version>
123+
<artifactId>apache-httpcomponents-client-4-api</artifactId>
105124
</dependency>
106125
<dependency>
107126
<groupId>org.jenkins-ci.plugins</groupId>
108-
<artifactId>apache-httpcomponents-client-4-api</artifactId>
127+
<artifactId>jackson2-api</artifactId>
128+
<version>2.13.2.20220328-273.v11d70a_b_a_1a_52</version> <!-- TODO https://github.com/jenkinsci/bom/pull/1013 -->
109129
</dependency>
110130
</dependencies>
111131

0 commit comments

Comments
 (0)