Skip to content

Commit dd23f98

Browse files
stbischofstbischof
committed
add tck for service component runtime
Signed-off-by: Stefan Bischof <[email protected]>
1 parent a2ea5fc commit dd23f98

File tree

2 files changed

+182
-6
lines changed

2 files changed

+182
-6
lines changed

‎scr/pom.xml

Lines changed: 133 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969

7070
<java.version>8</java.version>
7171
<felix.java.version>${java.version}</felix.java.version>
72-
<maven.compiler.release>${java.version}</maven.compiler.release>
73-
<maven.compiler.source>${java.version}</maven.compiler.source>
74-
<maven.compiler.target>${java.version}</maven.compiler.target>
72+
<!-- <maven.compiler.release>${java.version}</maven.compiler.release>-->
73+
<!-- <maven.compiler.source>${java.version}</maven.compiler.source>-->
74+
<!-- <maven.compiler.target>${java.version}</maven.compiler.target>-->
7575
</properties>
7676

7777

@@ -264,6 +264,73 @@
264264
<version>5.0.4</version>
265265
<scope>test</scope>
266266
</dependency>
267+
<dependency>
268+
<groupId>org.osgi</groupId>
269+
<artifactId>org.osgi.test.cases.component</artifactId>
270+
<version>8.1.0</version>
271+
<scope>test</scope>
272+
</dependency>
273+
<dependency>
274+
<groupId>org.assertj</groupId>
275+
<artifactId>assertj-core</artifactId>
276+
<version>3.27.3</version>
277+
<scope>test</scope>
278+
</dependency>
279+
<dependency>
280+
<groupId>biz.aQute.bnd</groupId>
281+
<artifactId>biz.aQute.junit</artifactId>
282+
<version>6.4.1</version>
283+
<scope>runtime</scope>
284+
</dependency>
285+
<dependency>
286+
<groupId>org.apache.servicemix.bundles</groupId>
287+
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
288+
<version>4.13.2_1</version>
289+
<scope>test</scope>
290+
</dependency>
291+
292+
<dependency>
293+
<groupId>net.bytebuddy</groupId>
294+
<artifactId>byte-buddy</artifactId>
295+
<version>1.17.5</version>
296+
<scope>test</scope>
297+
</dependency>
298+
<dependency>
299+
<groupId>org.osgi</groupId>
300+
<artifactId>org.osgi.util.pushstream</artifactId>
301+
<version>1.1.0</version>
302+
<scope>test</scope>
303+
</dependency>
304+
<dependency>
305+
<groupId>org.slf4j</groupId>
306+
<artifactId>slf4j-simple</artifactId>
307+
<version>1.7.36</version>
308+
<scope>test</scope>
309+
</dependency>
310+
<dependency>
311+
<groupId>org.slf4j</groupId>
312+
<artifactId>slf4j-api</artifactId>
313+
<version>1.7.36</version>
314+
<scope>test</scope>
315+
</dependency>
316+
<dependency>
317+
<groupId>org.apache.felix</groupId>
318+
<artifactId>org.apache.felix.configadmin</artifactId>
319+
<version>1.9.26</version>
320+
<scope>test</scope>
321+
</dependency>
322+
<dependency>
323+
<groupId>org.apache.felix</groupId>
324+
<artifactId>org.apache.felix.coordinator</artifactId>
325+
<version>1.0.2</version>
326+
<scope>test</scope>
327+
</dependency>
328+
<dependency>
329+
<groupId>org.apache.felix</groupId>
330+
<artifactId>org.apache.felix.log</artifactId>
331+
<version>1.3.0</version>
332+
<scope>test</scope>
333+
</dependency>
267334
</dependencies>
268335
<build>
269336
<directory>${bundle.build.name}</directory>
@@ -280,7 +347,7 @@
280347
</configuration>
281348
</plugin>
282349

