Merge remote-tracking branch 'origin/stable-3.8'
Change-Id: I4cd2adb1dddb262d9bace7236d8a5d5a8d2fce02
diff --git a/pom.xml b/pom.xml
index a3bcf09..bcd0de4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
+ <version>3.2.2</version>
<configuration>
<archive>
<manifestEntries>
@@ -44,7 +44,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
+ <version>3.8.1</version>
<configuration>
<release>17</release>
<encoding>UTF-8</encoding>
@@ -60,7 +60,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>3.4.1</version>
+ <version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
@@ -116,10 +116,21 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <!-- we need to control the bytebuddy being brought in by mockito-inline, to move it
+ to a version which support JDK21 which starts at 1.14.17+ -->
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.14.17</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>com.google.gerrit</groupId>
@@ -135,7 +146,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>1.18.24</version>
+ <version>1.18.34</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -153,7 +164,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
- <version>4.5.1</version>
+ <version>5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
