Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 143 additions & 6 deletions scr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@

<java.version>8</java.version>
<felix.java.version>${java.version}</felix.java.version>
<maven.compiler.release>${java.version}</maven.compiler.release>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<!-- <maven.compiler.release>${java.version}</maven.compiler.release>-->
<!-- <maven.compiler.source>${java.version}</maven.compiler.source>-->
<!-- <maven.compiler.target>${java.version}</maven.compiler.target>-->
</properties>


Expand Down Expand Up @@ -264,6 +264,73 @@
<version>5.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.test.cases.component</artifactId>
<version>8.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.27.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.junit</artifactId>
<version>6.4.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.junit</artifactId>
<version>4.13.2_1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.17.5</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.pushstream</artifactId>
<version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.36</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.9.26</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.coordinator</artifactId>
<version>1.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
<version>1.3.0</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<directory>${bundle.build.name}</directory>
Expand All @@ -280,7 +347,7 @@
</configuration>
</plugin>

<!-- plain unit tests -->
<!-- plain unit tests -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
Expand All @@ -290,9 +357,14 @@
<exclude>**/instances/**</exclude>
<exclude>**/instances2/**</exclude>
</excludes>
<systemPropertyVariables>
<org.slf4j.simpleLogger.defaultLogLevel>warn</org.slf4j.simpleLogger.defaultLogLevel>
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
<org.slf4j.simpleLogger.log.org.ops4j>warn</org.slf4j.simpleLogger.log.org.ops4j>
</systemPropertyVariables>
</configuration>
</plugin>
<!-- integration tests run with pax-exam -->
<!-- integration tests run with pax-exam -->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
Expand All @@ -314,6 +386,11 @@
<includes>
<include>**/integration/**</include>
</includes>
<systemPropertyVariables>
<org.slf4j.simpleLogger.defaultLogLevel>warn</org.slf4j.simpleLogger.defaultLogLevel>
<org.slf4j.simpleLogger.showDateTime>true</org.slf4j.simpleLogger.showDateTime>
<org.slf4j.simpleLogger.log.org.ops4j>warn</org.slf4j.simpleLogger.log.org.ops4j>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand All @@ -329,6 +406,66 @@
<source>${java.version}</source>
</configuration>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
<version>7.1.0</version>
<configuration>
<includeDependencyManagement>true</includeDependencyManagement>
<bndruns>
<bndrun>tck.bndrun</bndrun>
</bndruns>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
<scope>provided</scope>
<scope>test</scope>
</scopes>
<failOnChanges>false</failOnChanges>
<bundles>
<bundle>target/org.apache.felix.scr-2.2.13-SNAPSHOT.jar</bundle>
</bundles>

<bndruns>
<bndrun>tck.bndrun</bndrun>
</bndruns>
</configuration>
<executions>
<execution>
<goals>
<goal>resolve</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
<version>7.1.0</version>
<configuration>
<failOnChanges>true</failOnChanges>
<includeDependencyManagement>true</includeDependencyManagement>
<bndruns>
<bndrun>tck.bndrun</bndrun>
</bndruns>
<bundles>
<bundle>target/org.apache.felix.scr-2.2.13-SNAPSHOT.jar</bundle>
</bundles>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
<scope>provided</scope>
<scope>test</scope>
</scopes>
</configuration>
<executions>
<execution>
<goals>
<goal>testing</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand All @@ -347,7 +484,7 @@
</reporting>

<profiles>
<!--
<!--
copy the package such that IDEs may easily use it without
setting the system property
-->
Expand Down
49 changes: 49 additions & 0 deletions scr/tck.bndrun
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
-resolve.effective: active
-runee: JavaSE-17
-runrequires: \
bnd.identity;id='org.apache.felix.scr',\
bnd.identity;id='org.osgi.test.cases.component',\
bnd.identity;id='net.bytebuddy.byte-buddy',\
bnd.identity;id='org.osgi.service.component',\
bnd.identity;id='org.apache.felix.configadmin',\
bnd.identity;id='org.apache.felix.coordinator',\
bnd.identity;id=junit-platform-engine,\
bnd.identity;id=junit-platform-launcher,\
bnd.identity;id=junit-platform-commons,\
bnd.identity;id=junit-jupiter-engine,\
bnd.identity;id=junit-vintage-engine,\
bnd.identity;id='org.apache.felix.log'


# bnd.identity;id='biz.aQute.junit',\
# bnd.identity;id=assertj-core,\

-runfw: org.apache.felix.framework;version='[7.0.0,8)

-tester: biz.aQute.tester.junit-platform;version=latest

# resolved bundles
-runbundles: \
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
assertj-core;version='[3.27.3,3.27.4)',\
net.bytebuddy.byte-buddy;version='[1.17.5,1.17.6)',\
biz.aQute.bndlib;version='[5.1.1,5.1.2)',\
junit-jupiter-api;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)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.osgi.service.component;version='[1.5.0,1.5.1)',\
org.osgi.test.assertj.framework;version='[1.2.0,1.2.1)',\
org.osgi.test.cases.component;version='[8.1.0,8.1.1)',\
org.osgi.test.common;version='[1.2.0,1.2.1)',\
org.osgi.test.junit5;version='[1.2.0,1.2.1)',\
slf4j.api;version='[1.7.36,1.7.37)',\
slf4j.simple;version='[1.7.36,1.7.37)',\
org.apache.felix.scr;version='[2.2.13,2.2.14)',\
org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.coordinator;version='[1.0.2,1.0.3)',\
org.apache.felix.log;version='[1.3.0,1.3.1)',\
junit-platform-engine;version='[1.8.2,1.8.3)',\
junit-platform-launcher;version='[1.8.2,1.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-vintage-engine;version='[5.8.2,5.8.3)'
Loading