Skip to content

Commit a93eb65

Browse files
dependabot[bot]bjhargrave
dependabot[bot]
authored and
bjhargrave
committed
build(deps-dev): Bump assertj-core from 3.22.0 to 3.23.1 in /maven
Bumps [assertj-core](https://github.com/assertj/assertj-core) from 3.22.0 to 3.23.1. - [Release notes](https://github.com/assertj/assertj-core/releases) - [Commits](assertj/assertj@assertj-core-3.22.0...assertj-core-3.23.1) Since assertj-core no longer shades bytebuddy, we must explicitly reference bytebuddy when we use assertj-core. We also raise the version of bytebuddy and mockito since mockito also uses bytebuddy. Signed-off-by: BJ Hargrave <bj@hargrave.dev> --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
1 parent 47334e1 commit a93eb65

File tree

13 files changed

+32
-20
lines changed

13 files changed

+32
-20
lines changed

‎biz.aQute.junit/bnd.bnd‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@
1212
biz.aQute.bndlib;version=latest,\
1313
junit:junit;version="${junit4.version}",\
1414
org.hamcrest;version="${hamcrest.version}",\
15-
assertj-core;version="${assertj.version}"
15+
assertj-core;version="${assertj.version}",\
16+
net.bytebuddy.byte-buddy;version="${bytebuddy.version}"
1617

1718
-includepackage: \
1819
aQute.junit.*,\
1920
junit.*,\
2021
org.junit.*,\
2122
org.hamcrest.*,\
22-
org.assertj.core.*
23+
org.assertj.core.*,\
24+
net.bytebuddy.*
2325

2426
-includeresource.perm: OSGI-INF/permissions.perm;literal="(java.security.AllPermission)"
2527

@@ -28,7 +30,8 @@
2830
org.junit.*;version="${junit4.version}",\
2931
org.hamcrest.*;version="${hamcrest.version}",\
3032
!org.assertj.core.internal.*,\
31-
org.assertj.core.*
33+
org.assertj.core.*,\
34+
net.bytebuddy.*
3235

3336
-fixupmessages.assertj: Export org.assertj.core.* private references
3437

@@ -38,6 +41,7 @@
3841
Import-Package: \
3942
aQute.*;resolution:=optional,\
4043
junit.*;version="${range;[==,5);${junit3.version}}",\
44+
!com.fasterxml.jackson.*,\
4145
!org.opentest4j,\
4246
!org.junit.jupiter.*,\
4347
!org.junit.platform.*,\
@@ -50,6 +54,7 @@ Import-Package: \
5054

5155
# These packages can be referenced by assertj-core via Class.forName.
5256
DynamicImport-Package: \
57+
com.fasterxml.jackson.*,\
5358
org.opentest4j,\
5459
org.testng,\
5560
org.testng.*,\
@@ -61,4 +66,4 @@ Embedded-Activator: ${Bundle-Activator}
6166
Bundle-Release: Use main thread for testing, optionally allowing old separate thread model
6267

6368
-baseline: *
64-
-diffpackages: !junit.*, !org.junit.*, !org.assertj.core.*, !org.hamcrest.*, *
69+
-diffpackages: !junit.*, !org.junit.*, !org.assertj.core.*, !net.bytebuddy.*, !org.hamcrest.*, *

‎biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class BeforeAfterTest {
2020

2121
static LaunchpadBuilder builder = new LaunchpadBuilder().runfw(org_apache_felix_framework)
2222
.bundles("assertj-core")
23+
.bundles("net.bytebuddy.byte-buddy")
2324
.bundles(org_apache_felix_scr)
2425
.debug();
2526

‎biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class FO {
2525
.set("snapshot.dir", tmp.getAbsolutePath())
2626
.runfw("jar/org.apache.felix.framework-6.0.2.jar;version=file")
2727
.bundles(
28-
"org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, assertj-core, org.apache.servicemix.bundles.junit")
28+
"org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, assertj-core, net.bytebuddy.byte-buddy, org.apache.servicemix.bundles.junit")
2929
.debug();
3030

3131
@Component(service = X.class, enabled = false)

‎biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class LaunchpadConfigurationTest {
2828
.runfw("jar/org.apache.felix.framework-6.0.2.jar;version=file")
2929
.export("*")
3030
.bundles(
31-
"org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, jar/org.apache.felix.configadmin-1.9.8.jar;version=file, jar/org.apache.felix.configurator-1.0.8.jar;version=file, assertj-core")
31+
"org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, jar/org.apache.felix.configadmin-1.9.8.jar;version=file, jar/org.apache.felix.configurator-1.0.8.jar;version=file, assertj-core, net.bytebuddy.byte-buddy")
3232
.debug();
3333

3434
@Component(name = "TestService", service = X.class, configurationPolicy = ConfigurationPolicy.REQUIRE)

‎biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class LaunchpadRunnerBasicTest {
2828
.runfw("jar/org.apache.felix.framework-6.0.2.jar;version=file")
2929
.export("*")
3030
.bundles(
31-
"org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, assertj-core")
31+
"org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, assertj-core, net.bytebuddy.byte-buddy")
3232
.debug();
3333

3434
@Component(service = X.class, enabled = false)

‎biz.aQute.tester.test/bnd.bnd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
org.junit.platform.engine;version="${junit.platform.eclipse.version}";strategy=lowest,\
2727
org.junit.jupiter.engine;version="${junit.jupiter.eclipse.version}";strategy=lowest,\
2828
assertj-core;version=latest,\
29+
net.bytebuddy.byte-buddy;version=latest,\
2930
junit-platform-testkit;version="${junit.platform.eclipse.version}";strategy=lowest,\
3031
aQute.libg,\
3132
biz.aQute.bnd.util;version=snapshot,\

‎bndtools.core.test/bnd.bnd‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
bndtools.core;version=snapshot,\
4949
bndtools.core.services;version=snapshot,\
5050
assertj-core,\
51+
net.bytebuddy.byte-buddy,\
5152
javax.inject,\
5253
org.apiguardian:apiguardian-api,\
5354
org.opentest4j,\

‎bndtools.core.test/test.cocoa.macosx.x86_64.bndrun‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
osgi.identity;filter:='(osgi.identity=*win32*)',\
2828

2929
-runbundles: \
30-
assertj-core;version='[3.22.0,3.22.1)',\
30+
assertj-core;version='[3.23.1,3.23.2)',\
3131
biz.aQute.bnd.embedded-repo;version=snapshot,\
3232
biz.aQute.bnd.util;version=snapshot,\
3333
biz.aQute.bndlib;version=snapshot,\
@@ -55,6 +55,7 @@
5555
junit-platform-engine;version='[1.8.2,1.8.3)',\
5656
junit-platform-launcher;version='[1.8.2,1.8.3)',\
5757
junit-vintage-engine;version='[5.8.2,5.8.3)',\
58+
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
5859
net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\
5960
org.apache.ant;version='[1.10.8,1.10.9)',\
6061
org.apache.batik.constants;version='[1.11.0,1.11.1)',\

‎bndtools.core.test/test.gtk.linux.x86_64.bndrun‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
osgi.identity;filter:='(osgi.identity=*win32*)',\
2727

2828
-runbundles: \
29-
assertj-core;version='[3.22.0,3.22.1)',\
29+
assertj-core;version='[3.23.1,3.23.2)',\
3030
biz.aQute.bnd.embedded-repo;version=snapshot,\
3131
biz.aQute.bnd.util;version=snapshot,\
3232
biz.aQute.bndlib;version=snapshot,\
@@ -54,6 +54,7 @@
5454
junit-platform-engine;version='[1.8.2,1.8.3)',\
5555
junit-platform-launcher;version='[1.8.2,1.8.3)',\
5656
junit-vintage-engine;version='[5.8.2,5.8.3)',\
57+
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
5758
net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\
5859
org.apache.ant;version='[1.10.8,1.10.9)',\
5960
org.apache.batik.constants;version='[1.11.0,1.11.1)',\

‎bndtools.core.test/test.win32.x86_64.bndrun‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
osgi.identity;filter:='(osgi.identity=*linux*)',\
2626

2727
-runbundles: \
28-
assertj-core;version='[3.22.0,3.22.1)',\
28+
assertj-core;version='[3.23.1,3.23.2)',\
2929
biz.aQute.bnd.embedded-repo;version=snapshot,\
3030
biz.aQute.bnd.util;version=snapshot,\
3131
biz.aQute.bndlib;version=snapshot,\
@@ -53,6 +53,7 @@
5353
junit-platform-engine;version='[1.8.2,1.8.3)',\
5454
junit-platform-launcher;version='[1.8.2,1.8.3)',\
5555
junit-vintage-engine;version='[5.8.2,5.8.3)',\
56+
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
5657
net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\
5758
org.apache.ant;version='[1.10.8,1.10.9)',\
5859
org.apache.batik.constants;version='[1.11.0,1.11.1)',\

0 commit comments

Comments
 (0)