Skip to content

Commit 414ca56

Browse files
committed
Remove ByteBuddy from Assumptions
Rewrite all assumeThat() methods to delegate to Assertions.assertThat() wrapped with an assumption error handler that converts AssertionError to assumption exceptions. Delete all ByteBuddy infrastructure: AssumptionMethodInterceptor, ClassLoadingStrategyFactory, ByteBuddy compile dependency, and module-info requires.
1 parent cc7536e commit 414ca56

6 files changed

Lines changed: 124 additions & 488 deletions

File tree

assertj-core/argFile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### in-module testing ###
2-
--add-modules net.bytebuddy,org.junit.jupiter.api,org.junit.platform.commons
2+
--add-modules org.junit.jupiter.api,org.junit.platform.commons
33
### org.assertj.core ###
44
--add-opens org.assertj.core/org.assertj.core.api=ALL-UNNAMED
55
--add-opens org.assertj.core/org.assertj.core.internal=ALL-UNNAMED

assertj-core/pom.xml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@
5050
</dependencies>
5151
</dependencyManagement>
5252
<dependencies>
53-
<!-- Compile -->
54-
<dependency>
55-
<groupId>net.bytebuddy</groupId>
56-
<artifactId>byte-buddy</artifactId>
57-
</dependency>
5853
<!-- Provided -->
5954
<dependency>
6055
<groupId>org.hamcrest</groupId>
@@ -244,7 +239,6 @@
244239
<configuration>
245240
<bnd><![CDATA[
246241
Import-Package:\
247-
net.bytebuddy.*,\
248242
!org.assertj.core.*,\
249243
*;resolution:="optional"
250244
Multi-Release: true
@@ -267,9 +261,7 @@
267261
<configuration>
268262
<rules combine.children="append">
269263
<bannedDependencies>
270-
<includes>
271-
<include>net.bytebuddy:byte-buddy</include>
272-
</includes>
264+
<includes/>
273265
<excludes>
274266
<exclude>org.assertj:assertj-core</exclude>
275267
<exclude>org.hamcrest:hamcrest-core</exclude>

assertj-core/src/main/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
requires static java.management;
5454
requires static java.sql;
5555
requires static java.xml; // used for XML pretty print
56-
requires static net.bytebuddy;
5756
requires static org.hamcrest;
5857
requires static org.junit.jupiter.api;
5958
requires static org.opentest4j; // to throw AssertionFailedError which is IDE friendly

0 commit comments

Comments
 (0)