Skip to content

Commit

Permalink
Manual merge of pom.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
cowtowncoder committed Apr 21, 2024
1 parent 2a289e0 commit f8fe469
Showing 1 changed file with 22 additions and 10 deletions.
32 changes: 22 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
<version.android.sdk>28</version.android.sdk>
<version.android.sdk.signature>0.5.1</version.android.sdk.signature>

<version.bytebuddy>1.14.13</version.bytebuddy>
<version.mockito>4.11.0</version.mockito>

<!-- Can not use default, since group id != Java package name here -->
<osgi.export>tools.jackson.databind.*;version=${project.version}</osgi.export>
<!-- fix for databind#2299: using jackson-databind in an OSGi environment under Android -->
Expand All @@ -64,6 +67,23 @@
<project.build.outputTimestamp>2022-09-18T00:00:00Z</project.build.outputTimestamp>
</properties>

<dependencyManagement>
<dependencies>
<!-- We need to specify later Bytebuddy version because Mockito 4.11.0 depends on earlier
Bytebuddy which does not support JDK 21, since 2.17-->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${version.bytebuddy}</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>${version.bytebuddy}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<!-- Builds on core streaming API; also needs core annotations -->
<dependency>
Expand Down Expand Up @@ -126,21 +146,13 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version>
<version>${version.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.11.0</version>
<scope>test</scope>
</dependency>
<!-- We need to specify later Bytebuddy version because Mockito 4.11.0 depends on earlier Bytebuddy which
does not support JDK 21, since 2.17-->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.13</version>
<version>${version.mockito}</version>
<scope>test</scope>
</dependency>

Expand Down

0 comments on commit f8fe469

Please sign in to comment.