283-
<!-- plain unit tests -->
350+
<!-- plain unit tests -->
284351
<plugin>
285352
<artifactId>maven-surefire-plugin</artifactId>
286353
<configuration>
@@ -292,7 +359,7 @@
292359
</excludes>
293360
</configuration>
294361
</plugin>
295-
<!-- integration tests run with pax-exam -->
362+
<!-- integration tests run with pax-exam -->
296363
<plugin>
297364
<artifactId>maven-failsafe-plugin</artifactId>
298365
<executions>
@@ -329,6 +396,66 @@
329396
<source>${java.version}</source>
330397
</configuration>
331398
</plugin>
399+
<plugin>
400+
<groupId>biz.aQute.bnd</groupId>
401+
<artifactId>bnd-resolver-maven-plugin</artifactId>
402+
<version>7.1.0</version>
403+
<configuration>
404+
<includeDependencyManagement>true</includeDependencyManagement>
405+
<bndruns>
406+
<bndrun>tck.bndrun</bndrun>
407+
</bndruns>
408+
<scopes>
409+
<scope>compile</scope>
410+
<scope>runtime</scope>
411+
<scope>provided</scope>
412+
<scope>test</scope>
413+
</scopes>
414+
<failOnChanges>false</failOnChanges>
415+
<bundles>
416+
<bundle>target/org.apache.felix.scr-2.2.13-SNAPSHOT.jar</bundle>
417+
</bundles>
418+
419+
<bndruns>
420+
<bndrun>tck.bndrun</bndrun>
421+
</bndruns>
422+
</configuration>
423+
<executions>
424+
<execution>
425+
<goals>
426+
<goal>resolve</goal>
427+
</goals>
428+
</execution>
429+
</executions>
430+
</plugin>
431+
<plugin>
432+
<groupId>biz.aQute.bnd</groupId>
433+
<artifactId>bnd-testing-maven-plugin</artifactId>
434+
<version>7.1.0</version>
435+
<configuration>
436+
<failOnChanges>true</failOnChanges>
437+
<includeDependencyManagement>true</includeDependencyManagement>
438+
<bndruns>
439+
<bndrun>tck.bndrun</bndrun>
440+
</bndruns>
441+
<bundles>
442+
<bundle>target/org.apache.felix.scr-2.2.13-SNAPSHOT.jar</bundle>
443+
</bundles>
444+
<scopes>
445+
<scope>compile</scope>
446+
<scope>runtime</scope>
447+
<scope>provided</scope>
448+
<scope>test</scope>
449+
</scopes>
450+
</configuration>
451+
<executions>
452+
<execution>
453+
<goals>
454+
<goal>testing</goal>
455+
</goals>
456+
</execution>
457+
</executions>
458+
</plugin>
332459
</plugins>
333460
</build>
334461

@@ -347,7 +474,7 @@
347474
</reporting>
348475

349476
<profiles>
350-
<!--
477+
<!--
351478
copy the package such that IDEs may easily use it without
352479
setting the system property
353480
-->

‎scr/tck.bndrun

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
-resolve.effective: active
2+
-runee: JavaSE-17
3+
-runrequires: \
4+
bnd.identity;id='org.apache.felix.scr',\
5+
bnd.identity;id='org.osgi.test.cases.component',\
6+
bnd.identity;id='net.bytebuddy.byte-buddy',\
7+
bnd.identity;id='org.osgi.service.component',\
8+
bnd.identity;id='org.apache.felix.configadmin',\
9+
bnd.identity;id='org.apache.felix.coordinator',\
10+
bnd.identity;id=junit-platform-engine,\
11+
bnd.identity;id=junit-platform-launcher,\
12+
bnd.identity;id=junit-platform-commons,\
13+
bnd.identity;id=junit-jupiter-engine,\
14+
bnd.identity;id=junit-vintage-engine,\
15+
bnd.identity;id='org.apache.felix.log'
16+
17+
18+
# bnd.identity;id='biz.aQute.junit',\
19+
# bnd.identity;id=assertj-core,\
20+
21+
-runfw: org.apache.felix.framework;version='[7.0.0,8)
22+
23+
-tester: biz.aQute.tester.junit-platform;version=latest
24+
25+
# resolved bundles
26+
-runbundles: \
27+
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
28+
assertj-core;version='[3.27.3,3.27.4)',\
29+
net.bytebuddy.byte-buddy;version='[1.17.5,1.17.6)',\
30+
biz.aQute.bndlib;version='[5.1.1,5.1.2)',\
31+
junit-jupiter-api;version='[5.8.2,5.8.3)',\
32+
junit-jupiter-params;version='[5.8.2,5.8.3)',\
33+
junit-platform-commons;version='[1.8.2,1.8.3)',\
34+
org.opentest4j;version='[1.2.0,1.2.1)',\
35+
org.osgi.service.component;version='[1.5.0,1.5.1)',\
36+
org.osgi.test.assertj.framework;version='[1.2.0,1.2.1)',\
37+
org.osgi.test.cases.component;version='[8.1.0,8.1.1)',\
38+
org.osgi.test.common;version='[1.2.0,1.2.1)',\
39+
org.osgi.test.junit5;version='[1.2.0,1.2.1)',\
40+
slf4j.api;version='[1.7.36,1.7.37)',\
41+
slf4j.simple;version='[1.7.36,1.7.37)',\
42+
org.apache.felix.scr;version='[2.2.13,2.2.14)',\
43+
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
44+
org.apache.felix.coordinator;version='[1.0.2,1.0.3)',\
45+
org.apache.felix.log;version='[1.3.0,1.3.1)',\
46+
junit-platform-engine;version='[1.8.2,1.8.3)',\
47+
junit-platform-launcher;version='[1.8.2,1.8.3)',\
48+
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
49+
junit-vintage-engine;version='[5.8.2,5.8.3)'

0 commit comments

Comments
 (0)