From a93eb65a937564df54d1659873a0c9edbeef1c56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 31 May 2022 22:01:46 +0000 Subject: [PATCH] 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](https://github.com/assertj/assertj-core/compare/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 --- updated-dependencies: - dependency-name: org.assertj:assertj-core dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- biz.aQute.junit/bnd.bnd | 13 +++++++++---- .../test/aQute/xlaunchpad/BeforeAfterTest.java | 1 + .../test/aQute/xlaunchpad/FO.java | 2 +- .../xlaunchpad/LaunchpadConfigurationTest.java | 2 +- .../aQute/xlaunchpad/LaunchpadRunnerBasicTest.java | 2 +- biz.aQute.tester.test/bnd.bnd | 1 + bndtools.core.test/bnd.bnd | 1 + bndtools.core.test/test.cocoa.macosx.x86_64.bndrun | 3 ++- bndtools.core.test/test.gtk.linux.x86_64.bndrun | 3 ++- bndtools.core.test/test.win32.x86_64.bndrun | 3 ++- cnf/ext/central.mvn | 8 ++++---- cnf/ext/junit.bnd | 11 ++++++----- maven/bnd-plugin-parent/pom.xml | 2 +- 13 files changed, 32 insertions(+), 20 deletions(-) diff --git a/biz.aQute.junit/bnd.bnd b/biz.aQute.junit/bnd.bnd index 8d28da5099..9233ed276e 100644 --- a/biz.aQute.junit/bnd.bnd +++ b/biz.aQute.junit/bnd.bnd @@ -12,14 +12,16 @@ biz.aQute.bndlib;version=latest,\ junit:junit;version="${junit4.version}",\ org.hamcrest;version="${hamcrest.version}",\ - assertj-core;version="${assertj.version}" + assertj-core;version="${assertj.version}",\ + net.bytebuddy.byte-buddy;version="${bytebuddy.version}" -includepackage: \ aQute.junit.*,\ junit.*,\ org.junit.*,\ org.hamcrest.*,\ - org.assertj.core.* + org.assertj.core.*,\ + net.bytebuddy.* -includeresource.perm: OSGI-INF/permissions.perm;literal="(java.security.AllPermission)" @@ -28,7 +30,8 @@ org.junit.*;version="${junit4.version}",\ org.hamcrest.*;version="${hamcrest.version}",\ !org.assertj.core.internal.*,\ - org.assertj.core.* + org.assertj.core.*,\ + net.bytebuddy.* -fixupmessages.assertj: Export org.assertj.core.* private references @@ -38,6 +41,7 @@ Import-Package: \ aQute.*;resolution:=optional,\ junit.*;version="${range;[==,5);${junit3.version}}",\ + !com.fasterxml.jackson.*,\ !org.opentest4j,\ !org.junit.jupiter.*,\ !org.junit.platform.*,\ @@ -50,6 +54,7 @@ Import-Package: \ # These packages can be referenced by assertj-core via Class.forName. DynamicImport-Package: \ + com.fasterxml.jackson.*,\ org.opentest4j,\ org.testng,\ org.testng.*,\ @@ -61,4 +66,4 @@ Embedded-Activator: ${Bundle-Activator} Bundle-Release: Use main thread for testing, optionally allowing old separate thread model -baseline: * --diffpackages: !junit.*, !org.junit.*, !org.assertj.core.*, !org.hamcrest.*, * +-diffpackages: !junit.*, !org.junit.*, !org.assertj.core.*, !net.bytebuddy.*, !org.hamcrest.*, * diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java index 9e47802644..80fd970111 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/BeforeAfterTest.java @@ -20,6 +20,7 @@ public class BeforeAfterTest { static LaunchpadBuilder builder = new LaunchpadBuilder().runfw(org_apache_felix_framework) .bundles("assertj-core") + .bundles("net.bytebuddy.byte-buddy") .bundles(org_apache_felix_scr) .debug(); diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java index febaaa7927..c436cfe1c6 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/FO.java @@ -25,7 +25,7 @@ public class FO { .set("snapshot.dir", tmp.getAbsolutePath()) .runfw("jar/org.apache.felix.framework-6.0.2.jar;version=file") .bundles( - "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") + "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") .debug(); @Component(service = X.class, enabled = false) diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java index 3550bc4f47..5a5de77941 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadConfigurationTest.java @@ -28,7 +28,7 @@ public class LaunchpadConfigurationTest { .runfw("jar/org.apache.felix.framework-6.0.2.jar;version=file") .export("*") .bundles( - "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") + "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") .debug(); @Component(name = "TestService", service = X.class, configurationPolicy = ConfigurationPolicy.REQUIRE) diff --git a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java index 399478ad76..822e164c62 100644 --- a/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java +++ b/biz.aQute.launchpad.tests/test/aQute/xlaunchpad/LaunchpadRunnerBasicTest.java @@ -28,7 +28,7 @@ public class LaunchpadRunnerBasicTest { .runfw("jar/org.apache.felix.framework-6.0.2.jar;version=file") .export("*") .bundles( - "org.osgi.util.promise, org.osgi.util.function, jar/org.apache.felix.scr-2.1.16.jar;version=file, assertj-core") + "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") .debug(); @Component(service = X.class, enabled = false) diff --git a/biz.aQute.tester.test/bnd.bnd b/biz.aQute.tester.test/bnd.bnd index 6fdd741273..2ee460b0d7 100644 --- a/biz.aQute.tester.test/bnd.bnd +++ b/biz.aQute.tester.test/bnd.bnd @@ -26,6 +26,7 @@ org.junit.platform.engine;version="${junit.platform.eclipse.version}";strategy=lowest,\ org.junit.jupiter.engine;version="${junit.jupiter.eclipse.version}";strategy=lowest,\ assertj-core;version=latest,\ + net.bytebuddy.byte-buddy;version=latest,\ junit-platform-testkit;version="${junit.platform.eclipse.version}";strategy=lowest,\ aQute.libg,\ biz.aQute.bnd.util;version=snapshot,\ diff --git a/bndtools.core.test/bnd.bnd b/bndtools.core.test/bnd.bnd index e4ae2e98d1..c84ee443ba 100644 --- a/bndtools.core.test/bnd.bnd +++ b/bndtools.core.test/bnd.bnd @@ -48,6 +48,7 @@ bndtools.core;version=snapshot,\ bndtools.core.services;version=snapshot,\ assertj-core,\ + net.bytebuddy.byte-buddy,\ javax.inject,\ org.apiguardian:apiguardian-api,\ org.opentest4j,\ diff --git a/bndtools.core.test/test.cocoa.macosx.x86_64.bndrun b/bndtools.core.test/test.cocoa.macosx.x86_64.bndrun index 71656c9ebe..3ec46c2736 100644 --- a/bndtools.core.test/test.cocoa.macosx.x86_64.bndrun +++ b/bndtools.core.test/test.cocoa.macosx.x86_64.bndrun @@ -27,7 +27,7 @@ osgi.identity;filter:='(osgi.identity=*win32*)',\ -runbundles: \ - assertj-core;version='[3.22.0,3.22.1)',\ + assertj-core;version='[3.23.1,3.23.2)',\ biz.aQute.bnd.embedded-repo;version=snapshot,\ biz.aQute.bnd.util;version=snapshot,\ biz.aQute.bndlib;version=snapshot,\ @@ -55,6 +55,7 @@ junit-platform-engine;version='[1.8.2,1.8.3)',\ junit-platform-launcher;version='[1.8.2,1.8.3)',\ junit-vintage-engine;version='[5.8.2,5.8.3)',\ + net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\ net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\ org.apache.ant;version='[1.10.8,1.10.9)',\ org.apache.batik.constants;version='[1.11.0,1.11.1)',\ diff --git a/bndtools.core.test/test.gtk.linux.x86_64.bndrun b/bndtools.core.test/test.gtk.linux.x86_64.bndrun index 5de1c9a1fa..af61fb7f54 100644 --- a/bndtools.core.test/test.gtk.linux.x86_64.bndrun +++ b/bndtools.core.test/test.gtk.linux.x86_64.bndrun @@ -26,7 +26,7 @@ osgi.identity;filter:='(osgi.identity=*win32*)',\ -runbundles: \ - assertj-core;version='[3.22.0,3.22.1)',\ + assertj-core;version='[3.23.1,3.23.2)',\ biz.aQute.bnd.embedded-repo;version=snapshot,\ biz.aQute.bnd.util;version=snapshot,\ biz.aQute.bndlib;version=snapshot,\ @@ -54,6 +54,7 @@ junit-platform-engine;version='[1.8.2,1.8.3)',\ junit-platform-launcher;version='[1.8.2,1.8.3)',\ junit-vintage-engine;version='[5.8.2,5.8.3)',\ + net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\ net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\ org.apache.ant;version='[1.10.8,1.10.9)',\ org.apache.batik.constants;version='[1.11.0,1.11.1)',\ diff --git a/bndtools.core.test/test.win32.x86_64.bndrun b/bndtools.core.test/test.win32.x86_64.bndrun index 049317ff37..139332bcd1 100644 --- a/bndtools.core.test/test.win32.x86_64.bndrun +++ b/bndtools.core.test/test.win32.x86_64.bndrun @@ -25,7 +25,7 @@ osgi.identity;filter:='(osgi.identity=*linux*)',\ -runbundles: \ - assertj-core;version='[3.22.0,3.22.1)',\ + assertj-core;version='[3.23.1,3.23.2)',\ biz.aQute.bnd.embedded-repo;version=snapshot,\ biz.aQute.bnd.util;version=snapshot,\ biz.aQute.bndlib;version=snapshot,\ @@ -53,6 +53,7 @@ junit-platform-engine;version='[1.8.2,1.8.3)',\ junit-platform-launcher;version='[1.8.2,1.8.3)',\ junit-vintage-engine;version='[5.8.2,5.8.3)',\ + net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\ net.i2p.crypto.eddsa;version='[0.3.0,0.3.1)',\ org.apache.ant;version='[1.10.8,1.10.9)',\ org.apache.batik.constants;version='[1.11.0,1.11.1)',\ diff --git a/cnf/ext/central.mvn b/cnf/ext/central.mvn index a3f1ce9205..a4811e498d 100644 --- a/cnf/ext/central.mvn +++ b/cnf/ext/central.mvn @@ -87,10 +87,10 @@ org.apiguardian:apiguardian-api:1.1.2 org.assertj:assertj-core:${assertj.version} org.awaitility:awaitility:${awaitility.version} org.hamcrest:hamcrest:${hamcrest.version} -org.mockito:mockito-core:jar:${org.mockito.version} -net.bytebuddy:byte-buddy:${net.bytebuddy.version} -net.bytebuddy:byte-buddy-agent:${net.bytebuddy.version} -org.objenesis:objenesis:jar:${org.objenesis.version} +org.mockito:mockito-core:${mockito.version} +net.bytebuddy:byte-buddy:${bytebuddy.version} +net.bytebuddy:byte-buddy-agent:${bytebuddy.version} +org.objenesis:objenesis:${objenesis.version} org.xmlunit:xmlunit-core:2.6.3 org.xmlunit:xmlunit-assertj:2.6.3 org.osgi:org.osgi.test.common:${osgi-test.version} diff --git a/cnf/ext/junit.bnd b/cnf/ext/junit.bnd index 6bedeccb44..0f63560dc2 100644 --- a/cnf/ext/junit.bnd +++ b/cnf/ext/junit.bnd @@ -11,12 +11,12 @@ junit.jupiter.eclipse.version=5.6.0 junit.platform.eclipse.version=1.6.0 junit.jupiter.version=5.8.2 junit.platform.version=1.8.2 -assertj.version=3.22.0 +assertj.version=3.23.1 awaitility.version=4.2.0 hamcrest.version=2.2 -org.mockito.version=4.4.0 -net.bytebuddy.version=1.12.8 -org.objenesis.version=3.2 +mockito.version=4.6.0 +bytebuddy.version=1.12.10 +objenesis.version=3.2 osgi-test.version=1.1.0 junit: ${junit-osgi},\ @@ -28,6 +28,7 @@ junit-osgi: \ junit-platform-commons;version=latest,\ junit-platform-engine;version=latest,\ assertj-core;version=latest,\ + net.bytebuddy.byte-buddy;version=latest,\ org.opentest4j;version=latest,\ org.apiguardian:apiguardian-api;version=latest,\ junit-jupiter-api;version=latest,\ @@ -47,7 +48,7 @@ junit-osgi: \ org.osgi.test.junit5;version=latest mockito: org.mockito.mockito-core;version=latest,\ - net.bytebuddy.byte-buddy;version=latest,\ + net.bytebuddy.byte-buddy-agent;version=latest,\ org.objenesis;version=latest -runsystempackages.objenesis: sun.misc,sun.reflect diff --git a/maven/bnd-plugin-parent/pom.xml b/maven/bnd-plugin-parent/pom.xml index a590c831ee..c2a6c38640 100644 --- a/maven/bnd-plugin-parent/pom.xml +++ b/maven/bnd-plugin-parent/pom.xml @@ -28,7 +28,7 @@ 1.0.2.v20150114 5.8.2 - 3.22.0 + 3.23.1 https://bnd.bndtools.org/