Merge pull request #70 from bjhargrave/bnd5

Update Bnd to 5.0 and JUnit 5 to 5.6

Author: bjhargrave

org.osgi.test.assertj/pom.xml

@@ -45,6 +45,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
+			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
@@ -57,14 +58,10 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

org.osgi.test.common/pom.xml

@@ -44,25 +44,18 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-params</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<scope>test</scope>
 		</dependency>
 	</dependencies>
 

org.osgi.test.junit4/pom.xml

@@ -55,7 +55,6 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>

org.osgi.test.junit4/test.bndrun

@@ -32,8 +32,8 @@
 	slf4j.api
 -runrequires: bnd.identity;id='${project.artifactId}-test'
 -runbundles: \
+	assertj-core;version='[3.15.0,3.15.1)',\
 	org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
-	org.assertj.core;version='[3.13.2,3.13.3)',\
 	org.osgi.test.common;version='[1.0.0,1.0.1)',\
 	org.osgi.test.junit4-test;version='[1.0.0,1.0.1)',\
 	org.osgi.test.junit4;version='[1.0.0,1.0.1)'

org.osgi.test.junit5/.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +1,4 @@
-activeProfiles=bnd-next, bnd-next
+activeProfiles=
 eclipse.preferences.version=1
 resolveWorkspaceProjects=true
 version=1