Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes ByteBuddy AbstractMethodError which could occur when running tests from IDE #3327

Merged
merged 4 commits into from
Sep 21, 2023
Merged

Fixes ByteBuddy AbstractMethodError which could occur when running tests from IDE #3327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2c7164
Fixes ByteBuddy AbstractMethodError which could occur when running te…
JonasKunz Sep 20, 2023
903e6a0
Add bytebuddy-dep as explicit dependency
JonasKunz Sep 20, 2023
7d0099f
Revert "Add bytebuddy-dep as explicit dependency"
JonasKunz Sep 20, 2023
e897e88
Fix remaining dependenceis for tests
JonasKunz Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions apm-agent-attach-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@
<version>${version.bouncy-castle.bc-fips}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- required for the inherited assertJ and Mockito dependencies-->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-dep</artifactId>
<version>${version.byte-buddy}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 6 additions & 0 deletions apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-5_x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
<artifactId>hibernate-search-orm</artifactId>
<version>5.11.1.Final</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
6 changes: 6 additions & 0 deletions apm-agent-plugins/apm-hibernate-search-plugin/apm-hibernate-search-plugin-6_x/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
<artifactId>hibernate-search-mapper-orm</artifactId>
<version>${version.hibernate.search}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
7 changes: 7 additions & 0 deletions apm-agent-tracer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@
<artifactId>apm-agent-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- required for the inherited assertJ and Mockito dependencies-->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-dep</artifactId>
<version>${version.byte-buddy}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 7 additions & 0 deletions elastic-apm-agent-premain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
<artifactId>apm-agent-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<!-- required for the inherited assertJ and Mockito dependencies-->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-dep</artifactId>
<version>${version.byte-buddy}</version>
<scope>test</scope>
</dependency>
</dependencies>

</project>
14 changes: 13 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,12 +721,24 @@
<artifactId>assertj-core</artifactId>
<version>3.24.2</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${version.mockito}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId> <!-- conflicts with byte-buddy-dep -->
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- adding this to classpath allows to keep default behavior of mockito 4.x where mock subclassing is used. -->
Expand Down Expand Up @@ -756,7 +768,7 @@
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit-assertj</artifactId>
<version>2.37.0</version>
<version>3.2.2</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading