Skip to content

Commit c4d6eaa

Browse files
lucamilanesioGerrit Code Review
authored and
Gerrit Code Review
committed
Merge "chore: modernize plugin dependencies"
2 parents 37dc2cc + 3f2f0d6 commit c4d6eaa

File tree

3 files changed

+36
-23
lines changed

3 files changed

+36
-23
lines changed

github-oauth/pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ limitations under the License.
2121
<parent>
2222
<groupId>com.googlesource.gerrit.plugins.github</groupId>
2323
<artifactId>github-parent</artifactId>
24-
<version>3.8.0</version>
24+
<version>3.8.2</version>
2525
</parent>
2626
<artifactId>github-oauth</artifactId>
2727
<name>Gerrit Code Review - GitHub OAuth login</name>
@@ -71,35 +71,35 @@ limitations under the License.
7171
<dependency>
7272
<groupId>javax.servlet</groupId>
7373
<artifactId>javax.servlet-api</artifactId>
74-
<version>3.0.1</version>
74+
<version>3.1.0</version>
7575
<scope>provided</scope>
7676
</dependency>
7777
<dependency>
7878
<groupId>com.google.inject</groupId>
7979
<artifactId>guice</artifactId>
80-
<version>4.1.0</version>
80+
<version>6.0.0</version>
8181
<scope>provided</scope>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.google.guava</groupId>
8585
<artifactId>guava</artifactId>
86-
<version>20.0</version>
86+
<version>32.1.2-jre</version>
8787
<scope>provided</scope>
8888
</dependency>
8989
<dependency>
9090
<groupId>org.kohsuke</groupId>
9191
<artifactId>github-api</artifactId>
92-
<version>1.315</version>
92+
<version>1.316</version>
9393
</dependency>
9494
<dependency>
9595
<groupId>com.infradna.tool</groupId>
9696
<artifactId>bridge-method-injector</artifactId>
97-
<version>1.23</version>
97+
<version>1.29</version>
9898
</dependency>
9999
<dependency>
100100
<groupId>org.apache.httpcomponents</groupId>
101101
<artifactId>httpclient</artifactId>
102-
<version>4.4</version>
102+
<version>4.5.2</version>
103103
<scope>provided</scope>
104104
</dependency>
105105
<dependency>

github-plugin/pom.xml

+24-11
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<artifactId>github-parent</artifactId>
2222
<groupId>com.googlesource.gerrit.plugins.github</groupId>
23-
<version>3.8.0</version>
23+
<version>3.8.2</version>
2424
</parent>
2525

2626
<artifactId>github-plugin</artifactId>
@@ -87,6 +87,19 @@ limitations under the License.
8787
<goals>
8888
<goal>shade</goal>
8989
</goals>
90+
<configuration>
91+
<filters>
92+
<filter>
93+
<!-- is a signed jar hence the singature has to be removed during shading -->
94+
<artifact>org.eclipse.mylyn.github:org.eclipse.egit.github.core</artifact>
95+
<excludes>
96+
<exclude>META-INF/*.SF</exclude>
97+
<exclude>META-INF/*.DSA</exclude>
98+
<exclude>META-INF/*.RSA</exclude>
99+
</excludes>
100+
</filter>
101+
</filters>
102+
</configuration>
90103
</execution>
91104
</executions>
92105
</plugin>
@@ -146,7 +159,7 @@ limitations under the License.
146159
<dependency>
147160
<groupId>javax.servlet</groupId>
148161
<artifactId>javax.servlet-api</artifactId>
149-
<version>3.0.1</version>
162+
<version>3.1.0</version>
150163
<scope>provided</scope>
151164
</dependency>
152165
<dependency>
@@ -162,33 +175,33 @@ limitations under the License.
162175
<dependency>
163176
<groupId>org.eclipse.mylyn.github</groupId>
164177
<artifactId>org.eclipse.egit.github.core</artifactId>
165-
<version>1.3.1</version>
178+
<version>6.1.0.202203080745-r</version>
166179
</dependency>
167180
<dependency>
168181
<groupId>com.google.code.gson</groupId>
169182
<artifactId>gson</artifactId>
170-
<version>2.8.6</version>
183+
<version>2.10.1</version>
171184
</dependency>
172185
<dependency>
173186
<groupId>org.apache.httpcomponents</groupId>
174187
<artifactId>httpclient</artifactId>
175-
<version>4.4</version>
188+
<version>4.5.2</version>
176189
<scope>provided</scope>
177190
</dependency>
178191
<dependency>
179-
<groupId>javax.mail</groupId>
180-
<artifactId>mail</artifactId>
181-
<version>1.4.5-rc1</version>
192+
<groupId>com.sun.mail</groupId>
193+
<artifactId>javax.mail</artifactId>
194+
<version>1.6.2</version>
182195
</dependency>
183196
<dependency>
184-
<groupId>org.apache.commons</groupId>
197+
<groupId>commons-io</groupId>
185198
<artifactId>commons-io</artifactId>
186-
<version>1.3.2</version>
199+
<version>2.14.0</version>
187200
</dependency>
188201
<dependency>
189202
<groupId>commons-discovery</groupId>
190203
<artifactId>commons-discovery</artifactId>
191-
<version>20040218.194635</version>
204+
<version>0.5</version>
192205
</dependency>
193206
<dependency>
194207
<groupId>org.apache.velocity</groupId>

pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
<modelVersion>4.0.0</modelVersion>
1919
<groupId>com.googlesource.gerrit.plugins.github</groupId>
2020
<artifactId>github-parent</artifactId>
21-
<version>3.8.0</version>
21+
<version>3.8.2</version>
2222
<name>Gerrit Code Review - GitHub integration</name>
2323
<url>http://www.gerritforge.com</url>
2424
<packaging>pom</packaging>
@@ -255,7 +255,7 @@ limitations under the License.
255255
<plugin>
256256
<groupId>org.codehaus.mojo</groupId>
257257
<artifactId>findbugs-maven-plugin</artifactId>
258-
<version>3.0.0</version>
258+
<version>3.0.5</version>
259259
</plugin>
260260
</plugins>
261261
</reporting>
@@ -292,13 +292,13 @@ limitations under the License.
292292
<dependency>
293293
<groupId>com.ryanharter.auto.value</groupId>
294294
<artifactId>auto-value-gson</artifactId>
295-
<version>1.3.0</version>
295+
<version>1.3.1</version>
296296
<scope>provided</scope>
297297
</dependency>
298298
<dependency>
299299
<groupId>org.projectlombok</groupId>
300300
<artifactId>lombok</artifactId>
301-
<version>1.18.22</version>
301+
<version>1.18.30</version>
302302
<scope>provided</scope>
303303
</dependency>
304304
</dependencies>
@@ -313,7 +313,7 @@ limitations under the License.
313313
<dependency>
314314
<groupId>com.google.truth</groupId>
315315
<artifactId>truth</artifactId>
316-
<version>1.1.4</version>
316+
<version>1.1.5</version>
317317
<scope>test</scope>
318318
</dependency>
319319
</dependencies>

0 commit comments

Comments
 (0)