Skip to content

Commit

Permalink
Merge pull request #522 from bjhargrave/assertj-core-3.23.1
Browse files Browse the repository at this point in the history
deps: Update assertj-core to 3.23.1
  • Loading branch information
bjhargrave authored May 31, 2022
2 parents f4510d9 + 8f0ff48 commit 848fbaa
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion examples/osgi-test-example-bndworkspace/cnf/ext/test.bnd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
junit_jupiter_version: 5.8.2
junit_platform_version: 1.8.2
assertj_version: 3.22.0
assertj_version: 3.23.1
mockito_version: 4.6.0
bytebuddy_version: 1.12.10
osgi_test_version: 1.1.0
Expand Down
2 changes: 1 addition & 1 deletion examples/osgi-test-example-gradle/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
junit_jupiter_version: 5.8.2
junit_platform_version: 1.8.2
assertj_version: 3.22.0
assertj_version: 3.23.1
mockito_version: 4.6.0
osgi_test_version: 1.1.0
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
begin=-1
# The following is calculated by the bnd-resolver-maven-plugin
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
Expand Down
2 changes: 1 addition & 1 deletion examples/osgi-test-example-mvn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<bnd.version>6.2.0</bnd.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<assertj.version>3.22.0</assertj.version>
<assertj.version>3.23.1</assertj.version>
<mockito.version>4.6.0</mockito.version>
<osgi-test.version>1.1.0</osgi-test.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.assertj.framework/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.assertj.log/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-platform-commons;version='[1.8.2,1.8.3)',\
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.assertj.promise/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-platform-commons;version='[1.8.2,1.8.3)',\
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.common/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
Expand Down
3 changes: 2 additions & 1 deletion org.osgi.test.junit4/test-junit4.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.osgi.test.common;version='[1.2.0,1.2.1)',\
org.osgi.test.junit4;version='[1.2.0,1.2.1)',\
Expand Down
3 changes: 2 additions & 1 deletion org.osgi.test.junit4/test-vintage.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-platform-commons;version='[1.8.2,1.8.3)',\
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)',\
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.osgi.test.common;version='[1.2.0,1.2.1)',\
Expand Down
3 changes: 2 additions & 1 deletion org.osgi.test.junit5.cm/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,14 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
junit-platform-commons;version='[1.8.2,1.8.3)',\
junit-platform-engine;version='[1.8.2,1.8.3)',\
junit-platform-launcher;version='[1.8.2,1.8.3)',\
net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.osgi.test.assertj.framework;version='[1.2.0,1.2.1)',\
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.junit5.listeners.log.osgi/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
Expand Down
2 changes: 1 addition & 1 deletion org.osgi.test.junit5/test.bndrun
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
order=sortbynameversion,\
begin=-1
-runbundles: \
assertj-core;version='[3.22.0,3.22.1)',\
assertj-core;version='[3.23.1,3.23.2)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<junit-platform.compile.version>1.6.0</junit-platform.compile.version>
<junit-jupiter.version>5.8.2</junit-jupiter.version>
<junit-platform.version>1.8.2</junit-platform.version>
<assertj.version>3.22.0</assertj.version>
<assertj.version>3.23.1</assertj.version>
<mockito.version>4.6.0</mockito.version>
<awaitility.version>4.2.0</awaitility.version>
<osgi.annotation.version>8.1.0</osgi.annotation.version>
Expand Down

0 comments on commit 848fbaa

Please sign in to comment.